Merge branch 'dev' into wr_2023_business

lib/home/home_page.dart

@@ -543,7 +543,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                     HomeRecommendGoods(homeRank),
 
                     ///助农专区
-                    if(mRaiseMoney != 0)
+                    // if(mRaiseMoney != 0)
                     HappyHelpFarmers(),
 
                     ///福利中心

lib/retrofit/data/goods.dart

@@ -51,6 +51,7 @@ class Goods {
     int state,
     bool canPick,
     bool canDelivery,
+    int buyTimes,
     int isDelete,
     dynamic categoryName,
     String mainImgPath,
@@ -80,6 +81,7 @@ class Goods {
     _canPick = canPick;
     _canDelivery = canDelivery;
     _isDelete = isDelete;
+    _buyTimes = buyTimes;
     _categoryName = categoryName;
     _mainImgPath = mainImgPath;
     _viceImgPaths = viceImgPaths;
@@ -111,6 +113,7 @@ class Goods {
     _canPick = json['canPick'];
     _canDelivery = json['canDelivery'];
     _isDelete = json['isDelete'];
+    _buyTimes =json['buyTimes'];
     _categoryName = json['categoryName'];
     _mainImgPath = json['mainImgPath'];
     _viceImgPaths = json['viceImgPaths'] != null ? json['viceImgPaths'].cast<String>() : [];
@@ -140,6 +143,7 @@ class Goods {
   bool _canPick;
   bool _canDelivery;
   int _isDelete;
+  int _buyTimes;
   dynamic _categoryName;
   String _mainImgPath;
   List<String> _viceImgPaths;
@@ -169,6 +173,7 @@ class Goods {
   bool get canPick => _canPick;
   bool get canDelivery => _canDelivery;
   int get isDelete => _isDelete;
+  int get buyTimes => _buyTimes;
   dynamic get categoryName => _categoryName;
   String get mainImgPath => _mainImgPath;
   List<String> get viceImgPaths => _viceImgPaths;
@@ -200,6 +205,7 @@ class Goods {
     map['canPick'] = _canPick;
     map['canDelivery'] = _canDelivery;
     map['isDelete'] = _isDelete;
+    map['buyTimes'] = _buyTimes;
     map['categoryName'] = _categoryName;
     map['mainImgPath'] = _mainImgPath;
     map['viceImgPaths'] = _viceImgPaths;