From f644aa114492bd049d2e96233cd24998b6426c01 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 20 Jan 2016 22:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 2bf75798f..9ae28abcd 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -122,15 +122,19 @@ class WechatsController < ActionController::Base
     if uw && uw.user
       ua = UserActivity.where(user_id: uw.user.id).order("id desc").limit(5)
       logo = "trustie_logo2.png"
+      i = 0
       news = ua.map do |ua|
+        i += 1
         {title: "act_type: #{ua.act_type}, act_id: #{ua.act_id}",
          content: "container_id: #{ua.container_id}, container_type: #{ua.container_type}",
-          picurl: "http://wechat.trustie.net/images/#{logo}" }
-        logo = "trustie_logo1.png"
+          picurl: "http://wechat.trustie.net/images/#{i == 1 ? logo : 'trustie_logo1.png'}" }
       end
 
       request.reply.news(news) do |article, n, index| # article is return object
-        article.item title: "#{index} #{n[:title]}", description: n[:content], pic_url: n[:picurl], url: 'http://www.baidu.com/'
+        article.item title: "#{index} #{n[:title]}",
+                     description: n[:content],
+                     pic_url: n[:picurl],
+                     url: 'http://www.baidu.com/'
       end
     else
       openid = request[:FromUserName]
@@ -139,7 +143,10 @@ class WechatsController < ActionController::Base
       uw = UserWechat.create!(attrs)
       news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "您还未绑定确实的用户,请先绑定." } }
       request.reply.news(news) do |article, n, index| # article is return object
-        article.item title: "#{n[:title]}", description: n[:content], pic_url: 'http://wechat.trustie.net/images/trustie_logo2.png', url: login_wechat_url(openid: uw.id)
+        article.item title: "#{n[:title]}",
+                     description: n[:content],
+                     pic_url: 'http://wechat.trustie.net/images/trustie_logo2.png',
+                     url: login_wechat_url(openid: uw.id)
       end
     end
   end