Merge branch 'master' of http://192.168.2.201:8099/laiiihz/recook

lib/models/promotion_goods_list_model.dart

@@ -27,10 +27,7 @@ class PromotionGoodsListModel extends Object {
 class PromotionModel extends Object {
   List<PromotionGoodsModel> goodsList;
   List<PromotionActivityModel> activityList;
-  PromotionModel(
-    this.goodsList,
-    this.activityList
-  );
+  PromotionModel(this.goodsList, this.activityList);
   factory PromotionModel.fromJson(Map<String, dynamic> srcJson) =>
       _$PromotionModelFromJson(srcJson);
 
@@ -44,12 +41,7 @@ class PromotionActivityModel extends Object {
   String logoUrl;
   String topUrl;
 
-  PromotionActivityModel(
-    this.id,
-    this.activityUrl,
-    this.logoUrl,
-    this.topUrl
-  );
+  PromotionActivityModel(this.id, this.activityUrl, this.logoUrl, this.topUrl);
   factory PromotionActivityModel.fromJson(Map<String, dynamic> srcJson) =>
       _$PromotionActivityModelFromJson(srcJson);
 
@@ -58,7 +50,6 @@ class PromotionActivityModel extends Object {
 
 @JsonSerializable()
 class PromotionGoodsModel extends Object {
-
   /*
   {
     "goodsName":"左家右厨丰子恺清代古画",
@@ -107,6 +98,10 @@ class PromotionGoodsModel extends Object {
   String brandName;
   String brandImg;
   num brandId;
+  num isImport;
+  num isFerme;
+  num storehouse;
+
   PromotionGoodsModel(
     this.goodsId,
     this.goodsName,
@@ -130,7 +125,10 @@ class PromotionGoodsModel extends Object {
     this.coupon,
     this.brandName,
     this.brandImg,
-    this.brandId
+    this.brandId,
+    this.isImport,
+    this.isFerme,
+    this.storehouse,
   );
 
   factory PromotionGoodsModel.fromJson(Map<String, dynamic> srcJson) =>

lib/models/promotion_goods_list_model.g.dart

@@ -24,29 +24,29 @@ Map<String, dynamic> _$PromotionGoodsListModelToJson(
       'msg': instance.msg
     };
 
-PromotionModel _$PromotionModelFromJson(
-    Map<String, dynamic> json) {
+PromotionModel _$PromotionModelFromJson(Map<String, dynamic> json) {
   return PromotionModel(
     (json['goodsList'] as List)
-            ?.map((e) =>
-                e == null ? null : PromotionGoodsModel.fromJson(e as Map<String, dynamic>))
+        ?.map((e) => e == null
+            ? null
+            : PromotionGoodsModel.fromJson(e as Map<String, dynamic>))
         ?.toList(),
     (json['activityList'] as List)
-          ?.map((e) =>
-              e == null ? null : PromotionActivityModel.fromJson(e as Map<String, dynamic>))
+        ?.map((e) => e == null
+            ? null
+            : PromotionActivityModel.fromJson(e as Map<String, dynamic>))
         ?.toList(),
   );
 }
 
-Map<String, dynamic> _$PromotionModelToJson(
-        PromotionModel instance) =>
+Map<String, dynamic> _$PromotionModelToJson(PromotionModel instance) =>
     <String, dynamic>{
       'goodsList': instance.goodsList,
       'activityList': instance.activityList,
     };
 
-
-PromotionActivityModel _$PromotionActivityModelFromJson(Map<String, dynamic> json) {
+PromotionActivityModel _$PromotionActivityModelFromJson(
+    Map<String, dynamic> json) {
   return PromotionActivityModel(
     json['id'] as num,
     json['activityUrl'] as String,
@@ -64,7 +64,6 @@ Map<String, dynamic> _$PromotionActivityModelToJson(
       'topUrl': instance.topUrl,
     };
 
-
 PromotionGoodsModel _$PromotionGoodsModelFromJson(Map<String, dynamic> json) {
   return PromotionGoodsModel(
     json['goodsId'] as int,
@@ -91,7 +90,10 @@ PromotionGoodsModel _$PromotionGoodsModelFromJson(Map<String, dynamic> json) {
     json["coupon"] as num,
     json['brandName'] as String,
     json['brandImg'] as String,
-      json['brandId'] as num
+    json['brandId'] as num,
+    json['isImport'] as num,
+    json['isFerme'] as num,
+    json['storehouse'] as num,
   );
 }