diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index b4e582336..3391506f2 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -23,15 +23,15 @@
迟交扣分:{{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.activity_type_name}}
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -50,15 +50,15 @@
- 点击展开
+
- {{act.activity_type_name}}
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -77,15 +77,15 @@
- 点击展开
+
- {{act.activity_type_name}}
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -122,15 +122,15 @@
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
- 点击展开
+
- {{act.activity_type_name}}
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -150,15 +150,15 @@
- 点击展开
+
- {{act.activity_type_name}}
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -192,14 +192,14 @@
- 点击展开
+
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
@@ -219,14 +219,14 @@
- 点击展开
+
- {{act.latest_update}}
-
- {{act.reply_count}}
-
- {{act.praise_count}}
- {{act.praise_count}}
+ {{act.latest_update}}
+
+ {{act.reply_count}}
+
+ {{act.praise_count}}
+ {{act.praise_count}}
diff --git a/public/images/wechat/wechat_icon.gif b/public/images/wechat/wechat_icon.gif
new file mode 100755
index 000000000..8d460be80
Binary files /dev/null and b/public/images/wechat/wechat_icon.gif differ
diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png
index 7aa0a4351..cbc3eb565 100755
Binary files a/public/images/wechat/wechat_icon.png and b/public/images/wechat/wechat_icon.png differ
diff --git a/public/images/wechat/wechat_icon2.png b/public/images/wechat/wechat_icon2.png
deleted file mode 100755
index cbc3eb565..000000000
Binary files a/public/images/wechat/wechat_icon2.png and /dev/null differ
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4c9ea260a..5d94afca4 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -376,33 +376,33 @@ app.filter('safeHtml', function ($sce) {
}
});
-app.directive('textAutoHeight', function($timeout){
- return {
- restrict: 'A',
- scope: {},
- link: function(scope, element, attr){
- scope.text = '点击展开';
- $timeout(function(){
- var e = element.parent().children().eq(5);
- var height = e[0].scrollHeight;
- if(height>90){
- element.css('display', 'block');
- element.on('click', function(){
- if(element.text() == "点击展开"){
- e.css("height", height+'px');
- element.text("点击隐藏");
- } else {
- e.css("height", '90px');
- element.text("点击展开");
- }
-
- });
- }
- }, false);
-
- }
- }
-});
+//app.directive('textAutoHeight', function($timeout){
+// return {
+// restrict: 'A',
+// scope: {},
+// link: function(scope, element, attr){
+// scope.text = '点击展开';
+// $timeout(function(){
+// var e = element.parent().children().eq(5);
+// var height = e[0].scrollHeight;
+// if(height>90){
+// element.css('display', 'block');
+// element.on('click', function(){
+// if(element.text() == "点击展开"){
+// e.css("height", height+'px');
+// element.text("点击隐藏");
+// } else {
+// e.css("height", '90px');
+// element.text("点击展开");
+// }
+//
+// });
+// }
+// }, false);
+//
+// }
+// }
+//});
app.directive('inputAuto',function(){
return{
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 64598e381..8b135dbeb 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -8,6 +8,7 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
.f13 {font-size:13px;}
.f15 {font-size:15px;}
.fb {font-weight:bold;}
+.mt2 {margin-top:2px;}
.mt5 {margin-top:5px;}
.mt10 {margin-top:10px;}
.mb5 {margin-bottom:5px;}
@@ -16,6 +17,8 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
.mr10 {margin-right:10px;}
.ml15 {margin-left:15px;}
.mr15 {margin-right:15px;}
+.mr20 {margin-right:20px;}
+.mr25 {margin-right:25px;}
.ml55 {margin-left:55px;}
.mr55 {margin-right:55px;}
.c-blue {color:#269ac9;}
@@ -69,9 +72,9 @@ a.underline {text-decoration:underline;}
.copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;}
.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:hidden; resize:none;}
.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
-.reply-icon {background:url(/images/wechat/wechat_icon.png) -100px 1px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praise-icon {background:url(/images/wechat/wechat_icon.png) -100px -38px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praised-icon {background:url(/images/wechat/wechat_icon.png) -100px -76px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+.reply-icon {background:url(/images/wechat/wechat_icon.gif) -100px 1px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praise-icon {background:url(/images/wechat/wechat_icon.gif) -100px -38px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praised-icon {background:url(/images/wechat/wechat_icon.gif) -100px -76px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
/* loading 弹框*/
.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}