From 070b48d85f5ecad26a7061ff428bdae72c18d40d Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 15:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 53aa69bd3..69ea8f1fa 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -27,7 +27,6 @@
                   <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <span class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
                 <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
                 <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index e1b648051..0fc39c735 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -15,7 +15,15 @@
                     <tr>
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
-                    </tr></table>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap v-top">类&nbsp;&nbsp;&nbsp;别：</td>
+                        <td><span ng-if="homework.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
+                            <span ng-if="homework.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
+                            <span ng-if="homework.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
+                        </td>
+                    </tr>
+                </table>
                 <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="homework.description|safeHtml"></div>
                 <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>