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

public/react/src/modules/courses/Video/VideoIndex.js

@@ -361,10 +361,11 @@ class VideoIndex extends Component {
 											{
 												videoId ?
 												  ""
-													:
+													:videos&&videos.length>0?
 													<WordsBtn style="blue" className="ml30 font-16 tongjis"
 																		onClick={() => this.statisticsy(true)}
 													><i className="iconfont icon-tongji1 mr5 font-14"></i>统计</WordsBtn>
+													:""
 											}
 
 										</span>

public/react/src/modules/courses/signin/student/Signedinlist.js

@@ -101,11 +101,20 @@ class Signedinlist extends Component {
   handleChangegroup_ids=(value)=>{
     let neval
     if(!value){
-      neval=[]
+      if(value===0){
-      this.setState({
+        neval=[0]
-        group_ids: [],
+        this.setState({
-        page:1
+          group_ids: [0],
-      })
+          page:1
+        })
+      }else{
+        neval=[]
+        this.setState({
+          group_ids: [],
+          page:1
+        })
+      }
+
     }else{
       neval=[value]
       this.setState({
@@ -327,11 +336,11 @@ class Signedinlist extends Component {
 
             <Row type="flex" justify="end">
 
-              {this.props.defaultActiveKey==="2"?<Col className={"Signedintextright "}>
+              {this.props.defaultActiveKey==="2"?<Col className={"Signedintextright mr5"}>
                 <span className={"color26C7C9 mr20"}>正常签到：{data&&data.normal_count}</span>
                 <span className={"colorEAAE4E mr20"}>请假：{data&&data.leave_count}</span>
                 <span className={"colorFF835C"}>旷课：{data&&data.absence_count}</span>
-              </Col>:<Col className={"Signedintextright "}>
+              </Col>:<Col className={"Signedintextright  mr5"}>
                 <span className={"mr20"}>已签到：<span className={"color1890FF"}>{this.state.course_members_count}</span></span>
                 <span>应签到：<span className={"color1890FF"}>{this.state.attendance_count}</span></span>
               </Col>}

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -662,7 +662,6 @@ export function TPMIndexHOC(WrappedComponent) {
             console.log('failCallback')
           }
         })
-				this.setState({ globalLoading: false })
       }
       yslslowCheckresults =(tip) =>{
 				this._gLoadingTip = tip || '成绩计算中，请稍候...';