Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/App.js

@@ -64,6 +64,18 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
+
+//微信登录
+const Otherlogin=Loadable({
+	loader: () => import('./modules/login/Otherlogin'),
+	loading: Loading,
+})
+
+const Otherloginstart=Loadable({
+	loader: () => import('./modules/login/Otherloginstart'),
+	loading: Loading,
+})
+
 const TestIndex = Loadable({
 	loader: () => import('./modules/test'),
 	loading: Loading,
@@ -406,6 +418,12 @@ class App extends Component {
 							<Route
 								path="/register" component={EducoderLogin}
 							/>
+							<Route
+								path="/otherloginstart" component={Otherloginstart}
+							/>
+							<Route
+								path="/otherlogin" component={Otherlogin}
+							/>
 							<Route path="/users/:username"
 								render={
 									(props) => {

public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js

@@ -0,0 +1,310 @@
+import React,{ Component } from "react";
+import { Modal,Checkbox,DatePicker} from "antd";
+import { handleDateString } from 'educoder';
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+import moment from 'moment';
+const CheckboxGroup = Checkbox.Group;
+const dateFormat = 'YYYY-MM-DD HH:mm';
+
+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: () => [55, 56],
+	};
+}
+
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
+
+class OneSelfOrderModal extends Component{
+	constructor(props){
+		super(props);
+		this.state={
+			group_ids:[],
+			endtime:""
+		}
+	}
+	componentDidMount() {
+
+
+		if(this.props.course_groups!=undefined&&this.props.course_groups.length!=0){
+
+			let arr=this.props.course_groups.map(item => item.id);
+			this.shixunhomeworkedit(arr);
+		}
+
+		if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
+			this.setState({
+				endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
+			})
+		}else{
+			this.setState({
+				endtime:moment(handleDateString(this.props.starttimes)).format("YYYY-MM-DD HH:mm")
+			})
+		}
+	}
+	componentDidUpdate=(prevProps)=>{
+		// if(prevProps.visible!=this.props.visible){
+		//
+		//   if(this.props.course_groups!=undefined){
+		//     let arr=this.props.course_groups.map(item => item.id);
+		//     this.shixunhomeworkedit(arr);
+		//   }
+		// }
+		if(prevProps.course_groups!=this.props.course_groups){
+			if(this.props.course_groups!=undefined){
+				let arr=this.props.course_groups.map(item => item.id);
+				this.shixunhomeworkedit(arr);
+			}
+		}
+		if(prevProps.starttimes!=this.props.starttimes){
+
+			if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
+				this.setState({
+					endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
+				})
+			}else{
+				this.setState({
+					endtime:moment(handleDateString(this.props.starttimes)).format("YYYY-MM-DD HH:mm")
+				})
+			}
+		}
+	}
+
+	//勾选实训
+	shixunhomeworkedit=(list)=>{
+
+		this.setState({
+			group_ids:list
+		})
+		this.props.getcourse_groupslist && this.props.getcourse_groupslist(list)
+	}
+
+	onChangeTimeend= (date, dateString) => {
+		// console.log('startValue',dateString);
+
+		this.setState({
+			endtime: date===null?"":handleDateString(dateString),
+		})
+
+	}
+
+	propsSaves=(ds,endtime)=>{
+
+		if(ds.length ===0&&endtime === ""){
+			this.props.Saves()
+		}else{
+			if(this.props.typs!="end"){
+				if(endtime === ""||endtime===undefined||endtime===null){
+
+					this.setState({
+						endtimetype:true,
+						endtimetypevalue:"截止时间不能为空"
+					})
+					return
+				}
+
+				if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttimes,"YYYY-MM-DD HH:mm")){
+					this.setState({
+						endtimetype:true,
+						endtimetypevalue:"必须晚于发布时间"
+					})
+					return
+				}
+			}
+			this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
+		}
+
+
+	}
+
+	render(){
+		let {group_ids,endtime}=this.state;
+		let {course_groups}=this.props;
+
+		// console.log(this.props.starttimes)
+    // console.log(endtime)
+		// console.log(this.props.starttimes)
+		// console.log(this.state.endtime)
+
+		// console.log(this.props.starttime,this.props.endtime)
+		// TODO course_groups为空时的处理
+
+		// let endtimelist=this.props.starttimes===undefined||this.props.starttimes===""?"":moment(handleDateString(endtime)).add(1,'months')
+		return(
+			<div>
+				{
+					this.props.OneSelftype===true?<style>
+						{
+							`
+              body {
+							  overflow: hidden !important;
+							}
+              `
+						}
+					</style>:""
+				}
+				{
+					this.props.OneSelftype===true? <Modal
+						keyboard={false}
+						className={"HomeworkModal"}
+						title={this.props.modalname}
+						visible={this.props.OneSelftype}
+						closable={false}
+						footer={null}
+						destroyOnClose={true}
+					>
+						<div className="task-popup-content">
+
+
+							{ this.props.usingCheckBeforePost ?
+								<React.Fragment>
+									<p className="task-popup-text-center font-16">
+										<span>发布设置均可修改，</span>
+										<span className={"color-blue underline"} onClick={this.props.onToPublishClick}>
+                点击修改
+                </span>
+									</p>
+									<p className="task-popup-text-center font-16 mt10">
+										此设置将对所有分班生效
+									</p>
+								</React.Fragment> :
+								<React.Fragment>
+									<p className="task-popup-text-center font-16">
+										{this.props.Topval}
+										<span className={"color-blue underline"}>{this.props.Topvalright}</span>
+									</p>
+									<p className="task-popup-text-center font-16 mt10">
+										{this.props.Botvalleft===undefined?"":<span className={"colorFF6800"}>"{this.props.Botvalleft}"</span>}
+										{this.props.Botval}
+									</p>
+								</React.Fragment>  }
+
+
+							{this.props.starttime===undefined||
+							this.props.starttime===""?""
+								: <p className="task-popup-text-center font-16 mt20">
+									<span className={"font-14 mr20 color979797"}>
+											<span className={"mr10"}>发布时间:</span>
+										{this.props.starttime}</span>
+									{this.props.modaltype===undefined||this.props.modaltype===2?	<span className={"font-14 color979797"}>
+									{/*{this.props.endtime}*/}
+								  <span className={"mr10"}>截止时间:</span>
+									<DatePicker
+										dropdownClassName="hideDisable"
+										showTime={{ format: 'HH:mm' }}
+										disabledTime={disabledDateTime}
+										disabledDate={disabledDate}
+										showToday={false}
+										locale={locale}
+										format={dateFormat}
+										placeholder="请选择截止时间"
+										id={"endTime"}
+										width={"210px"}
+										value={endtime===null||endtime===""?"":moment(endtime, dateFormat)}
+										onChange={this.onChangeTimeend}
+										className={ this.state.endtimetype===true?"noticeTip":""}
+									/>
+										{this.state.endtimetype===true?<div className={"color-red fr mr90 mt5"}>{this.state.endtimetypevalue}</div>:""}
+                </span>:""}
+								</p>}
+							{/* usingCheckBeforePost 为true的时候 全选所有分班 */}
+
+							<style>
+								{
+									`
+                  .ant-checkbox-wrapper {
+                        margin-top: 0px;
+                        float: left;
+                    }
+
+               	  .upload_select_box li:hover {
+										background: transparent;
+									}
+
+									.F4FAFF{
+									background: #F4FAFF;
+									}
+                  `
+								}
+							</style>
+							{this.props.modaltype===undefined||this.props.modaltype===2
+							|| this.props.usingCheckBeforePost ?"":<div className="clearfix edu-txt-center lineh-40 F4FAFF">
+								<li style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
+									<span style={{"float":"left","color":"#05101A"}} className="task-hide color-grey-name ml50">分班名称</span>
+
+									<span style={{"float":"right","color":"#05101A"}} className="task-hide color-grey-name mr70">截止时间</span>
+								</li>
+							</div>}
+							{this.props.modaltype===undefined||this.props.modaltype===2
+							|| this.props.usingCheckBeforePost ?"":<ul className="upload_select_box fl clearfix mb30"
+																												 style={{"overflow-y":"auto",padding:"10px 0px"}}
+																												 id="search_not_members_list"
+
+							>
+
+								{  <Checkbox.Group style={{ width: '100%' }} value={group_ids}  onChange={this.shixunhomeworkedit}>
+									{
+										course_groups.map((item,key)=>{
+
+											return(
+												<div className="clearfix edu-txt-center lineh-40" key={key}>
+													<li  style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
+														<Checkbox
+															className="task-hide edu-txt-left"
+															name="shixun_homework[]"
+															value={item.id}
+															key={item.id}
+														>
+															<span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.name}</span>
+														</Checkbox>
+														<DatePicker
+															dropdownClassName="hideDisable"
+															showTime={{ format: 'HH:mm' }}
+															disabledTime={disabledDateTime}
+															disabledDate={disabledDate}
+															showToday={false}
+															locale={locale}
+															format={dateFormat}
+															placeholder="请选择截止时间"
+															id={"endTime"}
+															width={"210px"}
+															value={item.end_time===null||item.end_time===""?"":moment(item.end_time, dateFormat)}
+															onChange={this.onChangeTimeend}
+															className={ this.state.endtimetype===true?"noticeTip fr":"fr"}
+														/>
+													</li>
+
+												</div>
+											)
+										})
+									}
+								</Checkbox.Group>}
+
+							</ul>
+							}
+
+							<div className="clearfix mt30 edu-txt-center mb10">
+								<a  className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
+								<a className="task-btn task-btn-orange" onClick={()=>this.propsSaves(group_ids,this.state.endtime)}>{this.props.Savesname}</a>
+							</div>
+
+						</div>
+					</Modal>:""}
+			</div>
+		)
+	}
+}
+export default OneSelfOrderModal;

