Merge remote-tracking branch 'origin/master'

public/react/src/common/components/Cropper.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { getUrl2 } from 'educoder'
+import { getUrl2, isDev } from 'educoder'
 const $ = window.$
 
 let _url_origin = getUrl2()
@@ -81,18 +81,19 @@ class Cropper extends Component {
         $.ajaxSetup({
             cache: true
         });
-
+        const isDev = isDev()
+        let _path = isDev ? 'public' : 'build'
 
         $('head').append($('<link rel="stylesheet" type="text/css" />')
-            .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
+            .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
 
         $.getScript(
-          `${_url_origin}/react/public/js/cropper/cropper.js`,
+          `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
           (data, textStatus, jqxhr) => {
           
         });
         $.getScript(
-          `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
+          `${_url_origin}/react/${_path}/js/cropper/html2canvas.min.js`,
           (data, textStatus, jqxhr) => {
           
         });

public/react/src/modules/courses/members/teacherList.js

@@ -37,7 +37,8 @@ function buildColumns(that) {
     dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
-      return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1 - that.application_list.length}　</a>
+      return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1 
+          - (that.application_list ? that.application_list.length : 0)}　</a>
     }
   }
   // ,{