Permalink
Browse files

conflict

  • Loading branch information...
1 parent 95dd7c9 commit 442108b8440a43e4227ef0852269d339283fccd8 @xinghu xinghu committed Mar 18, 2014
@@ -0,0 +1,14 @@
+class Ims::Store::BannersController < Ims::Store::BaseController
+
+ def index
+
+ end
+
+ def new
+ end
+
+ def create
+ end
+
+
+end
@@ -0,0 +1,16 @@
+class Ims::Store::CollocationsController < Ims::Store::BaseController
+
+ def index
+
+ end
+
+ def new
+ @collocation = Collocation.create
+ end
+
+ def create
+ @collocation.update_attribtes(params[:collocation])
+ end
+
+
+end
@@ -0,0 +1,17 @@
+<h2>新建搭配</h2>
+<%= form_for @collocation do |f| %>
+<p>
+ 大图:
+</p>
+<p>
+ <span>添加</span>
+ <span>添加</span>
+ <span>添加</span>
+</p>
+<p>
+ <%= f.text :description %>
+</p>
+<p>
+ <%= submit_tag "提交" %>
+</p>
+<% end %>
View
@@ -317,6 +317,12 @@ def matches?(request)
resources :products
resources :cards, only: [:index]
post :recharge
+
+ namespace :store do
+ resources :collocations do
+ resources :banners
+ end
+ end
end
resources :card_orders, only: [:new, :create, :show]
resources :accounts, only: [:new, :create] do

0 comments on commit 442108b

Please sign in to comment.