diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb index 3ba82bcb9..a90ff323d 100644 --- a/app/api/mobile/entities/activity.rb +++ b/app/api/mobile/entities/activity.rb @@ -41,11 +41,11 @@ module Mobile end when :description if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News" - ac.act.description unless ac.nil? || ac.act.nil? + strip_html(ac.act.description) unless ac.nil? || ac.act.nil? elsif ac.act_type == "Message" || ac.act_type == "BlogComment" - ac.act.content unless ac.nil? || ac.act.nil? + strip_html(ac.act.content) unless ac.nil? || ac.act.nil? elsif ac.act_type == "JournalsForMessage" - ac.act.notes unless ac.nil? || ac.act.nil? + strip_html(ac.act.notes) unless ac.nil? || ac.act.nil? end when :latest_update time_from_now ac.updated_at unless ac.nil? diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index dbf5e8b27..018c98f32 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -5,26 +5,28 @@
-
+
-
- - -
- -
-
- 迟交扣分:{{act.homework_common_detail.late_penalty}}分 匿评开启时间:{{act.homework_common_detail.evaluation_start}}
- 缺评扣分:{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间:{{act.homework_common_detail.evaluation_end}} +
+
+ + +
+ +
+
+ 迟交扣分:{{act.homework_common_detail.late_penalty}}分 匿评开启时间:{{act.homework_common_detail.evaluation_start}}
+ 缺评扣分:{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间:{{act.homework_common_detail.evaluation_end}} +
+ +
- -
{{act.activity_type_name}} {{act.latest_update}} @@ -39,19 +41,21 @@
-
+
-
- - -
- -
-
+ - -
{{act.activity_type_name}} {{act.latest_update}} @@ -66,19 +70,21 @@
-
+
-
- - -
- -
-
+ - -
{{act.activity_type_name}} {{act.latest_update}} @@ -109,21 +115,23 @@
-
+
-
- - -
- -
-
- 状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
- 指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}% +
+
+ + +
+ +
+
+ 状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
+ 指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}% +
+ +
- -
{{act.activity_type_name}} {{act.latest_update}} @@ -139,19 +147,21 @@
-
+
-
- - -
- -
-
+ - -
{{act.activity_type_name}} {{act.latest_update}} @@ -181,19 +191,21 @@
-
+
-
- - -
-
-
-

+
+
+ + +
+
+
+
+
+ +
- -
{{act.latest_update}} {{act.reply_count}} @@ -208,19 +220,21 @@
-
+
-
- - -
- -
-
+ - -
{{act.latest_update}} {{act.reply_count}} diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif index 1d7dcb061..8b38366c6 100755 Binary files a/public/images/wechat/icon_list.gif and b/public/images/wechat/icon_list.gif differ diff --git a/public/images/wechat/icon_list2.gif b/public/images/wechat/icon_list2.gif new file mode 100755 index 000000000..1d7dcb061 Binary files /dev/null and b/public/images/wechat/icon_list2.gif differ diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 5f0e5343f..ba3eac3df 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -52,7 +52,7 @@ a.underline {text-decoration:underline;} .fl {float:left;} .fr {float:right;} .cl {clear:both; overflow:hidden;} -.post-content {width:100%; font-size:13px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;} +.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;} .post-content img {max-width:100%;} .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;} .post-interactive-column,