From 2eaa6e27321b2ce19dd2228333a394bc73c0b252 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Thu, 14 Nov 2019 13:45:38 +0800
Subject: [PATCH] FIX

---
 app/controllers/homes_controller.rb    |  2 ++
 app/views/homes/_dynamic_new.html.erb  | 13 +++++++++++++
 app/views/homes/_dynamic_news.html.erb | 15 ---------------
 app/views/homes/index.html.erb         |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 app/views/homes/_dynamic_new.html.erb
 delete mode 100644 app/views/homes/_dynamic_news.html.erb

diff --git a/app/controllers/homes_controller.rb b/app/controllers/homes_controller.rb
index e407600ae..a36f38d9c 100644
--- a/app/controllers/homes_controller.rb
+++ b/app/controllers/homes_controller.rb
@@ -13,6 +13,8 @@ class HomesController < ApplicationController
     @first_companies_group = Array(@companies.slice(0, 5))
     @second_companies_group = Array(@companies.slice(5, 8))
     @third_companies_group = Array(@companies.slice(13, 5))
+
+    fresh_when :last_modified => @home.updated_at.utc, :etag => [@home, @companies, @partners, @slide_wall, @first_companies_group, @second_companies_group, @third_companies_group]
   end
 
   def partners
diff --git a/app/views/homes/_dynamic_new.html.erb b/app/views/homes/_dynamic_new.html.erb
new file mode 100644
index 000000000..f43f6ad18
--- /dev/null
+++ b/app/views/homes/_dynamic_new.html.erb
@@ -0,0 +1,13 @@
+<a href="<%= dynamic_new.remote_url %>">
+  <div class="homepage_activity_list_item">
+    <div>
+      <p class="f18 mb15 lh20 color-grey3"><%= h dynamic_new.title %></p>
+      <p class="f13 mb8 c_grey02 task-hide-2" style="height: 38px;"><%= h dynamic_new.simple_intruduce %></p>
+      <p>
+        <span class="activity_tag">行业动态</span>
+        <span class="fontGrey4 ml14 fl"><i class="iconfont icon-shijian f12 mr5 lh18 fl"></i><%= format_time(dynamic_new.created_at) %></span>
+      </p>
+    </div>
+    <img src="<%= dynamic_new.cover_url %>" class="ml20" width="158px" height="100px" />
+  </div>
+</a>
diff --git a/app/views/homes/_dynamic_news.html.erb b/app/views/homes/_dynamic_news.html.erb
deleted file mode 100644
index 6254c3f2e..000000000
--- a/app/views/homes/_dynamic_news.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% dynamic_news&.each do |dynamic_new| %>
-  <a href="<%= dynamic_new.remote_url %>">
-    <div class="homepage_activity_list_item">
-      <div>
-        <p class="f18 mb15 lh20 color-grey3"><%= h dynamic_new.title %></p>
-        <p class="f13 mb8 c_grey02 task-hide-2" style="height: 38px;"><%= h dynamic_new.simple_intruduce %></p>
-        <p>
-          <span class="activity_tag">行业动态</span>
-          <span class="fontGrey4 ml14 fl"><i class="iconfont icon-shijian f12 mr5 lh18 fl"></i><%= format_time(dynamic_new.created_at) %></span>
-        </p>
-      </div>
-      <img src="<%= dynamic_new.cover_url %>" class="ml20" width="158px" height="100px" />
-    </div>
-  </a>
-<% end %>
diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb
index 3e1a00118..c4f56fd8f 100644
--- a/app/views/homes/index.html.erb
+++ b/app/views/homes/index.html.erb
@@ -23,7 +23,7 @@
         <a href="<%= news_homes_path %>" class="fr fontGrey4 mt8">更多>></a>
       </p>
       <div class="homepage_activity_list">
-        <%= render :partial => 'dynamic_news', :locals => {:dynamic_news => @dynamic_news}%>
+        <%= render :partial => 'dynamic_new', :collection => @dynamic_news %>
       </div>
     </div>
   </div>