diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 7494b7033..dfd60e68a 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -7,29 +7,32 @@
-
- - +
-
+ +
迟交扣分:{{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.latest_update}} + {{act.activity_type_name}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
@@ -38,23 +41,25 @@
-
- - +
+ +
+
- 点击展开 + 点击展开
- {{act.latest_update}} + {{act.activity_type_name}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
@@ -63,23 +68,25 @@
-
- - +
+ +
+
- 点击展开 + 点击展开
- {{act.latest_update}} + {{act.activity_type_name}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
@@ -89,7 +96,7 @@
-
+
@@ -104,25 +111,27 @@
-
- - +
+ +
-
+ +
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
- 点击展开 + 点击展开
- {{act.latest_update}} + {{act.activity_type_name}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
@@ -132,23 +141,25 @@
-
- - +
+ +
-
+ +
- 点击展开 + 点击展开
- {{act.latest_update}} + {{act.activity_type_name}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
@@ -157,7 +168,7 @@
-
+
@@ -172,20 +183,23 @@
-
- - +
+ +
-
+
+

- 点击展开 + 点击展开 +
+ {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
@@ -196,23 +210,24 @@
-
- - +
+ +
+
- 点击展开 + 点击展开
- {{act.latest_update}} + {{act.latest_update}} + + {{act.reply_count}} +
+
{{act.praise_count}}
+
{{act.praise_count}}
-
-
回复 ({{act.reply_count}})
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
-
diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png new file mode 100755 index 000000000..cbc3eb565 Binary files /dev/null and b/public/images/wechat/wechat_icon.png differ diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index 35d2a1b3d..e9f45f3a9 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -377,7 +377,7 @@ app.directive('textAutoHeight', function($timeout){ link: function(scope, element, attr){ scope.text = '点击展开'; $timeout(function(){ - var e = element.parent().children().eq(4); + var e = element.parent().children().eq(5); var height = e[0].scrollHeight; var offsetHeight = e[0].offsetHeight; if(height>90){ diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index f164b80e3..ead53557b 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -4,6 +4,7 @@ /*基本样式*/ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";} h1,h2,h3,h4,h5,p {padding:0px; margin:0px;} +.f12 {font-size:12px;} .f13 {font-size:13px;} .f15 {font-size:15px;} .fb {font-weight:bold;} @@ -29,6 +30,7 @@ a:hover,a:active{cursor:pointer;} a.link-blue {color:#269ac9;} a.underline {text-decoration:underline;} .border-radius {border-radius:5px;} +.w36 {width:36px;} .max-width-60 {max-width:60px;} .max-width-130 {max-width:130px;} .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} @@ -39,9 +41,9 @@ a.underline {text-decoration:underline;} /*动态样式*/ .post-container {width:100%;} -.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:15px auto;} +.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:10px auto;} .post-main {padding:10px; color:#9a9a9a;} -.post-avatar {width:45px; height:45px; margin-right:10px;} +.post-avatar {width:40px; height:40px; margin-right:5px;} .post-title {font-size:13px; text-align:left;} .post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;} .fl {float:left;} @@ -63,4 +65,7 @@ a.underline {text-decoration:underline;} .post-reply-date, .post-reply-trigger {font-size:13px;} .post-input-container {padding-right:2px;} .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;} -.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;} \ No newline at end of file +.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;} \ No newline at end of file