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:
yuanke 2016-07-22 16:42:47 +08:00
parent 37a6adf428 7d2ba823e9
commit cedd7ae520
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/wechat/class.html
View File

@ -1,6 +1,6 @@
<div class="post-container">
<div loading-spinner></div>
<div class="class-detail-name">{{course.name}}<span ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
<div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.name}}</span><span ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
<div class="tab-wrap">
<a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
</div>

6
public/javascripts/wechat/controllers/activity.js
View File

@ -122,12 +122,14 @@ app.controller('ActivityController',
}
break;
}
rms.save("tab_num",$scope.currentTab);
}
$scope.currentTab = 1;
$scope.currentTab = rms.get('tab_num') || 1;
if($scope.activities.length<=0){
$scope.loadActData(1,0);
$scope.loadActData('tab_num',0);
} else {
$timeout(function(){
window.scrollTo(0, rms.get("yoffset"));

17
public/javascripts/wechat/directives/ellipsis.js Normal file
View File

@ -0,0 +1,17 @@
/**
* Created by Tim on 7/22/16.
*/
app.directive('ellipsisShow',function(){
return{
restrict: 'A',
scope: {},
link: function(scope, element){
var textWrap = element.children().eq(0);
var textHeight = textWrap[0].scrollHeight;
console.log(textWrap[0].innerHTML);
while (textHeight > 100) {
textWrap[0].innerTEXT = "replaced";
}
}
}
});

2
public/javascripts/wechat/directives/input_auto.js
View File

@ -6,7 +6,7 @@ app.directive('inputAuto',function(){
var copyContainer = element.parent().children().children().eq(0);
var sendButton = element.next();
element.on('input',function(){
console.log(sendButton);
//console.log(sendButton);
copyContainer.html(element[0].value);
var textHeight = copyContainer[0].scrollHeight-10;
element.css('height', textHeight + 'px');

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

@ -198,6 +198,7 @@ a.underline {text-decoration:underline;}
.resource-width {width:76%;}
.courseware-from-width {max-width:57%;}
.other-from-width {max-width:80%;}
.course-name-width {width:68%;}
/*20160614班级列表*/
.course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff; border-bottom:1px solid #ccc;}