From 00662666cdb7f156380a46bb2b41909ffb24fb89 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 15 Nov 2019 16:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/busyWork/CommonWorkSetting.js  | 2 +-
 .../src/modules/courses/common/comments/CCommentItem.js      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 9e4b9f4b8..30c418eef 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1143,7 +1143,7 @@ class CommonWorkSetting extends Component{
                 rules={rules}
                 course_group={adaptered_group_settings}
                 rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
-                flagPageEdit={true}
+                flagPageEdit={startEditFlag}
                 moduleName="作业"
               ></PollDetailTabForthRules>
             }
diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index 5d904a36b..1d61bc428 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -173,7 +173,8 @@ class CCommentItem extends Component{
 		return parent.journals.map(item => {
 			// <div>{item.content} {item.user_info.user_name}</div>
 								
-			// src={getImageUrl(`images/${item.image_url}`)} 
+			// src={getImageUrl(`images/${item.image_url}`)}
+			const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url;
 			return (
 				<div className="comment_item_cont appraise df clearfix" key={item.id}>
 					<div className="J_Comment_Face fl">
@@ -184,7 +185,7 @@ class CCommentItem extends Component{
 							</a>
 						: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
 							<img alt="用户头像" height="50" 
-								src={`/images/${item.user_info.user_image_url}`}
+								src={imgSrc}
 							width="50"/>
 						</a>}
 					</div>