Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?66`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?66`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?66`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -953,10 +953,10 @@ class Shixuninformation extends Component {
                       <div>
                            {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.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.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.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}`}
                              </div>}
                       </div>
                 </span>

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

@@ -620,10 +620,10 @@ class Newshixuns extends Component {
                               <div>
                                 {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.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.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.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}`}
                                   </div>}
 
                               </div>