Merge branch 'develop' into feature/#1001

* develop:
  增加订单类型显示

app/models/order.rb

@@ -10,7 +10,7 @@ class Order < ActiveRecord::Base
     has_many :order_details
 
     STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
-    TYPE_ENUM = [["普通",0],["自用",2],["代销",1],["牛就对了（购买）",3],["牛就对了（兑奖）",4]]
+    TYPE_ENUM = [["普通",0],["秒杀",1]]
 
     PAY_WAY_ENUM = [