diff --git a/public/react/public/index.html b/public/react/public/index.html
index 9871e341e..e38beda7c 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -68,6 +68,8 @@
       <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
 
       <!--<link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">-->
+
+      <!--需要去build js配置-->
       <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
     <style>
         /*<!--去除浏览器点击操作后有蓝色的底块-->*/
diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index e84c2dccf..29035ffed 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -1,224 +1,225 @@
-'use strict';
-
-// 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
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
-  throw err;
-});
-
-// Ensure environment variables are read.
-require('../config/env');
-
-const path = require('path');
-const chalk = require('chalk');
-const fs = require('fs-extra');
-const webpack = require('webpack');
-const config = require('../config/webpack.config.prod');
-const paths = require('../config/paths');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
-const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
-const printBuildError = require('react-dev-utils/printBuildError');
-
-var CombinedStream = require('combined-stream');
-var fs2 = require('fs');
-
-const measureFileSizesBeforeBuild =
-  FileSizeReporter.measureFileSizesBeforeBuild;
-const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
-const useYarn = fs.existsSync(paths.yarnLockFile);
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
-  process.exit(1);
-}
-
-function removeExceptGitDir(dir) {
-  // readdirSync
-  const list = fs2.readdirSync(dir)
-    // if (err) return done(err);
-  var pending = list.length;
-  // if (!pending) return done(null, results);
-  list.forEach(function(file) {
-    if (file.indexOf('.git') == -1) {
-      file = path.resolve(dir, file);
-      fs.removeSync(file)
-    }
-  });
-}
-// First, read the current file sizes in build directory.
-// This lets us display how much they changed later.
-measureFileSizesBeforeBuild(paths.appBuild)
-  .then(previousFileSizes => {
-    // Remove all content but keep the directory so that
-    // if you're in it, you don't end up in Trash
-    // fs.emptyDirSync(paths.appBuild);
-    console.log('removeExceptGitDir')
-
-    removeExceptGitDir(paths.appBuild)
-
-    console.log('copyPublicFolder')
-    // Merge with the public folder
-    copyPublicFolder();
-    // Start the webpack build
-    return build(previousFileSizes);
-  })
-  .then(
-    ({ stats, previousFileSizes, warnings }) => {
-      if (warnings.length) {
-        console.log(chalk.yellow('Compiled with warnings.\n'));
-        console.log(warnings.join('\n\n'));
-        console.log(
-          '\nSearch for the ' +
-            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'
-        );
-      } else {
-        console.log(chalk.green('Compiled successfully.\n'));
-      }
-
-      console.log('File sizes after gzip:\n');
-      printFileSizesAfterBuild(
-        stats,
-        previousFileSizes,
-        paths.appBuild,
-        WARN_AFTER_BUNDLE_GZIP_SIZE,
-        WARN_AFTER_CHUNK_GZIP_SIZE
-      );
-      console.log();
-
-      const appPackage = require(paths.appPackageJson);
-      const publicUrl = paths.publicUrl;
-      const publicPath = config.output.publicPath;
-      const buildFolder = path.relative(process.cwd(), paths.appBuild);
-      printHostingInstructions(
-        appPackage,
-        publicUrl,
-        publicPath,
-        buildFolder,
-        useYarn
-      );
-    },
-    err => {
-      console.log(chalk.red('Failed to compile.\n'));
-      printBuildError(err);
-      process.exit(1);
-    }
-  );
-
-// Create the production build and print the deployment instructions.
-function build(previousFileSizes) {
-  console.log('Creating an optimized production build...');
-
-  let compiler = webpack(config);
-  return new Promise((resolve, reject) => {
-    compiler.run((err, stats) => {
-      if (err) {
-        return reject(err);
-      }
-      const messages = formatWebpackMessages(stats.toJson({}, true));
-      if (messages.errors.length) {
-        // Only keep the first error. Others are often indicative
-        // of the same problem, but confuse the reader with noise.
-        if (messages.errors.length > 1) {
-          messages.errors.length = 1;
-        }
-        return reject(new Error(messages.errors.join('\n\n')));
-      }
-      if (
-        process.env.CI &&
-        (typeof process.env.CI !== 'string' ||
-          process.env.CI.toLowerCase() !== 'false') &&
-        messages.warnings.length
-      ) {
-        console.log(
-          chalk.yellow(
-            '\nTreating warnings as errors because process.env.CI = true.\n' +
-              'Most CI servers set it automatically.\n'
-          )
-        );
-        return reject(new Error(messages.warnings.join('\n\n')));
-      }
-
-      generateNewIndexJsp();
-
-      return resolve({
-        stats,
-        previousFileSizes,
-        warnings: messages.warnings,
-      });
-    });
-  });
-}
-
-function copyPublicFolder() {
-  fs.copySync(paths.appPublic, paths.appBuild, {
-    dereference: true,
-    filter: file => file !== paths.appHtml,
-  });
-}
-
-
-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  + '/../../../public/react/build/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://cdn-testeduplus2.educoder.net'
-    cdnHost = ''
-    var result = data.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}`)
-
-        .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
-        .replace('/js/create_kindeditor.js', `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
-
-        // .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);
+'use strict';
+
+// 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
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+  throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+const path = require('path');
+const chalk = require('chalk');
+const fs = require('fs-extra');
+const webpack = require('webpack');
+const config = require('../config/webpack.config.prod');
+const paths = require('../config/paths');
+const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
+const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
+const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
+const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
+const printBuildError = require('react-dev-utils/printBuildError');
+
+var CombinedStream = require('combined-stream');
+var fs2 = require('fs');
+
+const measureFileSizesBeforeBuild =
+  FileSizeReporter.measureFileSizesBeforeBuild;
+const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
+const useYarn = fs.existsSync(paths.yarnLockFile);
+
+// These sizes are pretty large. We'll warn for bundles exceeding them.
+const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
+
+// Warn and crash if required files are missing
+if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
+  process.exit(1);
+}
+
+function removeExceptGitDir(dir) {
+  // readdirSync
+  const list = fs2.readdirSync(dir)
+    // if (err) return done(err);
+  var pending = list.length;
+  // if (!pending) return done(null, results);
+  list.forEach(function(file) {
+    if (file.indexOf('.git') == -1) {
+      file = path.resolve(dir, file);
+      fs.removeSync(file)
+    }
+  });
+}
+// First, read the current file sizes in build directory.
+// This lets us display how much they changed later.
+measureFileSizesBeforeBuild(paths.appBuild)
+  .then(previousFileSizes => {
+    // Remove all content but keep the directory so that
+    // if you're in it, you don't end up in Trash
+    // fs.emptyDirSync(paths.appBuild);
+    console.log('removeExceptGitDir')
+
+    removeExceptGitDir(paths.appBuild)
+
+    console.log('copyPublicFolder')
+    // Merge with the public folder
+    copyPublicFolder();
+    // Start the webpack build
+    return build(previousFileSizes);
+  })
+  .then(
+    ({ stats, previousFileSizes, warnings }) => {
+      if (warnings.length) {
+        console.log(chalk.yellow('Compiled with warnings.\n'));
+        console.log(warnings.join('\n\n'));
+        console.log(
+          '\nSearch for the ' +
+            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'
+        );
+      } else {
+        console.log(chalk.green('Compiled successfully.\n'));
+      }
+
+      console.log('File sizes after gzip:\n');
+      printFileSizesAfterBuild(
+        stats,
+        previousFileSizes,
+        paths.appBuild,
+        WARN_AFTER_BUNDLE_GZIP_SIZE,
+        WARN_AFTER_CHUNK_GZIP_SIZE
+      );
+      console.log();
+
+      const appPackage = require(paths.appPackageJson);
+      const publicUrl = paths.publicUrl;
+      const publicPath = config.output.publicPath;
+      const buildFolder = path.relative(process.cwd(), paths.appBuild);
+      printHostingInstructions(
+        appPackage,
+        publicUrl,
+        publicPath,
+        buildFolder,
+        useYarn
+      );
+    },
+    err => {
+      console.log(chalk.red('Failed to compile.\n'));
+      printBuildError(err);
+      process.exit(1);
+    }
+  );
+
+// Create the production build and print the deployment instructions.
+function build(previousFileSizes) {
+  console.log('Creating an optimized production build...');
+
+  let compiler = webpack(config);
+  return new Promise((resolve, reject) => {
+    compiler.run((err, stats) => {
+      if (err) {
+        return reject(err);
+      }
+      const messages = formatWebpackMessages(stats.toJson({}, true));
+      if (messages.errors.length) {
+        // Only keep the first error. Others are often indicative
+        // of the same problem, but confuse the reader with noise.
+        if (messages.errors.length > 1) {
+          messages.errors.length = 1;
+        }
+        return reject(new Error(messages.errors.join('\n\n')));
+      }
+      if (
+        process.env.CI &&
+        (typeof process.env.CI !== 'string' ||
+          process.env.CI.toLowerCase() !== 'false') &&
+        messages.warnings.length
+      ) {
+        console.log(
+          chalk.yellow(
+            '\nTreating warnings as errors because process.env.CI = true.\n' +
+              'Most CI servers set it automatically.\n'
+          )
+        );
+        return reject(new Error(messages.warnings.join('\n\n')));
+      }
+
+      generateNewIndexJsp();
+
+      return resolve({
+        stats,
+        previousFileSizes,
+        warnings: messages.warnings,
+      });
+    });
+  });
+}
+
+function copyPublicFolder() {
+  fs.copySync(paths.appPublic, paths.appBuild, {
+    dereference: true,
+    filter: file => file !== paths.appHtml,
+  });
+}
+
+
+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  + '/../../../public/react/build/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://cdn-testeduplus2.educoder.net'
+    cdnHost = ''
+    var result = data.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}`)
+
+        .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', `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
+
+        // .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);
 }
