Merge branch 'guange_dev' into develop

app/views/stores/index.html.erb

@@ -3,10 +3,10 @@
 <% end %>
 
 <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" >
 		<p>
-			<%= @str_arr.shift %>
+			<%= @str_arr[index] %>
 		</p>
 
 		<div class="table1">
@@ -24,7 +24,7 @@
 		</div>
 
 		<div class="table1">
-          <% if @str_arr.shift == @str_arr[2]%>
+          <% if index == 2%>
 		<% k.each do |c1|%>
 			<div class="table_row1 <%= cycle 'odd', 'even' %>">
 				<div class="filename table_cell1 filename1" >
@@ -94,4 +94,4 @@
         }
 	});
 </script>
-<% html_title(l(:label_stores_index)) -%>
+<% html_title(l(:label_stores_index)) -%>