From 9461c41fa72bd1aadd835cc47903cab985bad9f2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 22 Jun 2016 14:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E7=95=99=E8=A8=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb         | 3 ++-
 app/views/account/email_activation.html.erb | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 3b540f0d0..1bbbb1190 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -343,7 +343,8 @@ class WordsController < ApplicationController
     status = 1 #成功
     me = User.find(params[:user])
     if me
-      @user = User.find(params[:id])
+      #课程使者id=1
+      @user = User.find(1)
       if params[:text].size>0 && @user
           # @user.add_jour(me, params[:text])
           #私信
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index abd010a96..d625e7fc9 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -10,7 +10,7 @@
       <li>如果您无法收到激活邮件，请您直接给我们管理员留言：</li>
       <div class="  mt10">
         <textarea style="resize: none;" class="email_prompt_mes" placeholder="请管理员尽快帮我解决邮箱激活问题"></textarea>
-        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>','<%= 1 %>');">确定</button>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
         <div class="cl"></div>
       </div>
     </ul>
@@ -29,7 +29,7 @@
               }
       );
   }
-  function leave_email_activation_message(url,user,id)
+  function leave_email_activation_message(url,user)
   {
       if ($(".email_prompt_mes").val().length == 0){
         //弹框请他输入文字
@@ -39,7 +39,7 @@
       }
       $.get(
               url,
-              {user:user,id: 1,text:$(".email_prompt_mes").val() },
+              {user:user,text:$(".email_prompt_mes").val() },
               function (data) {
                   console.log("2222222");
                   console.log(data);