合并

public/react/src/AppConfig.js

@@ -42,7 +42,7 @@ if (isDev) {
       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
-// debugType="admin";
+debugType="admin";
 // 老师
 //debugType="teacher";
 // 学生
@@ -136,7 +136,7 @@ export function initAxiosInterceptors(props) {
       // proxy="https://test-jupyterweb.educoder.net"
       // proxy="https://test-newweb.educoder.net"
       // proxy="https://test-jupyterweb.educoder.net"
-	     //proxy="http://192.168.2.63:3001"
+	     //proxy="https://test-jupyterweb.educoder.net/"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -432,7 +432,9 @@ class Newshixuns extends Component {
       },
     }
 
-    return (
+
+
+		return (
       <div className="newMain clearfix">
         <style>
           {
@@ -621,9 +623,10 @@ class Newshixuns extends Component {
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                                   <div className={"font-12"} style={{'max-width': '600px'}}>
                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
-                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
+                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.subvalues}`}
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  ""}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+
-                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
+
+
                                   </div>}
 
                               </div>