jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

This commit is contained in:
guange 2016-04-08 10:45:10 +08:00
parent aa9cb4e579 4ab96586de
commit 4e50a9e289
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/assets/wechat/activities.html
View File

@ -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.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}} <span class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
</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> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{act.latest_update}}</span> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
@ -42,7 +42,7 @@
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<div class="post-all-content" ng-bind-html="act.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
</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> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{act.latest_update}}</span> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
@ -67,7 +67,7 @@
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<div class="post-all-content" ng-bind-html="act.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
</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> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
</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_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> <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span> <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
</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> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{act.latest_update}}</span> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
@ -137,7 +137,7 @@
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<div class="post-all-content" ng-bind-html="act.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
</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> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{act.latest_update}}</span> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
@ -177,7 +177,7 @@
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<p class="post-all-content" ng-bind-html="act.description|safeHtml"></p> <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
</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> <div class="cl"></div>
</div> </div>
<div class="post-interactive"> <div class="post-interactive">
@ -200,7 +200,7 @@
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<div class="post-all-content" ng-bind-html="act.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
</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> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{act.latest_update}}</span> <span class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
<div class="cl"></div> <div class="cl"></div>
@ -219,7 +219,9 @@
</div> </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> </div>

4
public/javascripts/wechat/app.js
View File

@ -68,7 +68,7 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
console.log("ActivityController load"); console.log("ActivityController load");
$scope.activities = rms.get("activities") || []; $scope.activities = rms.get("activities") || [];
$scope.page = 1; $scope.page = 0;
var loadActData = function(page){ var loadActData = function(page){
$scope.page = page; $scope.page = page;
@ -78,6 +78,8 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
data: {openid: auth.openid(), page: page} data: {openid: auth.openid(), page: page}
}).then(function successCallback(response) { }).then(function successCallback(response) {
$scope.activities = $scope.activities.concat(response.data.data); $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); rms.save('activities', $scope.activities);
}, function errorCallback(response) { }, function errorCallback(response) {
}); });

5
public/stylesheets/weui/weixin.css
View File

@ -26,6 +26,7 @@ a.c-grey {color:#707070;}
a:link,a:visited{text-decoration:none;} a:link,a:visited{text-decoration:none;}
a:hover,a:active{cursor:pointer;} a:hover,a:active{cursor:pointer;}
a.link-blue {color:#269ac9;} a.link-blue {color:#269ac9;}
a.underline {border-bottom:1px solid #269ac9;}
.border-radius {border-radius:5px;} .border-radius {border-radius:5px;}
.max-width-60 {max-width:60px;} .max-width-60 {max-width:60px;}
.max-width-130 {max-width:130px;} .max-width-130 {max-width:130px;}
@ -42,7 +43,7 @@ a.link-blue {color:#269ac9;}
.fl {float:left;} .fl {float:left;}
.fr {float:right;} .fr {float:right;}
.cl {clear:both; overflow:hidden;} .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 {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-column {width:50%; text-align:center; float:left; font-size:13px;}
.post-interactive-reply {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-row {padding:10px; color:#9a9a9a;}
.post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;} .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-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-date {font-size:13px;}
.post-reply-trigger {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;} .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; border-radius:3px;}