调整

public/react/src/AppConfig.js

@@ -27,16 +27,16 @@ function locationurl(list){
 
 // TODO 开发期多个身份切换
 let debugType =""
-if (isDev) {
+// if (isDev) {
-  const _search = window.location.search;
+//   const _search = window.location.search;
-  let parsed = {};
+//   let parsed = {};
-  if (_search) {
+//   if (_search) {
-    parsed = queryString.parse(_search);
+//     parsed = queryString.parse(_search);
-  }
+//   }
-  debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+//   debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-    window.location.search.indexOf('debug=s') != -1 ? 'student' :
+//     window.location.search.indexOf('debug=s') != -1 ? 'student' :
-      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+//       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-}
+// }
 // 超管
 // debugType="admin";
 // 老师

public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js

@@ -204,7 +204,7 @@ class PackageIndexNEIBannerConcent extends Component {
 			if(result.data.status===1){
 				this.openNotification("验证码已发送，请注意查收",2);
 			}else{
-				this.openNotification(result.data.success,2);
+				this.openNotification(result.data.message,2);
 			}
 		}).catch((error) => {
 			console.log(error);

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

@@ -656,11 +656,12 @@ submittojoinclass=(value)=>{
 		}
 
 
-
+  if(type==="newshixuns"){
     if(this.props&&this.props.current_user&&this.props.current_user.is_shixun_marker===false){
-    	this.setgoshowqqgtounp(true);
+      this.setgoshowqqgtounp(true);
-    	return;
+      return;
-		}
+    }
+  }
 
 
 
@@ -1276,7 +1277,7 @@ submittojoinclass=(value)=>{
 										<li><a  onClick={(url)=>this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}</a></li>:""
 									}
 									{shixuntype===true?"":
-										<li><a onClick={(url)=>this.getUser("/shixuns/new")}>新建实训项目</a></li>
+										<li><a onClick={(url)=>this.getUser("/shixuns/new","newshixuns")}>新建实训项目</a></li>
 									}
                   {this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>}
                   {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":

public/react/src/modules/user/FindPasswordComponent.js

@@ -170,7 +170,7 @@ class LoginRegisterComponent extends Component {
 			if(result.data.status===1){
 				this.openNotification("验证码已发送，请注意查收",2);
 			}else{
-				this.openNotification(result.data.success,2);
+				this.openNotification(result.data.message,2);
 			}
 		}).catch((error) => {
 			console.log(error);

public/react/src/modules/user/LoginRegisterComponent.js

@@ -620,8 +620,8 @@ class LoginRegisterComponent extends Component {
             // console.log(result);
             if(result.data.status===1){
                 this.openNotification("验证码已发送，请注意查收!",2);
-            }else{
+            }else if(result.data.status===-2){
-                this.openNotification(result.data.success,2);
+                this.openNotification(result.data.message,2);
             }
         }).catch((error) => {
 
@@ -665,7 +665,7 @@ class LoginRegisterComponent extends Component {
         }
         if(this.state.pciphone===true) {
             if (this.state.dragOk === false) {
-                this.openNotification("拖动滑块验证");
+                this.openNotification("请拖动滑块验证");
                 return;
             }
         }