Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/comment/Comments.js

@@ -23,6 +23,7 @@ import CommentItemMDEditor from './CommentItemMDEditor';
 
 import './Comment.css'
 import Modals from '../modals/Modals'
+import {  InputNumber } from 'antd'
 
 /*
 	-------------------------- 样式相关
@@ -470,7 +471,8 @@ class Comments extends Component {
 	onGoldRewardDialogOkBtnClick() {
 		console.log('onGoldRewardDialogOkBtnClick')
 		const { goldRewardInput } = this.state;
-		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput.indexOf('-') !== -1) {
+		// || goldRewardInput.indexOf('-') !== -1
+		if (!goldRewardInput || goldRewardInput === '0' ) {
 			this.setState({ goldRewardInputError: true})
 			return;
 		} else {
@@ -478,8 +480,13 @@ class Comments extends Component {
 			this.props.rewardCode(this.comment, this.childComment, goldRewardInput)
 		}
 	}
-	onGoldRewardInputChange(event) {
-		 this.setState({ goldRewardInput: event.target.value, goldRewardInputError: false });
+	onGoldRewardInputChange(value) {
+		// e.target.value
+		const number = parseInt(value || 0, 10);
+		if (Number.isNaN(number)) {
+			return;
+		}
+		this.setState({ goldRewardInput: number, goldRewardInputError: false });
 	}
 	render() {
 		const { deleteComment, onPaginationChange, comment_count_without_reply, currentPage, comments, usingAntdModal } = this.props;
@@ -538,11 +545,14 @@ class Comments extends Component {
 			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
 		          	<DialogContent>
 			            
-			            	<FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
+						<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>
+					        </FormControl> */}
 
 				        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
 		          	</DialogContent>

public/react/src/modules/common/RewardDialog.js

@@ -48,9 +48,13 @@ class RewardDialog extends Component {
 			this.props.rewardCode(goldRewardInput)
 		}
 	}
-	onGoldRewardInputChange(event) {
+	onGoldRewardInputChange(value) {
 		// || event.target.value
-		 this.setState({ goldRewardInput: event , goldRewardInputError: false });
+		const number = parseInt(value || 0, 10);
+		if (Number.isNaN(number)) {
+			return;
+		}
+		this.setState({ goldRewardInput: number , goldRewardInputError: false });
 	}
 
   	render() {

public/react/src/modules/forums/shixun/MemoShixun.js

@@ -68,7 +68,7 @@ class MemoShixun extends Component {
       let currentPage = parseInt( arg_currentPage ? arg_currentPage : (parsed.page || 1) )
 
       const paramsObject = {
-          page: currentPage - 1
+          page: currentPage  // - 1   从1开始
       }
      
       let searchValue = arg_searchValue != undefined ? arg_searchValue : this.props.searchValue

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -195,7 +195,7 @@ class DetailTop extends Component{
                 detailInfoList && 
                 <ul className="fl color-grey-eb pathInfo">
                   { detailInfoList.stages_count!=0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""}
-                  { detailInfoList.stage_shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.stage_shixuns_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> : ""}

public/react/src/search/SearchPage.js

@@ -286,10 +286,10 @@ class SearchPage extends Component{
 															</span>
 														</span>}
 
-														{!!item.stage_shixuns_count && <span className="ml20 ziticor">
+														{!!item.shixuns_count && <span className="ml20 ziticor">
 															{/* <i className="iconfont icon-shixunguanqia ziticor"></i> */}
 															<span>实训数:
-																<span className="ml10 ziticor">{item.stage_shixuns_count}</span>
+																<span className="ml10 ziticor">{item.shixuns_count}</span>
 															</span>
 														</span>}
 														{type == 'subject' && !!item.visits_count && <span className="ml20 ziticor">