\ No newline at end of file
diff --git a/public/react/src/App.js b/public/react/src/App.js
index f7530989e..072e611c0 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -336,7 +336,7 @@ class App extends Component {
 
 							{/* <Route path="/myshixuns/:shixunId/stages/:stageId" component={Index}/> */}
               {/* 兴趣页面*/}
-              {/*<Route path="/interest" component={Interestpage}/>*/}
+              <Route path="/interest" component={Interestpage}/>
 							<Route path="/comment" component={CommentComponent}/>
 							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
 							<Route path="/test" component={TestIndex}/>
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index 562d77adf..230c61da6 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -24,7 +24,7 @@ class InterestpageComponent extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			gouxuans: 0,
+			gouxuans: "",
 			gouxuans2:0,
 			gouxuans3:[{id:1,name:"前端开发",bool:false,url:qdkf},{id:2,name:"后端开发",bool:false,url:hdkf},{id:3,name:"移动开发",bool:false,url:ydkf},{id:4,name:"数据库",bool:false,url:sjk},{id:5,name:"云计算和大数据",bool:false,url:ysj},{id:6,name:"运维与测试",bool:false,url:yunwei},{id:7,name:"人工智能",bool:false,url:rgzn},{id:8,name:"其他",bool:false,url:qita}],
 			namezh:this.props.namezh,
@@ -35,15 +35,15 @@ class InterestpageComponent extends Component {
     console.log(e);
     if(e === 1){
       this.setState({
-				gouxuans:1,
+				gouxuans:"teacher",
 			})
 		}else if(e === 2){
 			this.setState({
-				gouxuans:2,
+				gouxuans:"student",
 			})
 		}else if(e === 3){
 			this.setState({
-				gouxuans:3,
+				gouxuans:"professional",
 			})
 		}
 	}
@@ -68,6 +68,33 @@ class InterestpageComponent extends Component {
 
 	}
 
+	//兴趣页面点击
+	Interestcompletionpage(){
+		if(this.state.gouxuans.length === 0){
+			this.props.showNotification("请选择您的职业");
+			return
+		}
+		var ints=[];
+		for (var i =0;i<this.state.gouxuans.length;i++) {
+        if(this.state.gouxuans[i].bool === true){
+          ints.push(this.state.gouxuans[i].id);
+				}
+		}
+		var url = "/users/interest.json";
+		axios.post(url, {
+			identity:this.state.gouxuans,
+			interest_ids: ints,
+		}).then((response) => {
+			if (response !== undefined) {
+      this.Jumptotheinterestpage();
+			}
+
+
+		}).catch((error) => {
+			console.log(error);
+
+		})
+	}
 
 	//跳转然后登入
 	Jumptotheinterestpage=()=>{
@@ -94,7 +121,7 @@ class InterestpageComponent extends Component {
 
 
 		}).catch((error) => {
-
+			console.log(error);
 		})
 	}
 	render() {
@@ -111,15 +138,15 @@ class InterestpageComponent extends Component {
 					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
 					<div className="ysldivhome1" >
           <div className="ysldivhomediv" style={{marginLeft:"30px"}} >
-					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(1)}>{gouxuans ===1? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
+					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
 						<div className="ysldivhomedivimg" ><img src={skzbdx} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" style={{ marginLeft:"101px",marginRight:"101px"}}>
-						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(2)}>{gouxuans===2? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
+						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
 						<div className="ysldivhomedivimg"><img src={mytc} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" >
-						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(3)}>{gouxuans===3?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
+						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
 						<div className="ysldivhomedivimg"><img src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
@@ -138,7 +165,7 @@ class InterestpageComponent extends Component {
 								)
 							})}
 					</div>
-					<Button className="yslbutton" size={"large"} type="primary" style={{width:"255px",height: "36px",background: "#4CACFF"}}>完成</Button>
+					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "36px",background: "#4CACFF"} }>完成</Button>
 
 					</div>