public/react/src/modules/courses/css/Courses.css

@@ -1702,3 +1702,46 @@ input.ant-input-number-input:focus {
 .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;
+}
+
+.wechatdiv{
+    margin-top: 40px !important;
+    width: 800px !important;
+}
+
+.wechatContent{
+    padding: 0px 50px;
+}
+
+.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;
+}

public/react/src/modules/courses/graduation/tasks/index.js

@@ -473,7 +473,7 @@ class GraduationTasks extends Component{
           checkAllValue:false
         })
         this.publishcanner();
-        debugger
+
         let {search,page,order} = this.state
         this.fetchAll(search,page,order);
       }

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -4,6 +4,7 @@ import { WordsBtn,on, off, trigger } from 'educoder';
 import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
 import axios from'axios';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
+import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
 import ShixunModal from "../coursesPublic/ShixunModal";
 import PathModal from "../coursesPublic/PathModal";
 import NewShixunModel from '../coursesPublic/NewShixunModel';
@@ -227,10 +228,11 @@ class ShixunHomework extends Component{
       addnametab:undefined,
 			typs:undefined,
 			starttimes:undefined,
+			OneSelftype:false
     })
-    this.props.updataleftNavfun()
-    this.homeworkupdatalist(Coursename,page,order);
 		this.cancelmodel()
