From e48189ae97f7d9c51546da8dac4c67e6032eb442 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 28 Apr 2016 10:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=8E=B7=E5=8F=96=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 8f8c9b179..0de2894b0 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -139,33 +139,15 @@
       <% elsif field.status.to_i == 2 %>
           <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
           <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
-            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
             <div class="cl"></div>
           </div>
       <% elsif field.status.to_i == 4 %>
           <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
       <% elsif field.status.to_i == 5 %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-            <div class="sn-index-partnerbox " >
-              <ul id="scrollPic" >
-                <div style="width: 760px;">
-                    <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt="" /></a></li>
-                    <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt="" /></a></li>
-                    <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt="" /></a></li>
-                    <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt="" /></a></li>
-                </div>
-              </ul>
-              <div class="cl"></div>
-              <div class="partner-btnbox">
-                <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
-                <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
-                <div class="cl"></div>
-              </div>
-            </div>
-          </div>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
       <% end %>
   <% end %>
 </div>
@@ -173,7 +155,7 @@
 <div class="sn-content-right fr sn-mt15">
   <% @subfield_content.each do |field| %>
       <% if field.status.to_i == 6 %>
-          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
       <% elsif field.status.to_i == 7 %>
           <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
       <% elsif field.status.to_i == 8 %>