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

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

@@ -393,7 +393,8 @@ export function TPMIndexHOC(WrappedComponent) {
           }
         })
       }
-      showGlobalLoading = () => {
+      showGlobalLoading = (tip) => {
+        this._gLoadingTip = tip || '加载中，请稍后...';
         this.setState({ globalLoading: true })
       }
       hideGlobalLoading = () => {