+		this.homeworkupdatalist(Coursename,page,order);
+    this.props.updataleftNavfun()
   }
 
 
@@ -272,6 +274,48 @@ class ShixunHomework extends Component{
     });
 
   }
+
+
+	//立即发布
+	homeworkOneSelfstart=()=>{
+		let selectnum= this.testonSelect();
+		if(selectnum===true){
+			this.noSelect();
+			return
+		}
+		let coursesId=this.props.match.params.coursesId;
+		let url="/courses/"+coursesId+"/all_course_groups.json";
+
+		axios.get(url).then((response) => {
+
+			if(response.status===200){
+				let starttime= this.props.getNowFormatDates(1);
+				let endtime=this.props.getNowFormatDates(2);
+				this.setState({
+					modalname:"立即发布",
+					modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
+					OneSelftype:true,
+					typs:"start",
+					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:response.data.course_groups,
+				})
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+
+	}
+
+
   cancelmodels=()=>{
     this.setState({
       Modalstype:false,
@@ -316,10 +360,12 @@ class ShixunHomework extends Component{
             })
           }
 
-          this.props.showNotification(result.data.message)
-          this.props.updataleftNavfun()
+
 					this.homeworkupdatalist(Coursename,page,order);
 					this.cancelmodel()
+					this.props.showNotification(result.data.message)
+          this.props.updataleftNavfun()
+
         }
       }).catch((error)=>{
         console.log(error);
@@ -414,11 +460,11 @@ class ShixunHomework extends Component{
             Loadtype:false,
             course_groups:[]
           })
-
-          this.props.showNotification(response.data.message)
-          this.props.updataleftNavfun()
 					this.homeworkupdatalist(Coursename,page,order);
 					this.cancelmodel()
+          this.props.showNotification(response.data.message)
+          this.props.updataleftNavfun()
+
         }
       })
       .catch(function (error) {
@@ -722,8 +768,8 @@ class ShixunHomework extends Component{
             checkedtype:false,
 						antIcon:false
           })
-          this.props.showNotification(response.data.message)
 					this.homeworkupdatalist(Coursename,page,order);
+          this.props.showNotification(response.data.message)
 					this.props.updataleftNavfun()
         }else{
         	this.setState({
@@ -782,6 +828,7 @@ class ShixunHomework extends Component{
 
     this.setState({
       Modalstype:false,
+			OneSelftype:false,
       Loadtype:false,
       visible:false,
       Modalstopval:"",
@@ -834,9 +881,10 @@ class ShixunHomework extends Component{
             Loadtype:false,
             checkBoxValues:[]
           })
+					this.homeworkupdatalist(Coursename,page,order);
           this.props.showNotification(response.data.message)
 
-          this.homeworkupdatalist(Coursename,page,order);
+
         }
       })
       .catch(function (error) {
@@ -886,9 +934,10 @@ class ShixunHomework extends Component{
             checkBoxValues:[],
             checkAllValue:false
           })
+					this.homeworkupdatalist(Coursename,page,order);
           this.props.showNotification('已完成')
           this.props.updataleftNavfun()
-          this.homeworkupdatalist(Coursename,page,order);
+
         }
       })
   }
@@ -1022,7 +1071,7 @@ class ShixunHomework extends Component{
           loadtype={this.state.Loadtype}
 					antIcon={this.state.antIcon}
         />:""}
