abiao 3 anni fa
parent
commit
af815088d3
2 ha cambiato i file con 69 aggiunte e 17 eliminazioni
  1. 0 17
      app/models/app_version.rb
  2. 69 0
      app/models/product.rb

+ 0 - 17
app/models/app_version.rb

@@ -3,7 +3,6 @@ class AppVersion < ActiveRecord::Base
   has_paper_trail
   self.table_name = "app_versions"
   validates :app_type,:app_version,:version_code,presence: true
-  validates :id, presence: true, uniqueness: true
 
   VERSION_ENUM= [["安卓","Android"], ["IOS","Ios"]]
 
@@ -60,22 +59,6 @@ class AppVersion < ActiveRecord::Base
        field :upgrade_point
        field :status
     end
-    create do
-      field :id
-      field :app_type, :enum do
-        filterable true
-        enum do
-          VERSION_ENUM
-        end
-      end
-      field :app_version
-      field :version_code
-      field :is_force
-      field :apk_url
-      field :upgrade_point
-      field :status
-    end
-
   end
 
 end

+ 69 - 0
app/models/product.rb

@@ -9,6 +9,8 @@ class Product < ActiveRecord::Base
     belongs_to :merchant, :foreign_key => :merchant_id
     validates  :product_no,:name,:buy_price,:price,:category_id,:count,:robo_balance_price,:relate_product_id, presence: true
     validate :product_validation
+    validates :id, presence: true, uniqueness: true
+
 
     def product_validation
         if self.relate_product_id <= 0
@@ -368,6 +370,73 @@ class Product < ActiveRecord::Base
             field :key_words
         end
 
+        create do
+            field :id
+            field :name
+            field :ptype, :enum do
+                enum do
+                    TYPE_ENUM
+                end
+            end
+            field :product_no
+            #field :category_id
+            field :merchant_id
+            field :product_cat
+            field :detail, :ck_editor
+            field :price
+            field :robo_balance_price
+            field :buy_price
+            field :user_sale_price
+            field :count
+            field :recommend
+            field :status
+            #field :is_support_poor
+            field :virtual_sold_count
+            field :purchase_limit_count
+            field :share_content
+=begin
+            field :v_share_img, :file_upload do
+                 pretty_value do
+                     bindings[:view].tag(:img, {:src => bindings[:object].get_share_img, :class => 'preview'})
+                end
+            end
+=end
+            field :seckill_start
+            field :seckill_end
+            field :seckill_price
+            field :deliver_stop_at
+            field :deliver_start_at
+            field :is_only_new
+            field :specification
+            field :no_delivery_area
+            field :only_delivery_area
+            field :video_state
+            field :video_url
+
+            field :size_id, :enum do
+                enum do
+                    bindings[:object].get_size_enum
+                end
+            end
+            field :color_id, :enum do
+                enum do
+                    bindings[:object].get_color_enum
+                end
+            end
+
+            field :relate_product_id
+            field :show_flag
+            field :live
+            field :single_purch_limit
+            field :package
+            field :product_cycle
+            field :stock_cycle
+            field :min_purchase
+            field :pv
+            field :out_nums
+            field :key_words
+        end
+
     end
 
 end