From a1dfdae58d7298f8dc452d20ef59a15d01f764ff Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 11 Aug 2016 10:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E7=89=88=E6=B6=88=E6=81=AF=E7=9A=84=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/wechat_service.rb | 6 +++---
 config/locales/zh.yml          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index 4506bf3e4..c7eb3491a 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -112,7 +112,7 @@ class WechatService
   end
 
   def two_keys_template(openid, template_id, type, id, first, key1, key2, remark="",uid)
-    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}"
+    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
     if uid && uid != 0
       tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
     end
@@ -144,7 +144,7 @@ class WechatService
   end
 
   def three_keys_template(openid, template_id, type, id, first, key1, key2, key3, remark="",uid)
-    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}"
+    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
     if uid && uid != 0
       tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
     end
@@ -181,7 +181,7 @@ class WechatService
   end
 
   def four_keys_template(openid, template_id, type, id, first, key1, key2, key3, key4, remark="",uid)
-    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}"
+    tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
     if uid && uid != 0
       tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
     end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1340e7aa6..59aca719b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2156,6 +2156,6 @@ zh:
   label_blog_comment_template: 您的博客有新回复了。
   label_new_blog_template: 有新博客了。
   label_new_issue_template: 有新的问题动态了。
-  label_new_notice_template: 您的课程有新通知了。
+  label_new_notice_template: 您的班级有新通知了。
 #edit yk
   label_code_work_tests: 代码测试列表