From 8bbdf3688cb91ebe8aad41f942d66a305915bac0 Mon Sep 17 00:00:00 2001 From: txz Date: Mon, 13 Jun 2016 15:25:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7css=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/weui/weixin.css | 48 ++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 6cccb3615..4c7439308 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -3,7 +3,7 @@ /*基本样式*/ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";} -h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;} +body, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;} img {max-width:100%;} blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;} .text-control {word-break:normal; word-wrap:break-word;} @@ -12,10 +12,12 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin .f15 {font-size:15px;} .fb {font-weight:bold;} .mt2 {margin-top:2px;} +.mt4 {margin-top:4px;} .mt5 {margin-top:5px;} .mt10 {margin-top:10px;} .mb5 {margin-bottom:5px;} .mb10 {margin-bottom:10px;} +.mb20 {margin-bottom:20px;} .ml10 {margin-left:10px;} .mr5 {margin-right:5px;} .mr10 {margin-right:10px;} @@ -29,12 +31,15 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin .c-grey {color:#9a9a9a;} .c-grey2 {color:#707070;} .c-grey3 {color:#555555;} +.c-grey4 {color:#888888;} +.c-blue {color:#3b94d6;} a {color:#707070;} a.c-grey {color:#707070;} a.c-grey2 {color:#9a9a9a;} a:link,a:visited{text-decoration:none;} a:hover,a:active{cursor:pointer;} a.link-blue {color:#269ac9;} +a.link-blue2 {color:#3b94d6;} a.underline {text-decoration:underline;} .border-radius {border-radius:5px;} .w36 {width:36px;} @@ -42,9 +47,14 @@ a.underline {text-decoration:underline;} .max-width-130 {max-width:130px;} .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .inline-block {display:inline-block;} +.dis {display:block;} .undis {display:none;} .text-nowrap {white-space:nowrap;} .v-top {vertical-align:top;} +.tac {text-align:center;} + +/*背景色*/ +.bg-grey {background-color:#c1c1c1;} /*动态样式*/ .post-container {width:100%;} @@ -88,4 +98,38 @@ a.underline {text-decoration:underline;} /*帖子锁定样式*/ .locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;} -.bg-grey {background-color:#c1c1c1;} +/*20150612加入班级样式*/ +.add-class-box {width:80%; max-width:300px; min-width:240px; height:150px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; margin-top:100px;} +.add-class-tip {padding-top:20px; padding-bottom:20px;} +.class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;} +.cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;} +.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;} +.slice {width:2%; text-align:center; border-top:1px solid #ccc;} +.slice-line {width:1px; height:37px; margin:auto; background:#ccc;} + +/*20160613邀请码样式*/ +.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;} +.qr-code-box {width:225px; height:332px; background-color:#fff; border-radius:3px; margin:0 auto;} +.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;} +.qr-code-img {margin:36px auto; display:block;} +.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;} +.share-code-wrap {width:100%; background-color:#efeff4;} +.share-code-btn {width:145px; height:40px; color:#fff; font-size:15px; line-height:40px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;} +.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:0 auto;} + +/*20160613班级详情*/ +.class-detail-name {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;} +.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;} +.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;} +.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;} +.class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;} +.class-tab-active {border-bottom:1px solid #3b94d6;} +.class-search-wrap {padding:8px 12px; position:relative;} +.class-search-inner {padding:0 30px; background-color:#fff;} +.class-search-icon {position:absolute; top:16px; left:16px;} +.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;} +.border-top {border-top:1px solid #ccc;} +.class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;} +.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;} +.img-circle {border-radius:50%;} \ No newline at end of file From 962470c5826e91e47e59dd055df5449f819f8042 Mon Sep 17 00:00:00 2001 From: txz Date: Mon, 13 Jun 2016 17:23:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/activities.html | 4 ++-- public/stylesheets/weui/weixin.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 69ea8f1fa..2ab2e2d61 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -20,7 +20,7 @@
-
+
迟交扣分：{{act.homework_common_detail.late_penalty}}分 匿评开启时间：{{act.homework_common_detail.evaluation_start}}
缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
@@ -127,7 +127,7 @@
-
+
状态：{{act.issue_detail.issue_status}} 优先级：{{act.issue_detail.issue_priority}}
指派给：{{act.issue_detail.issue_assigned_to}} 完成度：{{act.issue_detail.done_ratio}}%
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 4c7439308..cc4db7e17 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -66,7 +66,7 @@ a.underline {text-decoration:underline;} .fl {float:left;} .fr {float:right;} .cl {clear:both; overflow:hidden;} -.post-content {width:100%; font-size:13px; line-height:18px; height:95px; overflow:hidden; word-break:break-all; word-wrap:break-word;} +.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; 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-column, .post-interactive-reply, From a2450defc67252920bf39984187c23e3cc2e7f40 Mon Sep 17 00:00:00 2001 From: txz Date: Mon, 13 Jun 2016 17:32:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=B1=BB=E5=88=AB=E6=96=87=E5=AD=97=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/homework_detail.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 0fc39c735..4de1c7b37 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -18,9 +18,9 @@ 类   别： - 普通作业 - 编程作业 - 分组作业 + 普通作业 + 编程作业 + 分组作业 From 270399c5dade14b39ef3893f93e2402fd4ad9726 Mon Sep 17 00:00:00 2001 From: txz Date: Tue, 14 Jun 2016 14:04:39 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=97=B6=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=8A=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/activities.html | 54 ++++++++++++++-------------- public/stylesheets/weui/weixin.css | 1 + 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 2ab2e2d61..476ae3690 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -33,9 +33,9 @@ {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -59,12 +59,12 @@
{{act.activity_type_name}} - {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -88,12 +88,12 @@
{{act.activity_type_name}} - {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -135,12 +135,12 @@
{{act.activity_type_name}} - {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -165,12 +165,12 @@
{{act.activity_type_name}} - {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -208,12 +208,12 @@
- {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -237,12 +237,12 @@
- {{act.latest_update}} + {{act.latest_update}} 回复 {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index cc4db7e17..514cb92aa 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -88,6 +88,7 @@ a.underline {text-decoration:underline;} .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} +.num-block {width:12px; text-align:center; display:inline-block; vertical-align:top;} /* 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;} From 994ce342d71abe8efed5ef605c380ab2775603a8 Mon Sep 17 00:00:00 2001 From: txz Date: Fri, 17 Jun 2016 15:35:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1ul=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/weui/weixin.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 514cb92aa..9954ac755 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -3,7 +3,8 @@ /*基本样式*/ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";} -body, h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;} +body, h1,h2,h3,h4,h5,p,pre,ul {padding:0px; margin:0px;} +ul li {margin-left:40px;} img {max-width:100%;} blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;} .text-control {word-break:normal; word-wrap:break-word;} @@ -88,7 +89,7 @@ a.underline {text-decoration:underline;} .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} -.num-block {width:12px; text-align:center; display:inline-block; vertical-align:top;} +.num-block {display:inline-block; vertical-align:top;} /* 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;} From acf17d625218eb8482a99b6cd93c02b0d95534c4 Mon Sep 17 00:00:00 2001 From: txz Date: Fri, 17 Jun 2016 15:45:29 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=93=BE=E6=8E=A5=E6=B7=BB=E5=8A=A0=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/blog_detail.html | 2 +- public/assets/wechat/course_discussion.html | 2 +- public/assets/wechat/course_notice.html | 2 +- public/assets/wechat/homework_detail.html | 2 +- public/assets/wechat/issue_detail.html | 2 +- public/assets/wechat/jour_message_detail.html | 2 +- public/assets/wechat/project_discussion.html | 2 +- public/stylesheets/weui/weixin.css | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 509e0171a..ee651eadf 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -8,7 +8,7 @@
{{blog.title}}
{{blog.user.realname}}发表博客
-
+
{{blog.created_at}}
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 2e7ed3151..aa1b05fd9 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -15,7 +15,7 @@ 来   源： {{discussion.course_project_name}}  |  课程问答区 -
+
{{discussion.created_on}}
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index cca135681..bbf08e03d 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -14,7 +14,7 @@ 来   源： {{news.course_name}}  |  课程通知 -
+
{{news.created_on}}
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 4de1c7b37..c22e89021 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -24,7 +24,7 @@ -
+
迟交扣分：{{homework.late_penalty}}分
缺评扣分：{{homework.absence_penalty}}分/作品
 匿评开启时间：{{homework.evaluation_start}}
 diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index 1d7f9a536..70b9286dd 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -14,7 +14,7 @@ 来   源： {{issue.project_name}}  |  项目问题 -
+
状   态：{{issue.issue_status}}
优先级：{{issue.issue_priority}}
指派给：{{issue.issue_assigned_to}}
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index dc6b1409f..a1b79379f 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -7,7 +7,7 @@
{{message.user.realname}}给您留言了
{{message.created_on}}
-
+
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 4831e1521..7bc4b0005 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -14,7 +14,7 @@ 来   源： {{discussion.course_project_name}}  |  项目讨论区 -
+
{{discussion.created_on}}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 9954ac755..d664be450 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -68,6 +68,7 @@ a.underline {text-decoration:underline;} .fr {float:right;} .cl {clear:both; overflow:hidden;} .post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;} +.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, .post-interactive-reply, From 18df93ba9fcfed58d91109fa8e68f6d2fe6b381a Mon Sep 17 00:00:00 2001 From: txz Date: Fri, 17 Jun 2016 16:16:24 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/activities.html | 126 +++++++++++++++------------ public/stylesheets/weui/weixin.css | 2 + 2 files changed, 72 insertions(+), 56 deletions(-) diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 476ae3690..54a00c1f7 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -27,16 +27,18 @@
- 普通作业 - 编程作业 - 分组作业 - {{act.latest_update}} - 回复 - {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+
+ 普通作业 + 编程作业 + 分组作业 + {{act.latest_update}} + 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
+
+
@@ -58,14 +60,16 @@
- {{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}}
+
+
@@ -87,14 +91,16 @@
- {{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}}
+
+
@@ -134,14 +140,16 @@
- {{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}}
+
+
@@ -164,14 +172,16 @@
- {{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}}
+
+
@@ -208,13 +218,15 @@
- {{act.latest_update}} - 回复 - {{act.reply_count}} -
赞
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+
+ {{act.latest_update}} + 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
+
+
@@ -237,13 +249,15 @@
- {{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/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index d664be450..3fd9acd37 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -13,6 +13,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin .f15 {font-size:15px;} .fb {font-weight:bold;} .mt2 {margin-top:2px;} +.mt3 {margin-top:3px;} .mt4 {margin-top:4px;} .mt5 {margin-top:5px;} .mt10 {margin-top:10px;} @@ -91,6 +92,7 @@ a.underline {text-decoration:underline;} .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} .num-block {display:inline-block; vertical-align:top;} +.post-op-banner {height:20px; line-height:20px; 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;} From b17b92cc3ec7341ef1d1e2179be0de623605a725 Mon Sep 17 00:00:00 2001 From: txz Date: Mon, 20 Jun 2016 11:08:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E5=85=88=E5=8A=A0=E8=BD=BD=E5=90=8E=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/blog_detail.html | 2 +- public/assets/wechat/jour_message_detail.html | 2 +- public/javascripts/wechat/app.js | 16 +++++++++++++--- public/stylesheets/weui/weixin.css | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index ee651eadf..509e0171a 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -8,7 +8,7 @@
{{blog.title}}
{{blog.user.realname}}发表博客
-
+
{{blog.created_at}}
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index a1b79379f..dc6b1409f 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -7,7 +7,7 @@
{{message.user.realname}}给您留言了
{{message.created_on}}
-
+
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index ca9682db2..61ec717a2 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -16,7 +16,7 @@ app.factory('auth', function($http,$routeParams, $q){ } if(debug===true){ - _openid = "orgVLv8TlS6e7FDiI6xdTGHRaaRo"; //guange的帐号 + _openid = "1"; //guange的帐号 } var getOpenId = function() { @@ -147,8 +147,6 @@ app.factory('common', function($http, auth, $routeParams){ data: userInfo }).then(function successCallback(response) { //alert("提交成功"); - //数据提交完成,回复按钮启用 - data.disabled = false; if(typeof cb === 'function'){ cb(); } @@ -219,6 +217,8 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth, co common.addCommonReply($routeParams.id, 'Issue', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; @@ -256,6 +256,8 @@ app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; @@ -292,6 +294,8 @@ app.controller('CourseNoticeController', function($scope, $http, $routeParams, a common.addCommonReply($routeParams.id, 'News', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; @@ -328,6 +332,8 @@ app.controller('DiscussionController', function($scope, $http, $routeParams, aut common.addCommonReply($routeParams.id, 'Message', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; @@ -364,6 +370,8 @@ app.controller('JournalsController', function($scope, $http, $routeParams, auth, common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; @@ -402,6 +410,8 @@ app.controller('BlogController', function($scope, $http, $routeParams, auth, com common.addCommonReply($routeParams.id, 'BlogComment', data, function(){ $scope.formData = {comment: ''}; loadData($routeParams.id); + //数据提交完成,回复按钮启用 + data.disabled = false; }); }; diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 3fd9acd37..f77cf1e2a 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -56,7 +56,7 @@ a.underline {text-decoration:underline;} .tac {text-align:center;} /*背景色*/ -.bg-grey {background-color:#c1c1c1;} +.bg-grey {background-color:#c1c1c1 !important;} /*动态样式*/ .post-container {width:100%;}