diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index c2df0c8e7..fbdfb1152 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -35,7 +35,7 @@
【作业】{{act.subject|safeHtml}}
-
+
迟交扣分:{{act.homework_common_detail.late_penalty}}分 匿评开启时间:{{act.homework_common_detail.evaluation_start}}
缺评扣分:{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间:{{act.homework_common_detail.evaluation_end}}
@@ -73,7 +73,7 @@
【通知】{{act.subject|safeHtml}}
@@ -109,7 +109,7 @@
【帖子】{{act.subject|safeHtml}}
@@ -162,7 +162,7 @@
【问题】{{act.subject|safeHtml}}
-
+
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
@@ -201,7 +201,7 @@
【帖子】{{act.subject|safeHtml}}
@@ -251,7 +251,7 @@
{{act.latest_update}}
@@ -289,7 +289,7 @@
【博客】{{act.subject|safeHtml}}
@@ -335,7 +335,7 @@
【作业】{{act.subject|safeHtml}}
-
+
迟交扣分:{{act.homework_common_detail.late_penalty}}分 匿评开启时间:{{act.homework_common_detail.evaluation_start}}
缺评扣分:{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间:{{act.homework_common_detail.evaluation_end}}
@@ -373,7 +373,7 @@
【通知】{{act.subject|safeHtml}}
@@ -409,7 +409,7 @@
【帖子】{{act.subject|safeHtml}}
@@ -469,7 +469,7 @@
【问题】{{act.subject|safeHtml}}
-
+
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
@@ -508,7 +508,7 @@
【帖子】{{act.subject|safeHtml}}
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 726755c3d..606164efe 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -36,6 +36,7 @@
+
diff --git a/public/assets/wechat/new_class.html b/public/assets/wechat/new_class.html
index 5ce75d358..843bed0b2 100644
--- a/public/assets/wechat/new_class.html
+++ b/public/assets/wechat/new_class.html
@@ -3,9 +3,9 @@
新建课程
diff --git a/public/assets/wechat/new_project.html b/public/assets/wechat/new_project.html
index 351cee087..a59904e14 100644
--- a/public/assets/wechat/new_project.html
+++ b/public/assets/wechat/new_project.html
@@ -3,8 +3,25 @@
新建项目
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
index 0c8bbe09e..3908d1b40 100644
--- a/public/javascripts/wechat/controllers/invite_code.js
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -15,20 +15,4 @@ app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config
}
);
- vm.share = function(){
- window.WeixinJSBridge.invoke('sendAppMessage',{
- 'appid': 'wxf694495398c7d470', // 公众号appID
- 'type': 'link', // 非必填,music,vido或link,默认为link。
- 'data_url': '', // 非必填,连接地址,如音乐的mp3数据地址,供内置播放器使用
- 'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
- 'img_height':370, // 缩略图高度
- 'img_width':550, // 缩略图宽度
- 'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
- 'desc':'desc', // 描述
- 'title':'title' // 标题
- },function(res){
- //alert(res.err_msg);
- });
- }
-
}]);
diff --git a/public/javascripts/wechat/directives/ellipsis.js b/public/javascripts/wechat/directives/ellipsis.js
index 4107ef68b..a5d5d9845 100644
--- a/public/javascripts/wechat/directives/ellipsis.js
+++ b/public/javascripts/wechat/directives/ellipsis.js
@@ -7,11 +7,18 @@ app.directive('ellipsisShow',["$timeout",function(timer){
scope: {},
link: function(scope, element){
timer(function() {
- var textContent = element.text();
- console.log(textContent);
- //while (textHeight > 100) {
- // element.text(element.text().replace(/(\s)*([a-zA-Z0-9]+|\W)(\.\.\.)?$/, "..."));
- //}
+ var textSplit = element.text().split(" ");
+ var newContent = [];
+ element.text("");
+ for (var i = 0; i < textSplit.length; i++) {
+ newContent = newContent + " " + textSplit[i];
+ element.text(newContent);
+ if(element[0].scrollHeight >= 100){
+ newContent = newContent + " " + textSplit[i+1] + " " + textSplit[i+2] + " " + textSplit[i+3] + " " + textSplit[i+4] + "...";
+ element.text(newContent);
+ break;
+ }
+ }
});
}
}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 447d8b956..58b4a244e 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -111,7 +111,7 @@ a.underline {text-decoration:underline;}
.fl {float:left;}
.fr {float:right;}
.cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:normal; word-wrap:break-word; text-align:justify;}
.post-all-content a {color:#136ec2;}
.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
.post-interactive-column,
@@ -237,4 +237,9 @@ a.underline {text-decoration:underline;}
.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
.mult-reply-content{ color:#555; font-size:13px;}
.mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
\ No newline at end of file
+.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
+
+
+/*20160729项目说明*/
+.project-intro {line-height:2;}
+.project-intro li {list-style:disc; margin-left:20px;}
\ No newline at end of file