From 1503686ddb481d01fc49cbc582759a155ccca944 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Apr 2016 10:09:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E6=9B=B4=E5=A4=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 4 +++-
 public/javascripts/wechat/app.js     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 279cf5fbf..d0e3d2c66 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -219,7 +219,9 @@
 
     </div>
 
-  <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
+  <div ng-if="(count + page * 10) < all_count">
+    <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
+  </div>
 
 </div>
 
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) {
         });

From f3738519e91d00309adb2fea9b08df7049ccfd9e Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 8 Apr 2016 10:10:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=95=BF=E5=8D=95=E8=AF=8D=E6=8A=98?=
 =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 14 +++++++-------
 public/stylesheets/weui/weixin.css   |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 279cf5fbf..3ea46af8f 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -16,7 +16,7 @@
                   <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> 匿评开启时间：{{act.homework_common_detail.evaluation_start}}<br />
                   <span class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
@@ -42,7 +42,7 @@
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
@@ -67,7 +67,7 @@
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline;" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
               </div>
@@ -111,7 +111,7 @@
                   <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
                   <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
@@ -137,7 +137,7 @@
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
@@ -177,7 +177,7 @@
                 <div class="post-content c-grey2 mt10">
                   <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
                 </div>
-                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline;" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
               </div>
               <div class="post-interactive">
@@ -200,7 +200,7 @@
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
                 <div class="cl"></div>
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;}