Merge branch 'master' into developer

gilbertz · Jun 15, 2015 · 8295483 · 8295483
2 parents 088fa74 + dde5246
commit 8295483
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/models/bgame.rb b/app/models/bgame.rb
@@ -35,11 +35,11 @@ def game_name
   end
 
   def game_link
-    self.get_game.get_link(self.get_beacon.url)    
+    self.get_game.get_link(self.get_beacon.url) if self.get_game 
   end
 
   def get_qr_img
-    'http://qr.liantu.com/api.php?text=' + self.game_link
+    'http://qr.liantu.com/api.php?text=' + self.game_link.to_s
   end
 
 end
diff --git a/app/views/admin/bgames/index.html.erb b/app/views/admin/bgames/index.html.erb
@@ -6,6 +6,7 @@
     <th>ID</th>
     <th>ibeacon</th>
     <th>game</th>
+    <th>qr</th>
     <th>remark</th>
     <th>State</th>
     <th>Operate</th>
@@ -16,6 +17,7 @@
     <td><%= bgame.id %></td>
     <td><%= bgame.beacon_name %></td>
     <td><%= bgame.game_name %></td>
+    <td><img src="<%= bgame.get_qr_img %>" width='100px'> </td>
     <td><%= bgame.remark %></td>
     <td><%= bgame.state %></td>
     <td>  <%= link_to '克隆', [:clone,:admin, bgame], data: {confirm: "Are you clone one !"} %> |  <%= link_to "Edit", edit_admin_bgame_path(bgame) %> | <%= link_to "delete", admin_bgame_path(bgame), :method => :delete, confirm: "确认删除?" %></td>

diff --git a/public/site/img/logo.png b/public/site/img/logo.png