From 60cce7c7818704bf2d2d9750c8d48a2fc2a139c8 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 23 Sep 2016 17:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BD=9C=E4=B8=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=8F=90=E4=BA=A4=E5=8F=8A=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html      | 12 ++++++------
 public/assets/wechat/homework_detail.html |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 6c42ef098..f80f44fb3 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -37,10 +37,10 @@
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>
                     <span class="mr15 f12 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
                     <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f12 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
-                    <div class="f13 c-grey2">作品提交数：<span class="c-blue"> 10</span></div>
+                    <div ng-if="act.homework_common_detail.homework_commit_count > 0" class="f13 c-grey2">作品提交数：<span class="c-blue">{{act.homework_common_detail.homework_commit_count}}</span></div>
                     <div class="f13 c-grey2">
-                      #1个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 评阅了作品<br/>
-                      #2个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 提交了作品
+                      <div ng-if="act.homework_common_detail.last_commit_info">#{{act.homework_common_detail.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_commit_info.lastname}}</span> 提交了作品</div>
+                      <div ng-if="act.homework_common_detail.last_score_info">#{{act.homework_common_detail.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_score_info.lastname}}</span> 评阅了作品</div>
                     </div>
                   </div>
                   <div class="cl"></div>
@@ -407,10 +407,10 @@
                                       <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>
                                       <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
                                       <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
-                                      <div class="f13 c-grey2">作品提交数：<span class="c-blue"> 10</span></div>
+                                      <div ng-if="act.homework_common_detail.homework_commit_count > 0" class="f13 c-grey2">作品提交数：<span class="c-blue">{{act.homework_common_detail.homework_commit_count}}</span></div>
                                       <div class="f13 c-grey2">
-                                          #1个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 评阅了作品<br/>
-                                          #2个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 提交了作品
+                                          <div ng-if="act.homework_common_detail.last_commit_info">#{{act.homework_common_detail.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_commit_info.lastname}}</span> 提交了作品</div>
+                                          <div ng-if="act.homework_common_detail.last_score_info">#{{act.homework_common_detail.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_score_info.lastname}}</span> 评阅了作品</div>
                                       </div>
                                   </div>
                                   <div class="cl"></div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 1806f9eb7..e8e56126d 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -30,10 +30,10 @@
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
                 <div class="cl"></div>
-                <div class="f12 c-grey mt5 mb5">作品提交数：<span class="c-blue"> 10</span></div>
+                <div ng-if="homework.homework_commit_count > 0" class="f12 c-grey mt5 mb5">作品提交数：<span class="c-blue">{{homework.homework_commit_count}}</span></div>
                 <div class="f12 c-grey mb5">
-                    #1个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 评阅了作品<br/>
-                    #2个月前 <span class="c-blue ml5 mr5">胡莎莎</span> 提交了作品
+                    <div ng-if="homework.last_commit_info">#{{homework.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{homework.last_commit_info.lastname}}</span> 提交了作品</div>
+                    <div ng-if="homework.last_score_info">#{{homework.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{homework.last_score_info.lastname}}</span> 评阅了作品</div>
                 </div>
                 </div>
                 <div class="fr f13">