From 92218bb829c12da5456247c6a99a95432c8f3ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 10 Oct 2019 14:31:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkDetailIndex.js |  6 +--
 .../busyWork/common/WorkDetailPageHeader.js   |  6 +--
 .../shixunHomework/Listofworksstudentone.js   | 40 ++++++++++---------
 .../shixunHomework/ShixunHomeworkPage.js      |  4 +-
 .../shixunHomework/Trainingjobsetting.js      |  7 +++-
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 8985aa07e..e49d4fb28 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -308,15 +308,11 @@ class CommonWorkDetailIndex extends Component{
                         onClick={() => this.setState({moduleName: '参考答案'})}
                         className={`${childModuleName == '参考答案' ? 'active' : '' } `} 
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
-
-                  {this.props.isAdmin() ?
                   <Link
                         onClick={() => this.setState({moduleName: '设置'})}
                         className={`${childModuleName == '设置' ? 'active' : '' } `}
                         style={{paddingLeft:'38px'}}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>:
-                  ""
-                  }
+                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
                   
 
                   {/* { this.props.tabRightComponents }  */}
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index 68a16d89e..89c9df772 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -144,13 +144,11 @@ class WorkDetailPageHeader extends Component{
                   {view_answer == true && <Link 
                         className={`${childModuleName == '参考答案' ? 'active' : '' } `}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
-                  {this.props.isAdmin()?
+
                   <Link
                         className={`${childModuleName == '设置' ? 'active' : '' } `}
                         style={{paddingLeft:'38px'}}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>:
-                  ""
-                  }
+                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
                   
 
                   { this.props.tabRightComponents } 
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 2380df531..73070497b 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1535,6 +1535,7 @@ class Listofworksstudentone extends Component {
 		// console.log("获取作品列表");
 		// console.log("935");
 		// debugger
+    let searchtype=this.props.history.location.search;
 		let urll = `/homework_commons/${homeworkid}/works_list.json`;
 		var datasysl = {
 			search: this.state.searchtext,
@@ -1587,13 +1588,14 @@ class Listofworksstudentone extends Component {
 				if(this.props.isAdmin() === true){
 					if(result.data.update_score===true){
 						if(bool===true){
-
+							if(searchtype==="?tab=0"){
 						  try {
 								this.props.yslslowCheckresults();
 							}catch (e) {
 
 							}
-							this.setComputeTimet();
+							  this.setComputeTimet();
+							}
 						}
 					}
 				}
@@ -3242,21 +3244,25 @@ class Listofworksstudentone extends Component {
 										 {/*作品状态GraduationTaskssettinglist*/}
 										 <ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 											 <li className="clearfix " >
-												 <span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+												 {/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
+
 
 
+											 </li>
+
+											 <li className="clearfix mt10">
 												 <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 													 {/*{course_is_end===true?"":<span>*/}
-										{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
-										{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
-										{/*		查看最新成绩*/}
-										{/*	</div>:""):*/}
-										{/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-										{/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-										{/*			查看最新成绩*/}
-										{/*		</div>:"")*/}
-										{/*}*/}
-						  	    {/*</span>}*/}
+													 {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
+													 {/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
+													 {/*		查看最新成绩*/}
+													 {/*	</div>:""):*/}
+													 {/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
+													 {/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
+													 {/*			查看最新成绩*/}
+													 {/*		</div>:"")*/}
+													 {/*}*/}
+													 {/*</span>}*/}
 													 <span className="search-newyslw fr ml20">
 										<Search
 											placeholder="请输入姓名或学号搜索"
@@ -3269,10 +3275,6 @@ class Listofworksstudentone extends Component {
 										></Search>
 										</span>
 												 </div>
-											 </li>
-
-											 <li className="clearfix mt10">
-
 												 <span className="fl  mr10 color-grey-8 ">作品状态：</span>
 												 <span className="fl "><a id="graduation_comment_no_limit"
 																									className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
@@ -3567,7 +3569,7 @@ class Listofworksstudentone extends Component {
 
 																		<div className="fr">
 
-																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+																			{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
 												{/*							{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
 												{/*	{computeTimetype===true?*/}
 												{/*		(this.props.isNotMember()===false?*/}
@@ -3800,7 +3802,7 @@ class Listofworksstudentone extends Component {
 																		</style>
 																		<div className="fr">
 
-																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+																			{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
 															{/*				{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
 															{/*	{computeTimetype===true?*/}
 
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index f130ce0b8..3c4449b9f 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -250,10 +250,10 @@ class ShixunHomeworkPage extends Component {
                                     `
 									}</style>
 									:""}
-								{this.props.isAdmin() ?
+
 								<a className={parseInt(tab) === 3 ? "active" : ""}
 									 onClick={(e) => this.ChangeTab(3)}
-								>设置</a>:""}
+								>{this.props.isAdmin()?"设置":"得分规则"}</a>
 								{/*{this.props.isAdmin() ? <a*/}
 								{/*	className="fr color-blue font-16"*/}
 								{/*	href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 47f33327c..a7ed222cd 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -147,7 +147,9 @@ class Trainingjobsetting extends Component {
 
 
 
-
+			if(this.props.isAdmin() === false){
+				this.cancelEdit()
+			}
     }
     // componentWillReceiveProps(nextProps) {
     //     // console.log("+++++++++916");
@@ -2077,6 +2079,9 @@ class Trainingjobsetting extends Component {
         // console.log(this.state.code_review===false)
         // console.log("引入的分值");
         // console.log(this.state.work_efficiencys);
+
+
+
         return (
             <div className=" clearfix "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
                 {this.state.showmodel===true?<ShixunWorkModal

From aeae8a49707aa7602fff4b088e5f80bea39d8a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 10 Oct 2019 14:51:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/elearning/Elearning.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/elearning/Elearning.js b/public/react/src/modules/courses/elearning/Elearning.js
index 2ed4bbaa8..35ef6fb84 100644
--- a/public/react/src/modules/courses/elearning/Elearning.js
+++ b/public/react/src/modules/courses/elearning/Elearning.js
@@ -371,7 +371,7 @@ class Elearning extends Component{
 													<Progress percent={learned} showInfo={false} />
 												</div>
 												<div style={{marginTop:"7px",textAlign: "left"}}>
-													<span className="font-16">上次学至</span><span style={{color:"#4CADFF",marginLeft:"25px"}}>{last_shixun}</span>
+													<span className="font-16">上次学习内容</span><span style={{color:"#4CADFF",marginLeft:"25px"}}>{last_shixun}</span>
 												</div>
 
 

From 0173ddf253e0cf4b332e2c459530b0c1cd4e640f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 10 Oct 2019 15:19:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=E9=97=AD=E7=8E=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E8=AE=BE=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/graduation/tasks/index.js |  2 +-
 .../courses/graduation/topics/index.js        |  2 +-
 .../shixunHomework/Trainingjobsetting.js      |  4 +--
 .../react/src/modules/message/js/MessagSub.js | 29 ++++++++++---------
 .../src/modules/message/js/MessagePrivate.js  |  8 ++---
 .../src/modules/user/usersInfo/InfosTopics.js |  4 +--
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 58d6e37e5..9dac05a36 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -720,7 +720,7 @@ class GraduationTasks extends Component{
               <li className="li_line"><a className="color-grey-9" onClick={() => { this.publish() }}>立即发布</a></li>
               <li className="li_line"><a className="color-grey-9" onClick={() => { this.end() }}>立即截止</a></li>
               {course_public===true?<li className="li_line"><a className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>:""}
-              <li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li>
+              {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li>*/}
             </div>
           </div>
         </div>:""}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index ef4257e2e..2f02113bc 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -447,7 +447,7 @@ onBoardsNew=()=>{
                       {
                         course_public && course_public==1 ? <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(2)}>设为公开</a></li>:""
                       }
-                      <li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>
+                      {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>*/}
                       {/* <li className="li_line"><a href="javascript:void(0)" className="color-grey-9">加入题库</a></li> */}
                     </div>
                   </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index a7ed222cd..9f9eb3d5e 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1723,7 +1723,7 @@ class Trainingjobsetting extends Component {
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
-                            work_efficiencys:true,
+                            work_efficiencys:this.state.work_efficiencys,
                             unifiedsetting:this.state.unifiedsetting,
                             latedeductiontwo:20,
                         });
@@ -1839,7 +1839,7 @@ class Trainingjobsetting extends Component {
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
-                            work_efficiencys:true,
+                            work_efficiencys:result.data.work_efficiency,
                             unifiedsetting:datas.data.unified_setting,
                             latedeductiontwo:20,
                         });
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 24f2df5ed..791b5c063 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -545,7 +545,7 @@ class MessagSub extends Component {
 				{/*下面内容页面*/}
 				<div className="bor-top-greyE mycenter">
 					{/*这里可以进行数据处理*/}
-					<div className="myw100baifenbi">
+					<div className="myw100baifenbi edu-back-white">
 						<Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
 							{
@@ -641,23 +641,24 @@ class MessagSub extends Component {
 									})}
 						</Spin>
 
-						{/*页数*/}
-						{data === undefined ? ""
-							:
-							(count > 10 ?
-									<div style={{textAlign: "center"}} className="new_expand mt10">
-										<div className="edu-txt-center mt30">
-											<Pagination showQuickJumper current={page}
-																	onChange={this.paginationonChanges} pageSize={limit}
-																	total={count}></Pagination>
-										</div>
-									</div> : ""
-							)
 
-						}
 					</div>
 
 				</div>
+				{/*页数*/}
+				{data === undefined ? ""
+					:
+					(count > 10 ?
+							<div style={{textAlign: "center"}} className="new_expand mt10">
+								<div className="edu-txt-center mt30">
+									<Pagination showQuickJumper current={page}
+															onChange={this.paginationonChanges} pageSize={limit}
+															total={count}></Pagination>
+								</div>
+							</div> : ""
+					)
+
+				}
 			</div>
 		)
 	}
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index ec7c20121..dc8e32e67 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -8,6 +8,7 @@ import moment from 'moment';
 import {getImageUrl,markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 //私信页面
 class MessagePrivate extends Component{
 	constructor(props) {
@@ -160,11 +161,8 @@ class MessagePrivate extends Component{
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
 					{
-						data===undefined?"":data.length===0?
-							<div className="edu-tab-con-box clearfix edu-txt-center">
-								<img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
-								<p className="edu-nodata-p mb20">暂无数据哦~</p>
-							</div>
+						data===undefined?<NoneData></NoneData> :data.length===0?
+							<NoneData></NoneData>
 							:data.map((item,key)=>{
 								return(
 										<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 76979c9f5..3b76bfa28 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -297,8 +297,8 @@ class InfosTopics extends Component{
 		let categorylist=[
 			{val:"普通作业",type:"normal"},
 			{val:"分组作业",type:"group"},
-			{val:"毕设选题",type:"gtopic"},
-			{val:"毕设任务",type:"gtask"},
+			// {val:"毕设选题",type:"gtopic"},
+			// {val:"毕设任务",type:"gtask"},
 			{val:"试卷",type:"exercise"},
 			{val:"问卷",type:"poll"},
 			]

From c6c37bf5d7c5c7e4f616c05eeae3d6b60bfa4dac Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 10 Oct 2019 15:21:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/polls_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 6be131d7a..dcbded6fe 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -692,7 +692,7 @@ class PollsController < ApplicationController
         else
           unified_setting = @poll.unified_setting
         end
-        show_result = params[:show_result].to_i
+        show_result = params[:show_result]
         un_anonymous = params[:un_anonymous] ? true : false
         # 统一设置或者分班为0，则更新问卷，并删除问卷分组
         if unified_setting || (course_group_ids.size == 0)

From 1c94493f2e0fab099883b73c891758931fdcba4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 10 Oct 2019 15:22:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=89=8B=E6=9C=BA=E5=92=8C=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E8=AF=B7=E4=BB=8E=E6=8E=A5=E5=8F=A3=E4=B8=AD=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/account/AccountSecure.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js
index e5b03e36b..797b350d2 100644
--- a/public/react/src/modules/user/account/AccountSecure.js
+++ b/public/react/src/modules/user/account/AccountSecure.js
@@ -284,7 +284,7 @@ class AccountSecure extends Component {
                 <div className="description">
                   {
                     basicInfo && basicInfo.phone ?
-                    <span>{ regPhoneAndEmail(basicInfo.phone) }</span>
+                    <span>{  basicInfo.phone }</span>
                     :
                     <span style={{color: '#EA320E'}}>未绑定</span>
                   }
@@ -348,7 +348,7 @@ class AccountSecure extends Component {
                 <div className="description">
                   {
                     basicInfo && basicInfo.mail ?
-                    <span>{ regPhoneAndEmail(basicInfo.mail) }</span>
+                    <span>{ basicInfo.mail }</span>
                     :
                     <span style={{color: '#EA320E'}}>未绑定</span>
                   }