From 96f184acb6b4e46e4f5cffe3c44ef0fac44a9c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Feb 2020 18:17:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E9=80=89=E6=8B=A9=E9=A2=98=E4=BD=93=E9=AA=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/login/Otherloginqq.js | 12 +++++++++---
 .../react/src/modules/login/Otherloginstart.js | 11 ++++++++---
 .../tpm/challengesnew/TpmQuestionEdit.js       | 12 ++++++++----
 .../tpm/challengesnew/TpmQuestionNew.js        | 18 +++++++++++++-----
 .../tpm/challengesnew/css/newquestion.css      |  7 +++++++
 5 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 public/react/src/modules/tpm/challengesnew/css/newquestion.css

diff --git a/public/react/src/modules/login/Otherloginqq.js b/public/react/src/modules/login/Otherloginqq.js
index 5a03a0fbb..18ae57d7c 100644
--- a/public/react/src/modules/login/Otherloginqq.js
+++ b/public/react/src/modules/login/Otherloginqq.js
@@ -12,6 +12,12 @@ class Otherloginqq extends Component {
 			const type = query.split('?code=');
 			const types = type[1].split('&state=');
 			const typeshref = types[1].split('%2C');
+
+			if(decodeURIComponent(typeshref[1])==="test-newweb.educoder.net"){
+				window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherloginqq?code=${types[0]}&state=null%2C`;
+			}else if(decodeURIComponent(typeshref[1])==="pre-newweb.educoder.net"){
+				window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherloginqq?code=${types[0]}&state=null%2C`;
+			}
 			let codeurl = `/auth/qq/callback`;
 			axios.get(codeurl,{params:{
 					code:types[0],
@@ -20,13 +26,13 @@ class Otherloginqq extends Component {
 				if(result){
 					if(result.data.status===0){
 						if(result.data.new_user===true){
-							window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherlogin?type=qq`;
+							this.props.history.replace(`/otherlogin?type=qq`);
 						}else{
 							// this.getinfo()
 							if(typeshref[0]==="account"){
-								window.location.href=`https://${decodeURIComponent(typeshref[1])}/account/binding`;
+								this.props.history.replace(`/account/binding`);
 							}else{
-								window.location.href=`https://${decodeURIComponent(typeshref[1])}`;
+								this.props.history.replace(`/`);
 							}
 						}
 					}
diff --git a/public/react/src/modules/login/Otherloginstart.js b/public/react/src/modules/login/Otherloginstart.js
index 216e3f073..93d202ce1 100644
--- a/public/react/src/modules/login/Otherloginstart.js
+++ b/public/react/src/modules/login/Otherloginstart.js
@@ -14,6 +14,11 @@ class Otherloginstart extends Component {
 			const types = type[1].split('&state=');
 			const typeshref = types[1].split(',');
 
+			if(typeshref[1]==="test-newweb.educoder.net"){
+				window.location.href=`https://${typeshref[1]}/otherloginstart?code=${types[0]}&state=null,""`;
+			}else if(typeshref[1]==="pre-newweb.educoder.net"){
+				window.location.href=`https://${typeshref[1]}/otherloginstart?code=${types[0]}&state=null,""`;
+			}
 			let codeurl = `/auth/wechat/callback.json`
 			axios.get(codeurl,{params:{
 					code:types[0]
@@ -21,13 +26,13 @@ class Otherloginstart extends Component {
 				if(result){
 					if(result.data.status===0){
 						if(result.data.new_user===true){
-							window.location.href=`https://${typeshref[1]}/otherlogin?type=wechat`;
+							this.props.history.replace(`/otherlogin?type=wechat`);
 						}else{
 							// this.getinfo()
 							if(typeshref[0]==="account"){
-								window.location.href=`https://${typeshref[1]}/account/binding`;
+								this.props.history.replace(`/account/binding`);
 							}else{
-								window.location.href=`https://${typeshref[1]}`;
+								this.props.history.replace(`/`);
 							}
 
 						}
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
index 5e90c1f3d..ccf22057f 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from 'antd';
+import {Input, Select, Radio,Button, Badge, message, Modal,Tooltip} from 'antd';
 
 import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
@@ -183,7 +183,7 @@ export default class TpmQuestionEdit extends Component {
 							/>
 							{/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
 							{/*onClick={this.clickshixunsanswerskill}>+ 添加</a>*/}
-							<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能
+							<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能（回车添加标签）
 								<span className=" color-orange ml20" style={{display:this.props.challenge_tagtype===true?"inline-block":"none"}} id="stage_name_notice">
                                           <i className="fa fa-exclamation-circle mr3"></i>必填项
                                         </span>
@@ -193,8 +193,12 @@ export default class TpmQuestionEdit extends Component {
 								{
 									this.props.shixunsskillanswerlist.length === 0 ? "" : this.props.shixunsskillanswerlist.map((itme, key) => {
 										return (
-											<li className="task_tag_span" key={key}><span>{itme}</span>
-												<a onClick={() =>this.props.delshixunssnswerllist(key)}>×</a>
+											<li className="fl ml10 mr10" key={key}>
+												<Badge className={"tpmpointer"} count={"x"} onClick={()=>this.props.delshixunssnswerllist(key)}>
+													<Button type="primary" ghost className={"Permanentban "}>
+														{itme}
+													</Button>
+												</Badge>
 											</li>
 										)
 									})
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
index c808fea61..602aa6d16 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
@@ -1,11 +1,13 @@
 import React, {Component} from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from 'antd';
+import {Input, Select, Radio, Checkbox, Popconfirm, Button, Badge,Tooltip} from 'antd';
 
 import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 
+import './css/newquestion.css';
+
 const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
@@ -138,7 +140,7 @@ export default class TpmQuestionNew extends Component {
 						// onMouseLeave={this.onshixunsmarkss}
 					>
 						<span className="fl mr30 color-orange pt10">*</span>
-		 
+
 						<Select style={{width: 120}} className="winput-240-40 fl"
 										id="challenge_score"
 										onChange={(e)=>this.props.onshixunsansweSelect(e)}
@@ -176,7 +178,7 @@ export default class TpmQuestionNew extends Component {
 							/>
 							{/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
 							{/*onClick={this.clickshixunsanswerskill}>+ 添加</a>*/}
-							<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能
+							<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能（回车添加标签）
 								<span className=" color-orange ml20" style={{display:this.props.challenge_tagtype===true?"inline-block":"none"}} id="stage_name_notice">
                                           <i className="fa fa-exclamation-circle mr3"></i>必填项
                                         </span>
@@ -186,8 +188,14 @@ export default class TpmQuestionNew extends Component {
 								{
 									this.props.shixunsskillanswerlist.length === 0 ? "" : this.props.shixunsskillanswerlist.map((itme, key) => {
 										return (
-											<li className="task_tag_span" key={key}><span>{itme}</span>
-												<a onClick={()=>this.props.delshixunssnswerllist(key)}>×</a>
+											<li className="fl ml10 mr10" key={key}>
+
+												<Badge className={"tpmpointer"} count={"x"} onClick={()=>this.props.delshixunssnswerllist(key)}>
+													<Button type="primary" ghost className={"Permanentban "}>
+														{itme}
+													</Button>
+												</Badge>
+
 											</li>
 										)
 									})
diff --git a/public/react/src/modules/tpm/challengesnew/css/newquestion.css b/public/react/src/modules/tpm/challengesnew/css/newquestion.css
new file mode 100644
index 000000000..444ca8d16
--- /dev/null
+++ b/public/react/src/modules/tpm/challengesnew/css/newquestion.css
@@ -0,0 +1,7 @@
+.tpmpointer{
+    cursor: pointer;
+}
+.Permanentban{
+    color:#5091FF !important;
+    border-color: #5091FF !important;
+}
\ No newline at end of file

From ad99a3c59488600ce7f0fee7fcb71fc43da4a2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Feb 2020 20:38:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?qq=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.js                              | 11 +++++++++++
 .../modules/login/{Otherloginold.js => Loginqq.js}   |  4 ++--
 public/react/src/modules/login/Otherlogin.css        |  5 +++++
 public/react/src/modules/login/Otherlogin.js         |  2 +-
 public/react/src/modules/login/Otherloginqq.js       | 12 +++---------
 .../react/src/modules/paths/PathDetail/sendPanel.js  | 11 ++++++-----
 6 files changed, 28 insertions(+), 17 deletions(-)
 rename public/react/src/modules/login/{Otherloginold.js => Loginqq.js} (99%)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index df025b392..4c4908771 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -66,12 +66,19 @@ const EducoderLogin = Loadable({
 	loading: Loading,
 })
 
+
 //微信登录
 const Otherlogin=Loadable({
 	loader: () => import('./modules/login/Otherlogin'),
 	loading: Loading,
 })
 
+//微信登录
+const  Loginqq=Loadable({
+	loader: () => import('./modules/login/Loginqq'),
+	loading: Loading,
+})
+
 
 const Otherloginstart=Loadable({
 	loader: () => import('./modules/login/Otherloginstart'),
@@ -632,6 +639,10 @@ class App extends Component {
 								<Route
 									path="/otherlogin" component={Otherlogin}
 								/>
+								<Route
+									path="/loginqq" component={Loginqq}
+								/>
+
 								<Route path="/users/:username"
 									render={
 										(props) => {
diff --git a/public/react/src/modules/login/Otherloginold.js b/public/react/src/modules/login/Loginqq.js
similarity index 99%
rename from public/react/src/modules/login/Otherloginold.js
rename to public/react/src/modules/login/Loginqq.js
index 75874ee18..fa290fcb4 100644
--- a/public/react/src/modules/login/Otherloginold.js
+++ b/public/react/src/modules/login/Loginqq.js
@@ -50,7 +50,7 @@ var newContainer={
     paddingTop: "40px",
 
 }
-class Otherlogin extends Component {
+class Loginqq extends Component {
     constructor(props) {
         super(props);
         this.state={
@@ -289,4 +289,4 @@ class Otherlogin extends Component {
 
 }
 
-export default Otherlogin;
+export default Loginqq;
diff --git a/public/react/src/modules/login/Otherlogin.css b/public/react/src/modules/login/Otherlogin.css
index 746254ed5..a554fb9d7 100644
--- a/public/react/src/modules/login/Otherlogin.css
+++ b/public/react/src/modules/login/Otherlogin.css
@@ -46,4 +46,9 @@
     justify-content: center;
     width: 100%;
     margin-top: 25px;
+}
+
+.weixinmarauto{
+    width: 24%;
+    margin: 0 auto;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/login/Otherlogin.js b/public/react/src/modules/login/Otherlogin.js
index 5e583221a..e6de5b713 100644
--- a/public/react/src/modules/login/Otherlogin.js
+++ b/public/react/src/modules/login/Otherlogin.js
@@ -244,7 +244,7 @@ class Otherlogin extends Component {
 																							placeholder="输入密码，注意区分大小写"
 															></Input.Password>
 														</Content>
-														{this.state.logintypes==="username"?<span className={"color-red ml50"}>请填写账号</span>:this.state.logintypes==="password"?<span className={"color-red ml50"}>请填写密码</span>:""}
+														{this.state.logintypes==="username"?<span className={"color-red ml50  weixinmarauto"}>请填写账号</span>:this.state.logintypes==="password"?<span className={"color-red ml50 weixinmarauto"}>请填写密码</span>:""}
 														<Footer className={"weixinfooter mt30"}>
 															<Button className="login_btn font-16 wechattiyan" type="primary" style={{height:"46px"}} onClick={() => this.postwechatlogin(false,this.state.login,this.state.password)}
 																			size={"large"}>绑定</Button>
diff --git a/public/react/src/modules/login/Otherloginqq.js b/public/react/src/modules/login/Otherloginqq.js
index 18ae57d7c..46856eece 100644
--- a/public/react/src/modules/login/Otherloginqq.js
+++ b/public/react/src/modules/login/Otherloginqq.js
@@ -12,12 +12,6 @@ class Otherloginqq extends Component {
 			const type = query.split('?code=');
 			const types = type[1].split('&state=');
 			const typeshref = types[1].split('%2C');
-
-			if(decodeURIComponent(typeshref[1])==="test-newweb.educoder.net"){
-				window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherloginqq?code=${types[0]}&state=null%2C`;
-			}else if(decodeURIComponent(typeshref[1])==="pre-newweb.educoder.net"){
-				window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherloginqq?code=${types[0]}&state=null%2C`;
-			}
 			let codeurl = `/auth/qq/callback`;
 			axios.get(codeurl,{params:{
 					code:types[0],
@@ -26,13 +20,13 @@ class Otherloginqq extends Component {
 				if(result){
 					if(result.data.status===0){
 						if(result.data.new_user===true){
-							this.props.history.replace(`/otherlogin?type=qq`);
+							window.location.href=`https://${decodeURIComponent(typeshref[1])}/loginqq?type=qq`;
 						}else{
 							// this.getinfo()
 							if(typeshref[0]==="account"){
-								this.props.history.replace(`/account/binding`);
+								window.location.href=`https://${decodeURIComponent(typeshref[1])}/account/binding`;
 							}else{
-								this.props.history.replace(`/`);
+								window.location.href=`https://${decodeURIComponent(typeshref[1])}`;
 							}
 						}
 					}
diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js
index d04f107ef..a4c14f1ef 100644
--- a/public/react/src/modules/paths/PathDetail/sendPanel.js
+++ b/public/react/src/modules/paths/PathDetail/sendPanel.js
@@ -168,11 +168,7 @@ class sendPanel extends Component{
     let{sentShixunPath,sendToCourseList,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state;
     return(
       <div>
-        <style>{`
-          body{
-            overflow:hidden!important;
-          }
-        `}</style>
+
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
@@ -201,6 +197,11 @@ class sendPanel extends Component{
           destroyOnClose={true}
         >
           <div className="newupload_conbox">
+            <style>{`
+            body{
+              overflow:hidden!important;
+            }
+          `}</style>
             <div className="mb20"
 								 // onMouseLeave={this.closeList}
 						>