modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/store/orders/ordersnew_manco.html.erb
	new file:   app/views/store/orders/serach_order.html.js.erb
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/models/ecstore/order.rb
	modified:   app/views/admin/goods/spec.html.erb
	modified:   app/views/layouts/manco_new.html.erb
	modified:   app/views/manco/black_index.erb
	modified:   app/views/manco/blackbord.html.erb
	new file:   app/views/manco/find_manco.html.erb
	modified:   app/views/manco/main.html.erb
	modified:   app/views/patch/member_addrs/_form_manco_second.html.erb
	new file:   app/views/store/cart/manco_add.js.erb
	new file:   app/views/store/cart/manco_black_buy.html.erb
	deleted:    app/views/store/goods/find_manco.js.erb
	new file:   app/views/store/goods/find_manco_good.js.erb
	new file:   app/views/store/goods/mancoproduct.html.erb
	new file:   app/views/store/goods/serach_goods_manco.erb
	deleted:    app/views/store/orders/express_manco.html.erb
	modified:   app/views/store/orders/ordersnew_manco.html.erb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/store/orders_controller.rb
	app/views/store/orders/ordersnew_manco.html.erb

	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/store/orders/ordersnew_manco.html.erb