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

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -463,7 +463,7 @@ class PollDetailTabForthRules extends Component{
 											disabledTime={disabledDateTime}
 											disabledDate={disabledDate}
 											disabled={
-                        this.props.isAdmin()===true?this.props.type==="Shixun"?false:
+                        this.props.isAdmin()===true?this.props.type==="Shixun"?!flagPageEdit:
 										    this.props.type==="Exercise"||this.props.type==="polls"?
 											  rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ?this.props.isAdmin()?!flagPageEdit: true : !flagPageEdit : rule.e_timeflag == true ? this.props.isAdmin()?!flagPageEdit :true : !flagPageEdit:
                           rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ? true : !flagPageEdit : rule.e_timeflag == true ? true : !flagPageEdit:true

public/react/src/modules/paths/statics/index.js

@@ -64,6 +64,7 @@ const App = (props) => {
       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
     },
@@ -183,6 +184,7 @@ const App = (props) => {
       align: 'center',
       with: 130,
       render: (val) => val + '',
+      defaultSortOrder: 'descend',
       sorter: (a, b) => a.passed_games_count - b.passed_games_count
     },
     {