diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 279cf5fbf..1642eb159 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -16,7 +16,7 @@
迟交扣分:{{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.latest_update}}
@@ -42,7 +42,7 @@
- 点击展开
+ 点击展开
{{act.latest_update}}
@@ -67,7 +67,7 @@
- 点击展开
+ 点击展开
{{act.latest_update}}
@@ -111,7 +111,7 @@
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
- 点击展开
+ 点击展开
{{act.latest_update}}
@@ -137,7 +137,7 @@
- 点击展开
+ 点击展开
{{act.latest_update}}
@@ -177,7 +177,7 @@
- 点击展开
+ 点击展开
@@ -200,7 +200,7 @@
-
点击展开
+
点击展开
{{act.latest_update}}
@@ -219,7 +219,9 @@
- 更多
+
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index afb33eca2..e68563c3d 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -68,7 +68,7 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
console.log("ActivityController load");
$scope.activities = rms.get("activities") || [];
- $scope.page = 1;
+ $scope.page = 0;
var loadActData = function(page){
$scope.page = page;
@@ -78,6 +78,8 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
data: {openid: auth.openid(), page: page}
}).then(function successCallback(response) {
$scope.activities = $scope.activities.concat(response.data.data);
+ $scope.all_count = response.data.all_count;
+ $scope.count = response.data.count;
rms.save('activities', $scope.activities);
}, function errorCallback(response) {
});
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 10e1a329a..9a3a94360 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -26,6 +26,7 @@ a.c-grey {color:#707070;}
a:link,a:visited{text-decoration:none;}
a:hover,a:active{cursor:pointer;}
a.link-blue {color:#269ac9;}
+a.underline {border-bottom:1px solid #269ac9;}
.border-radius {border-radius:5px;}
.max-width-60 {max-width:60px;}
.max-width-130 {max-width:130px;}
@@ -42,7 +43,7 @@ a.link-blue {color:#269ac9;}
.fl {float:left;}
.fr {float:right;}
.cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden;}
+.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:normal; word-wrap:break-word;}
.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
.post-interactive-column {width:50%; text-align:center; float:left; font-size:13px;}
.post-interactive-reply {width:50%; text-align:center; float:left; font-size:13px;}
@@ -55,7 +56,7 @@ a.link-blue {color:#269ac9;}
.post-reply-row {padding:10px; color:#9a9a9a;}
.post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
.post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
-.post-reply-content {font-size:13px; text-align:left;}
+.post-reply-content {font-size:13px; text-align:left; word-break:normal; word-wrap:break-word;}
.post-reply-date {font-size:13px;}
.post-reply-trigger {font-size:13px;}
.post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; border-radius:3px;}