qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'guange_dev' into develop

This commit is contained in:
sw 2015-05-29 19:36:00 +08:00
parent 0891af9e59 97fe43c8a1
commit 86e63b6081
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/stores/index.html.erb
View File

@ -3,10 +3,10 @@
<% end %> <% end %>
<div class="resource_sum" id="IE_resource_sum_css"> <div class="resource_sum" id="IE_resource_sum_css">
<% @attach_array.each do |k|%> <% @attach_array.each_with_index do |k, index|%>
<div class="line_block" > <div class="line_block" >
<p> <p>
<%= @str_arr.shift %> <%= @str_arr[index] %>
</p> </p>
<div class="table1"> <div class="table1">
@ -24,7 +24,7 @@
</div> </div>
<div class="table1"> <div class="table1">
<% if @str_arr.shift == @str_arr[2]%> <% if index == 2%>
<% k.each do |c1|%> <% k.each do |c1|%>
<div class="table_row1 <%= cycle 'odd', 'even' %>"> <div class="table_row1 <%= cycle 'odd', 'even' %>">
<div class="filename table_cell1 filename1" > <div class="filename table_cell1 filename1" >