From e85f9373c878e422de9d0a33f44003b472211bc0 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 10 Aug 2016 15:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?= =?UTF-8?q?=EF=BC=9B=E7=8F=AD=E7=BA=A7=E9=80=9A=E7=9F=A5=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=86=97=E4=BD=99=EF=BC=9B=E7=8F=AD=E7=BA=A7=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=82=80=E8=AF=B7=E6=96=87=E5=AD=97=E6=9B=B4=E5=8F=8B?= =?UTF-8?q?=E5=96=84=EF=BC=9B=E7=8F=AD=E7=BA=A7=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E4=BA=BA=E6=95=B0=E5=90=8E=E7=AE=AD=E5=A4=B4=E4=B8=8E?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E5=AF=B9=E9=BD=90=EF=BC=9B=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=EF=BC=9B=E5=9B=9E=E5=A4=8D=E4=B8=AD@=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=9B=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=8F=90=E7=A4=BA=EF=BC=9B=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E8=81=94=E7=B3=BB=E6=88=91=E4=BB=AC=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/wechats_controller.rb | 2 +- app/models/news.rb | 2 +- public/assets/wechat/app.html | 2 ++ public/assets/wechat/blog_detail.html | 4 ++-- public/assets/wechat/class_list.html | 4 ++-- public/assets/wechat/course_discussion.html | 4 ++-- public/assets/wechat/course_notice.html | 4 ++-- public/assets/wechat/homework_detail.html | 4 ++-- public/assets/wechat/invite_code.html | 4 +++- public/assets/wechat/issue_detail.html | 4 ++-- public/assets/wechat/jour_message_detail.html | 4 ++-- public/assets/wechat/project_discussion.html | 4 ++-- public/assets/wechat/project_invite_code.html | 4 +++- public/assets/wechat/project_list.html | 4 ++-- public/images/wechat/wx_logo.jpg | Bin 0 -> 31716 bytes .../wechat/controllers/invite_code.js | 2 +- .../wechat/controllers/project_invite_code.js | 2 +- .../wechat/directives/at_delete_link.js | 17 +++++++++++++++++ .../wechat/directives/input_focus.js | 14 ++++++++++++++ public/javascripts/wechat/others/factory.js | 2 +- public/stylesheets/weui/weixin.css | 3 ++- 21 files changed, 64 insertions(+), 26 deletions(-) create mode 100644 public/images/wechat/wx_logo.jpg create mode 100644 public/javascripts/wechat/directives/at_delete_link.js create mode 100644 public/javascripts/wechat/directives/input_focus.js diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb index cbeaf851d..1a4c4d340 100644 --- a/app/controllers/wechats_controller.rb +++ b/app/controllers/wechats_controller.rb @@ -137,7 +137,7 @@ class WechatsController < ActionController::Base on :fallback, respond: 'fallback message' on :click, with: 'FEEDBACK' do |request, key| - request.reply.text "如有反馈问题，请直接切换至输入框，发微信给我们即可" + request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：173184401，我们直接互动。\n欢迎大家积极反馈，谢谢啦！" end on :click, with: 'MY_NEWS' do |request, key| diff --git a/app/models/news.rb b/app/models/news.rb index 54f6fce08..489a231c8 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -173,7 +173,7 @@ class News < ActiveRecord::Base count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count if count == 0 ws = WechatService.new - content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200 + content = self.title.html_safe, 200 ws.class_notice m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.course.name, self.author.show_name, format_time(self.created_on), content, "点击查看通知详情" end end diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html index 74af26cfe..d49caedd5 100644 --- a/public/assets/wechat/app.html +++ b/public/assets/wechat/app.html @@ -37,6 +37,8 @@ + + diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index ee9e968d2..f17a384f4 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -25,13 +25,13 @@
{{blog.praise_count}}
{{blog.praise_count}}
-
+
回复 {{blog.comment_count}}
-
+
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html index ece31ceeb..9ac70cc0a 100644 --- a/public/assets/wechat/class_list.html +++ b/public/assets/wechat/class_list.html @@ -10,7 +10,7 @@
  • - > + > {{course.member_count}}人
    • @@ -25,7 +25,7 @@
  • - > + > {{course.member_count}}人
    • diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 9ef7bc429..ab71aa887 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -23,14 +23,14 @@
    {{discussion.praise_count}}
    {{discussion.praise_count}}
    -
    +
    回复 {{discussion.comment_count}}
    -
    +
    diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index b2771100b..59f9afa5f 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -22,14 +22,14 @@
    {{news.praise_count}}
    {{news.praise_count}}
    -
    +
    回复 {{news.comment_count}}
    -
    +
    diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 599774dfc..49fa52b49 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -27,13 +27,13 @@
    {{homework.praise_count}}
    {{homework.praise_count}}
    -
    +
    回复 {{homework.comment_count}}
    -
    +
    diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html index a1b225fc9..3aaa00bbe 100644 --- a/public/assets/wechat/invite_code.html +++ b/public/assets/wechat/invite_code.html @@ -11,6 +11,8 @@

    + 3.通过“加入班级”菜单输入邀请码加入班级（长按邀请码可以复制哦~）
    + 4.扫码默认以学生身份加入班级 +
    \ No newline at end of file diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index 852103b81..2d33367cf 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -28,14 +28,14 @@
    {{issue.praise_count}}
    {{issue.praise_count}}
    -
    +
    回复 {{issue.comment_count}}
    -
    +
    diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 78760da71..643bce4f5 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -22,14 +22,14 @@
    {{message.praise_count}}
    {{message.praise_count}}
    -
    +
    回复 {{message.comment_count}}
    -
    +
    diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index cc3d4b1c8..b2be0b263 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -23,7 +23,7 @@
    {{discussion.praise_count}}
    {{discussion.praise_count}}
    -
    +
    回复 {{discussion.comment_count}}
    @@ -31,7 +31,7 @@
    -
    +
    diff --git a/public/assets/wechat/project_invite_code.html b/public/assets/wechat/project_invite_code.html index a17b8fe85..7685d7aef 100644 --- a/public/assets/wechat/project_invite_code.html +++ b/public/assets/wechat/project_invite_code.html @@ -11,6 +11,8 @@

    + 3.通过“加入项目”菜单输入邀请码加入项目（长按邀请码可以复制哦~）
    + 4.扫码默认以报告人员身份加入项目 +
    \ No newline at end of file diff --git a/public/assets/wechat/project_list.html b/public/assets/wechat/project_list.html index 1d385dabf..d9313b6a7 100644 --- a/public/assets/wechat/project_list.html +++ b/public/assets/wechat/project_list.html @@ -7,7 +7,7 @@
    - > + > {{project.member_count}}人
    @@ -20,7 +20,7 @@
    - > + > {{project.member_count}}人
    diff --git a/public/images/wechat/wx_logo.jpg b/public/images/wechat/wx_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8faeef27a4ed1f72da67b813928d77719b8a10b8 GIT binary patch literal 31716 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 S{4lEV#lJMJ|M6YoZ+{1Ba2G28 literal 0 HcmV?d00001 diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js index 867c9bce4..71826d54d 100644 --- a/public/javascripts/wechat/controllers/invite_code.js +++ b/public/javascripts/wechat/controllers/invite_code.js @@ -13,7 +13,7 @@ app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config console.log(response.data); vm.course = response.data.data; - var desc = "班级邀请："+vm.course.name+" 班级"; + var desc = "您的好友邀请您加入班级：\n"+vm.course.name+"\n和小伙伴一起踏上便捷的学习之旅吧！"; var link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d" + "&redirect_uri=https://test.forge.trustie.net/wechat/user_activities?id="+vm.course.id+ "&response_type=code&scope=snsapi_base&state=invite_code&connect_redirect=1#wechat_redirect"; diff --git a/public/javascripts/wechat/controllers/project_invite_code.js b/public/javascripts/wechat/controllers/project_invite_code.js index e82bb44a8..0729e882e 100644 --- a/public/javascripts/wechat/controllers/project_invite_code.js +++ b/public/javascripts/wechat/controllers/project_invite_code.js @@ -13,7 +13,7 @@ app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams', console.log(response.data); vm.project = response.data.data; - var desc = "项目邀请："+vm.project.name+" 项目"; + var desc = "您的好友邀请您加入项目：\n"+vm.project.name+"\n和小伙伴一起踏上便捷的研发之旅吧！"; var link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d" + "&redirect_uri=https://test.forge.trustie.net/wechat/user_activities?id="+vm.project.id+ diff --git a/public/javascripts/wechat/directives/at_delete_link.js b/public/javascripts/wechat/directives/at_delete_link.js new file mode 100644 index 000000000..15190c327 --- /dev/null +++ b/public/javascripts/wechat/directives/at_delete_link.js @@ -0,0 +1,17 @@ +/** + * Created by ttang on 2016/8/10. + */ +app.directive('atDeleteLink',["$timeout",function(timer){ + return{ + restrict: 'A', + scope: {}, + link: function(scope, element){ + timer(function(){ + $(".at a").each(function(){ + var atText = $(this).text(); + $(this).parent().html(atText); + }); + }) + } + } +}]); diff --git a/public/javascripts/wechat/directives/input_focus.js b/public/javascripts/wechat/directives/input_focus.js new file mode 100644 index 000000000..38cc01ec9 --- /dev/null +++ b/public/javascripts/wechat/directives/input_focus.js @@ -0,0 +1,14 @@ +/** + * Created by ttang on 2016/8/10. + */ +app.directive('inputFocus',function(){ + return{ + restrict: 'A', + scope: {}, + link: function(scope, element){ + element.on('click',function(){ + $("#postInput1").focus(); + }); + } + } +}); \ No newline at end of file diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js index ad42eb27c..adce0699f 100644 --- a/public/javascripts/wechat/others/factory.js +++ b/public/javascripts/wechat/others/factory.js @@ -372,7 +372,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc } if(imgUrl == null || imgUrl == ""){ - imgUrl = 'http://www.trustie.net/images/logo2.png'; + imgUrl = 'http://www.trustie.net/images/wechat/wx_logo.jpg'; } wx.ready(function(){ diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 59bdcd7d9..234dc367b 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -178,7 +178,7 @@ a.underline {text-decoration:underline;} .invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;} .share-code-wrap {width:100%; background-color:#efeff4;} .share-code-btn, .finish-btn {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; 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;} +.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:20px auto 30px;} /*20160613班级详情*/ .class-detail-name, .blue-title {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;} @@ -216,6 +216,7 @@ a.underline {text-decoration:underline;} .border-bottom-none {border-bottom:none !important;} .border-top-none {border-top:none !important;} .students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;} +.amount-arrow {height:14px; line-height:14px; vertical-align:middle; margin-top:12px;} .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;} .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;} .new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:8px 0;}