-        {/*立即发布*/}
+        {/*批量立即发布*/}
         {visible===true?<HomeworkModal
           datas={datas}
           category_id={this.props.match.params.category_id}
@@ -1045,7 +1094,28 @@ class ShixunHomework extends Component{
           getcourse_groupslist={(id)=>this.getcourse_groupslist(id)}
         />:""}
 
-
+				{/*{单个立即发布}*/}
+				{/*<OneSelfOrderModal*/}
+					{/*OneSelftype={this.state.OneSelftype}*/}
+					{/*datas={datas}*/}
+					{/*category_id={this.props.match.params.category_id}*/}
+					{/*modaltype={modaltype}*/}
+					{/*modalname={modalname}*/}
+					{/*Topval={Topval}*/}
+					{/*Topvalright={Topvalright}*/}
+					{/*Botvalleft={Botvalleft}*/}
+					{/*Botval={Botval}*/}
+					{/*starttime={starttime}*/}
+					{/*starttimes={this.state.starttimes}*/}
+					{/*typs={this.state.typs}*/}
+					{/*endtime={endtime}*/}
+					{/*Cancelname={Cancelname}*/}
+					{/*Savesname={Savesname}*/}
+					{/*Cancel={Cancel}*/}
+					{/*Saves={Saves}*/}
+					{/*course_groups={course_groups}*/}
+					{/*getcourse_groupslist={(id)=>this.getcourse_groupslist(id)}*/}
+				{/*/>*/}
         {shixunmodal===true||shixunpath===true?<style>
             {
               `
@@ -1128,6 +1198,8 @@ class ShixunHomework extends Component{
             <Checkbox className="fl" style={{marginTop:'0px'}} checked={checkedtype} onClick={this.funselect}>已选 {checkBoxValues&&checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>
             <div className="studentList_operation_ul">
                 <li className="li_line"><a className="color-grey-9" onClick={this.onDelete}>删除</a></li>
+							  {/*{checkBoxValues&&checkBoxValues.length>1?<li className="li_line"><a className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>*/}
+								{/*:<li className="li_line"><a className="color-grey-9" onClick={this.homeworkOneSelfstart}>单个立即发布</a></li>}*/}
 						  	<li className="li_line"><a className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>
                 {/*onClick={this.homeworkstart}*/}
                 <li className="li_line"><a className="color-grey-9" onClick={this.homeworkends}>立即截止</a></li>

public/react/src/modules/login/EducoderInteresse.js

@@ -20,9 +20,6 @@ var newContainer={
 	top: "0px",
 	bottom: "0px",
 	minHeight: "100%",
-	overflow:"hidden",
-
-
 }
 class EducoderInteresse extends Component {
 	constructor(props) {

public/react/src/modules/login/EducoderLogin.js

@@ -60,7 +60,6 @@ var newContainer={
     top: "0px",
     bottom: "0px",
      minHeight: "100%",
-    overflow:"hidden",
     paddingTop: "40px",
 
 }

public/react/src/modules/login/LoginDialog.css

@@ -21,7 +21,7 @@
     overflow-y:hidden !important;
 }
 #log_reg_content{
-    top: 0px !important;
+    top: -64px !important;
 }
 #log_reg_content{
     width:405px !important;
@@ -106,7 +106,7 @@
 
 #closeIcon{
     position: absolute;
-    top: -30px;
+    top: -100px;
     right: -27px;
      z-index: 100000;
 }
@@ -131,3 +131,12 @@
 .startlogin{
     color:#888;
 }
+.weixinheight390{
+    height: 390px;
+}
+#log_reg_content {
+    padding: 38px 30px 20px !important;
+}
+.textcenter{
+    text-align: center;
+}

public/react/src/modules/login/LoginDialog.js

@@ -104,6 +104,7 @@ class LoginDialog extends Component {
         MyEduCoderModals:false,
         Phonenumberisnotco:undefined,
         Phonenumberisnotcobool:false,
+				weixinlogin:false
 
       };
     }
@@ -506,9 +507,19 @@ class LoginDialog extends Component {
   getloginurl=(url)=>{
     window.location.href = url;
   };
+	openweixinlogin=()=>{
+		this.setState({
+			weixinlogin:true
+		})
+	}
+	hideweixinlogin=()=>{
+		this.setState({
+			weixinlogin:false
+		})
+	}
     render() {
       let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco,
-        dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state;
+        dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender,weixinlogin}=this.state;
 
         if (isRender === undefined) {
             isRender = false
@@ -532,14 +543,14 @@ class LoginDialog extends Component {
                   </div>
 
                   <div id="log_reg_content" >
-                    <ul className="log_nav clearfix">
+										{weixinlogin===true?"": <ul className="log_nav clearfix">
                       <li className={login==0?'active':''} onClick={()=>{this.enter(0)}}>登录</li>
                       {/*<li className={speedy==0?'active':''}  onClick={()=>{this.register(0)}}>快捷登录</li>*/}
-                    </ul>
+                    </ul>}
 
 
                       <div className="login-panel" id="login-panel-1" style={{display: login==0?'block':'none'}}>
-                        <form acceptCharset="UTF-8" action="/login" id="main_login_form" method="post">
+												{weixinlogin===true?"":<form acceptCharset="UTF-8" action="/login" id="main_login_form" method="post">
 
                           <div style={{"display":"inline","padding":"0","margin":"0"}}>
                           <input name="utf8" type="hidden" value="✓"></input>
@@ -611,12 +622,26 @@ class LoginDialog extends Component {
 
                           </p>
 
-												{/*<p className="clearfix mt20">*/}
+												<p className="clearfix mt20">
 
-													{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
+													<span className={"startlogin"}>————————  快速登录  ————————</span>
+													<div className={"mt10"}>
+														<a onClick={()=>this.openweixinlogin()}>
+															<img src={require('./WeChat.png')}  alt="微信登录"/>
+														</a>
+													</div>
+												</p>
 
-												{/*</p>*/}
-                        </form>
+                        </form>}
+												{weixinlogin===true?<iframe
+													className={"weixinheight390"}
+													frameBorder="0"
+													sandbox="allow-scripts allow-same-origin allow-top-navigation"
+													scrolling="no"
+													src="https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&response_type=code&scope=snsapi_login#wechat_redirect"></iframe>:""}
+												{weixinlogin===true?<p className="clearfix">
+													<a className={"startlogin color-blue"} onClick={()=>this.hideweixinlogin()}>返回账号登录</a>
+												</p>:""}
                       </div>
 
                       {/*快捷登录*/}

public/react/src/modules/login/Otherlogin.js

@@ -0,0 +1,291 @@
+import React, {Component} from "react";
+import {
+    Form,
+    Select,
+    Input,
+    Button,
+    Checkbox,
+    Upload,
+    Icon,
+    message,
+    Modal,
+    Table,
+    Divider,
+    InputNumber,
+    Tag,
+    DatePicker,
+    Radio,
+    Tooltip,
+    notification,
+	  Layout,
+	  Spin
+} from "antd";
+import axios from 'axios';
+const { Header, Footer, Sider, Content } = Layout;
+import { getImageUrl } from 'educoder'
+import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import '../courses/css/members.css';
+import "../courses/common/formCommon.css"
+import '../courses/css/Courses.css';
+import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
+import educodernet from '../../../src/images/login/educodernet.png';
+
+//educoder登入页面
+var sectionStyle = {
+    "height": "100%",
+    "width": "100%",
+    "min-width": "1000px",
+// makesure here is String确保这里是一个字符串，以下是es6写法
+
+
+};
+var imgback = {
+   " background-size":"cover",
+"background-repeat":"no-repeat",
+    backgroundImage: `url(${beijintulogontwo})`,
+}
+var imgmian ={
+     width: "100%",
+     background: `url(${beijintulogontwo})`,
+     position: "relative",
+
+}
+
+var newContainer={
+    // background: `url(${beijintulogontwo})`,
+    backgroundPosition: "center" ,
+    backgroundRepeat: "no-repeat",
+    backgroundAttachment: "fixed",
+    backgroundSize: "100% 100%",
+    height:" 100%",
+    width:" 100%",
+    position: "absolute",
+    top: "0px",
+    bottom: "0px",
+     minHeight: "100%",
+    paddingTop: "40px",
+
+}
+class Otherlogin extends Component {
+    constructor(props) {
+        super(props);
+        this.state={
+					login:undefined,
+					password:undefined,
+					data:undefined,
+					logintypes:undefined,
+					spinnings:true
+				}
+
+    }
+
+
+    componentDidMount() {
+
+			let url = `/users/get_user_info.json`
+			axios.get(url).then((result)=> {
+				console.log(result);
+				if(result){
+					this.setState({
+						data:result.data,
+						spinnings:false
+					})
+				}
+			}).catch((error)=>{
+				this.setState({
+					spinnings:false
+				})
+			})
+
+
+		}
+
+
+		loginInputonChange=(e)=>{
+			if(e.target.value===undefined||e.target.value===""||e.target.value===null){
+
+			}else{
+				if(this.state.logintypes==="username"){
+					this.setState({
+						logintypes:undefined
+					})
+				}
+			}
+
+			this.setState({
+				login:e.target.value,
+			})
+		}
+		passwordonChange=(e)=>{
+			if(e.target.value===undefined||e.target.value===""||e.target.value===null){
+
+			}else{
+				if(this.state.logintypes==="password"){
+					this.setState({
+						logintypes:undefined
+					})
+				}
+			}
+
+			this.setState({
+				password:e.target.value,
+			})
+		}
+	postwechatlogin=(type,username,password)=>{
+
+    if(type===false){
+    	if(username===undefined||username===""||username===null){
+    		this.setState({
+					logintypes:"username"
+				})
+				return
+			}
+			if(password===undefined||password===""||password===null){
+				this.setState({
+					logintypes:"password"
+				})
+				return
+			}
+		}
+		let url = "/bind_user.json";
+		axios.post(url, {
+			type: 'wechat',
+			not_bind:type,
+			username:username,
+			password:password
+		}).then((response) => {
+			if(response.data.status===0){
+				 window.location.href="/"
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+	render() {
+        let {data,logintypes,spinnings} = this.state;
+
+        console.log(logintypes)
+        return (
+            <div style={newContainer} className=" clearfix" >
+							<Spin size="large" spinning={spinnings} >
+							<style>
+								{
+									`
+									#root{
+									background:#fff !important;
+								   }
+								`
+								}
+							</style>
+
+                <div>
+									<div style={{
+										"width": "100%"
+									}}>
+										<div >
+											<div className={"textcenter"} >
+													<img src={getImageUrl(data&&data.image_url)}/>
+											</div>
+											<div className={"textcenter wechatloginfont"}>
+													为了更好的为您服务，请关联一个EduCoder账号
+											</div>
+										</div>
+
+										<div className={"educontent clearfix wechatdiv"}>
+											<style>
+												{
+													`
+													.ant-layout,.ant-layout-sider,.ant-layout-content{
+													     background: #FFF;
+													}
+													.ant-layout-header {
+																height: 50px;
+																padding: 0 48px;
+																line-height: inherit;
+																background: #001529;
+																background: #FFF;
+															  font-size: 14px;
+																font-family: PingFangSC-Regular,PingFangSC;
+																font-weight: 400;
+																color: rgba(0,0,0,1);
+														}
+														.ant-layout-footer {
+																padding: 0px 50px;
+														    background: #FFF;
+														}
+														.wechattiyan{
+																width:300px;
+																height:46px;
+																background:rgba(25,144,255,1);
+																border-radius:4px;
+														}
+													`
+												}
+											</style>
+											<p>
+												<Layout>
+													<Sider>
+															<div className={"wechatnewchat"}>
+																新用户
+															</div>
+													</Sider>
+													<Layout>
+														<Header>欢迎来到EduCoder，新用户登录EduCoder可以到“账号管理-安全设置”中绑定手机/邮箱，以后可以用绑定的手机/邮箱，设置的密码登录EduCoder了。</Header>
+														<Content className={"wechatContent"}>立即体验表示您已经同意我们的 <span><a href="https://forge.educoder.net/help?index=4" target="_blank" className={"color-blue"}> 服务协议条款</a></span></Content>
+														<Footer>
+															<Button className="login_btn font-16 wechattiyan" type="primary" style={{height:"46px"}} onClick={() => this.postwechatlogin(true)}
+																							size={"large"}>立即体验</Button>
+														</Footer>
+													</Layout>
+												</Layout>
+											</p>
+											<Divider />
+											<p>
+												<Layout>
+													<Sider>
+														<div className={"wechatweoldchat"}>
+															老用户
+														</div>
+													</Sider>
+													<Layout>
+														<Header>已有EduCoder账号，可以输入您的账号和密码，将您的微信账号与EduCoder账号进行绑定。</Header>
+														<Content className={"wechatContent"}>
+
+															<Input placeholder="请输入手机号/邮箱/登录名"
+																		 value={this.state.login}
+																		 onInput={this.loginInputonChange}
+																		 className={this.state.logintypes==="username"?"bor-red mb20 wechatpass":" mb20 wechatpass"}
+																	   ></Input>
+
+															<Input value={this.state.password}
+																		 onInput={this.passwordonChange}
+																		 className={this.state.logintypes==="password"?"bor-red wechatpass":" wechatpass"}
+																		 placeholder="请输入密码"></Input>
+														</Content>
+														{this.state.logintypes==="username"?<span className={"color-red ml50"}>请填写账号</span>:this.state.logintypes==="password"?<span className={"color-red ml50"}>请填写密码</span>:""}
+														<Footer>
+															<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>
+														</Footer>
+													</Layout>
+												</Layout>
+											</p>
+										</div>
+
+									</div>
+                    <div style={{
+                        display: "flex",
+                        justifyContent: "center",
+                        width: "100%",
+                    }}>
+                        <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;2019&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>
+							</Spin>
+            </div>
+        )
+    }
+
+}
+
+export default Otherlogin;

public/react/src/modules/login/Otherloginstart.js

@@ -0,0 +1,52 @@
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+
+import { Spin } from 'antd';
+import axios from 'axios';
+class Otherloginstart extends Component {
+
+	componentDidMount() {
+		let query=this.props.location.search;
+		const type = query.split('?code=');
+		const types = type[1].split('&state=');
+		let codeurl = `/auth/wechat/callback.json`
+		axios.get(codeurl,{params:{
+				code:types[0]
+			}}).then((result)=> {
+			if(result){
+				if(result.data.status===0){
+					if(result.data.true===false){
+						 window.location.href="/otherlogin"
+					}else{
+						// this.getinfo()
+						window.location.href="/"
+					}
+				}
+			}
+		}).catch((error)=>{
+
+		})
+
+	}
+
+	render() {
+		// Loading
+		return (
+			<div className="App" style={{minHeight: '800px',width:"100%"}}>
+				<style>
+					{
+						`
+						 .margintop{
+						   margin-top:20%;
+						 }
+						`
+					}
+				</style>
+				<Spin size="large" className={"margintop"}/>
+			</div>
+		);
+	}
+}
+
+export default Otherloginstart;

public/react/src/modules/user/FindPasswordComponent.js

@@ -594,7 +594,10 @@ class LoginRegisterComponent extends Component {
 
 		})
 	}
-
+	gobackshowbool=()=>{
+		this.props.history.push("/login");
+		this.props.Setshowbool(1)
+	}
 	render() {
 		const {
 			// 登录
@@ -621,7 +624,7 @@ class LoginRegisterComponent extends Component {
 		// height: 346px;
 		return (
 
-			<div className="login_register_content" style={{height: "470px"}}>
+			<div className="login_register_content" >
 				<ReadPassword
 					modalsType={this.state.modalsType}
 					StudyMakeMoney={()=>this.StudyMakeMoney()}
@@ -801,6 +804,9 @@ class LoginRegisterComponent extends Component {
 						<Button  size={"large"} type="primary"
 										 style={{height:"46px", width: "100%",marginBottom:"26px"}}
 										 onClick={this.Retrievepassword}>完成</Button>
+						<p className="clearfix mb20 textcenter">
+							<a className={"startlogin color-blue"} onClick={()=>this.gobackshowbool()}>返回登录注册</a>
+						</p>
 					</div>
 				</div>
 

public/react/src/modules/user/LoginRegisterComponent.js

@@ -67,7 +67,7 @@ class LoginRegisterComponent extends Component {
                 MyEduCoderModals:false,
                 registered:undefined,
                 Phonenumberisnotcodmms:undefined,
-
+							  weixinlogin:false,
             }
         }
         if(props.loginstatus === false){
@@ -105,6 +105,7 @@ class LoginRegisterComponent extends Component {
                 MyEduCoderModals:false,
                 registered:undefined,
                 Phonenumberisnotcodmms:undefined,
+						  	weixinlogin:false,
 
             }
         }
@@ -135,15 +136,22 @@ class LoginRegisterComponent extends Component {
         let pcipns=this.IsPC();
         if (this.props.match.url === "/login") {
             console.log("11111111111111111111111111");
-            this.state = {
-                tab:["0"],
-
-            }
+            // this.state = {
+            //     tab:["0"],
+            //
+            // }
+            this.setState({
+                tab:["0"]
+            })
         } else if (this.props.match.url === "/register") {
-            this.state = {
-                tab:["1"],
-
-            }
+            console.log("11111111111111111111111111");
+            // this.state = {
+            //     tab:["1"],
+            //
+            // }
+            this.setState({
+                tab:["1"]
+            })
         }
         this.setState({
             pciphone:pcipns,
@@ -857,6 +865,18 @@ class LoginRegisterComponent extends Component {
             registered:"注册成功"
         })
     };
+
+	openweixinlogin=()=>{
+		this.setState({
+			weixinlogin:true
+		})
+	}
+	hideweixinlogin=()=>{
+		this.setState({
+			weixinlogin:false,
+        tab:["0"]
+		})
+	}
     render() {
         const {
             // 登录
@@ -881,16 +901,19 @@ class LoginRegisterComponent extends Component {
             readAgreement,
             pciphone,
             Phonenumberisnotcodmms,
+				  	weixinlogin
         } = this.state
         // height: 346px;
         if (this.state.seconds === 0) {
             // window.location.href='http://www.cnblogs.com/a-cat/';
         }
 
-        console.log(classpass);
+
         return (
 
-          <div className="login_register_content login_register_contents" style={  parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}>
+          <div className="login_register_content login_register_contents"
+							 // style={  parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}
+					>
               <style>
                   {
                       `
@@ -903,13 +926,13 @@ class LoginRegisterComponent extends Component {
               </style>
 
               <div>
-                  <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
+								{weixinlogin===false?<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"}}  >注册</Menu.Item>
-                  </Menu>
+                  </Menu>:""}
 
 								{
-                      parseInt(tab[0])==0 &&
+										weixinlogin===false&&parseInt(tab[0])==0 &&
                       <div style={{width: '340px'}}>
                           <style>
                               {
@@ -992,12 +1015,21 @@ class LoginRegisterComponent extends Component {
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
                                   size={"large"}>登录</Button>
+												<p className="clearfix mb10 textcenter">
+
+													<span className={"startlogin"}>————————  快速登录  ————————</span>
+													<div className={"mt10"}>
+														<a onClick={()=>this.openweixinlogin()}>
+															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
+														</a>
+													</div>
+												</p>
                       </div>
                   }
 
 
                   {
-                      parseInt(tab[0])==1 &&
+										weixinlogin===false&&parseInt(tab[0])==1 &&
                       <div style={{width: '340px'}}>
                           <Input  placeholder="请使用手机号/邮箱账号进行注册"
                                   className={Phonenumberisnotcos && Phonenumberisnotcos !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
@@ -1139,15 +1171,33 @@ class LoginRegisterComponent extends Component {
                               color: '#676767',
                           }}>我已阅读并同意
 															<span>
-																<a href={'/help?index=4'} target="_blank" >《服务协议条款》</a>
+																<a href={'https://forge.educoder.net/help?index=4'} target="_blank" className={"color-blue"}>《服务协议条款》</a>
 															</span></span></Checkbox>
-                          <Button className=" font-16" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
+                          <Button className=" font-16 mb20" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
                                   size={"large"}>注册</Button>
 
+												<p className="clearfix mb10 textcenter">
 
+													<span className={"startlogin"}>————————  快速登录  ————————</span>
+													<div className={"mt10"}>
+														<a onClick={()=>this.openweixinlogin()}>
+															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
+														</a>
+													</div>
+												</p>
                       </div>
                   }
+								{weixinlogin===true?<iframe
+									className={"weixinheight390 mt20"}
+									frameBorder="0"
+									sandbox="allow-scripts allow-same-origin allow-top-navigation"
+									scrolling="no"
+									src="https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&response_type=code&scope=snsapi_login#wechat_redirect"></iframe>:""}
+								{weixinlogin===true?<p className="clearfix mb20 textcenter">
+									<a className={"startlogin color-blue"} onClick={()=>this.hideweixinlogin()}>返回登录注册</a>
+								</p>:""}
               </div>
+
           </div>
         );
     }

public/react/src/modules/user/account/AccountSecure.js

@@ -153,20 +153,28 @@ class AccountSecure extends Component {
     })
   }
   onPasswordSubmit = () => {
+  	let {basicInfo}=this.props;
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
+      	if(basicInfo&&basicInfo.has_password===true){
 					if(values.p_old == values.p_new){
 						this.props.showNotification("新密码不能与旧密码相同！");
 						return;
 					}
+				}
+
         if(values.p_again != values.p_new){
           this.props.showNotification("两次输入的新密码必须一致！");
           return;
         }
         let {login}=this.props.current_user;
         let url=`/users/accounts/${login}/password.json`;
+        let p_old=undefined;
+				if(basicInfo&&basicInfo.has_password===true){
+					p_old=values.p_old
+				}
         axios.put((url),{
-          old_password:values.p_old,
+          old_password:p_old,
           password:values.p_new
         }).then((result)=>{
           if(result){
@@ -215,6 +223,8 @@ class AccountSecure extends Component {
     let {basicInfo}=this.props;
     const { getFieldDecorator } = this.props.form;
     const { updating,seconds,secondsFlag } = this.state
+
+		console.log(basicInfo&&basicInfo.has_password)
     return (
       <div>
         <div className="basicForm settingForm">
@@ -426,7 +436,7 @@ class AccountSecure extends Component {
               
               { updating == PASSWORD && 
               <React.Fragment>
-              <Form.Item
+								{basicInfo&&basicInfo.has_password===true?<Form.Item
                 label="旧密码"
                 className="mb20 formItemInline hideRequireTag"
               >
@@ -439,7 +449,7 @@ class AccountSecure extends Component {
                 })(
                   <Input type="password" placeholder="请设置8～16位密码，区分大小写" autoComplete="new-password"></Input>
                 )}
-              </Form.Item>
+              </Form.Item>:""}
 
               <Form.Item
                 label="新密码"

public/react/src/modules/user/common.css

@@ -266,3 +266,13 @@
 .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
   background: transparent !important;
 }
+
+.startlogin{
+    color:#888;
+}
+.weixinheight390{
+    height: 390px;
+}
+#log_reg_content {
+    padding: 38px 30px 20px !important;
+}

public/react/src/modules/user/commontwo.css

@@ -58,7 +58,7 @@
 .login_btn {
     width: 100%;
     margin-top: 26px;
-    margin-bottom: 26px;
+    margin-bottom: 20px;
 }
 .dragValidator {
     margin-bottom: 16px;
@@ -274,3 +274,7 @@
 .ysllw100{
     width: 100%;
 }
+
+.textcenter{
+    text-align: center;
+}