拼团砍价,修改

lib/community/community_list.dart

@@ -10,6 +10,7 @@ import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/border_text.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/icon_text.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -84,6 +85,14 @@ class _CommunityList extends State<CommunityList> {
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisAlignment: MainAxisAlignment.spaceAround,
       children: [
+        (widget.comments == null || widget.comments.length == 0)
+            ? NoDataView(
+          src: widget.commentType == 1 ? "assets/image/dong_tai.png" :"assets/image/guan_zhu.png",
+          isShowBtn: false,
+          text:widget.commentType == 1 ? "目前暂无发布动态，要把开心的事讲出来哦~" :"目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
+          fontSize: 16.sp,
+          margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+        ):
         ListView.builder(
           padding: EdgeInsets.zero,
           itemCount: widget.comments.length,

lib/message/system_details.dart

@@ -198,6 +198,7 @@ class _SystemDetails extends State<SystemDetails> {
         children: [
           (messages == null || messages.length == 0)
               ? NoDataView(
+            src: "assets/image/icon_empty.png",
             isShowBtn: false,
             text: S.of(context).haimeiyouxiaoxi,
             fontSize: 16.sp,
@@ -322,6 +323,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -457,6 +459,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -603,6 +606,7 @@ class _SystemDetails extends State<SystemDetails> {
               children: [
                 (messages == null || messages.length == 0)
                     ? NoDataView(
+                  src: "assets/image/icon_empty.png",
                   isShowBtn: false,
                   text: S.of(context).haimeiyouxiaoxi,
                   fontSize: 16.sp,
@@ -846,6 +850,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,

lib/message/system_message.dart

@@ -403,6 +403,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
           ),
           (messages == null || messages.length == 0)
               ? NoDataView(
+            src: "assets/image/icon_empty.png",
             isShowBtn: false,
             text: S.of(context).haimeiyouxiaoxi,
             fontSize: 16.sp,

lib/mine/coupons_page.dart

@@ -196,10 +196,11 @@ class _CouponsPage extends State<CouponsPage> {
                       itemCount: coupons != null ? coupons.length : 0,
                     )
                   : NoDataView(
+                      src: "assets/image/ka.png",
                       isShowBtn: false,
-                      text: "你还没有券～",
+                      text: "目前暂无优惠券，请到领劵中心领取哦～",
                       fontSize: 16.sp,
-                      margin: EdgeInsets.only(top: 120.h),
+                      margin: EdgeInsets.only(top: 120.h,left:60,right:60),
                     ),
             ),
           ),

lib/mine/fans_page.dart

@@ -10,6 +10,7 @@ import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -18,9 +19,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 class FansPage extends StatefulWidget {
   final Function refresh;
 
-  FansPage(
-      this.refresh
-  );
+  FansPage(this.refresh);
 
   @override
   State<StatefulWidget> createState() {
@@ -86,7 +85,8 @@ class _FansPage extends State<FansPage> {
     if (baseData != null && baseData.isSuccess) {
       widget.refresh();
       _queryFollowList();
-      SmartDialog.showToast(isFollow?"取关成功":"关注成功", alignment: Alignment.center);
+      SmartDialog.showToast(isFollow ? "取关成功" : "关注成功",
+          alignment: Alignment.center);
     } else {
       SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
     }
@@ -94,8 +94,7 @@ class _FansPage extends State<FansPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
+    return Container(
       margin: EdgeInsets.only(top: 2),
       color: Colors.white,
       child: SmartRefresher(
@@ -108,9 +107,19 @@ class _FansPage extends State<FansPage> {
           },
         ),
         controller: _refreshController,
-            onRefresh: (){_queryFollowList();},
+        onRefresh: () {
+          _queryFollowList();
+        },
         physics: BouncingScrollPhysics(),
-            child: ListView.builder(
+        child: (list == null || list.length == 0)
+            ? NoDataView(
+                src: "assets/image/fen_si.png",
+                isShowBtn: false,
+                text: "目前暂无粉丝，听说多发动态可以涨粉哦~",
+                fontSize: 16.sp,
+                margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+              )
+            : ListView.builder(
                 itemCount: list == null ? 0 : list.length,
                 padding: EdgeInsets.symmetric(vertical: 8.h),
                 shrinkWrap: true,
@@ -122,13 +131,6 @@ class _FansPage extends State<FansPage> {
                     child: fansItem(list[position]),
                   );
                 },
-            )
-            //     NoDataView(
-            //   isShowBtn: false,
-            //   text: "共关注0人",
-            //   fontSize: 16.sp,
-            //   margin: EdgeInsets.only(top: 120.h),
-            // ),
               ),
       ),
     );
@@ -186,9 +188,7 @@ class _FansPage extends State<FansPage> {
                 text: (list?.isFollow ?? false) ? "已关注" : "关注",
                 radius: 20,
                 icons: Icon(
-                  (list?.isFollow ?? false)
-                      ? Icons.check
-                      : Icons.add,
+                  (list?.isFollow ?? false) ? Icons.check : Icons.add,
                   color: (list?.isFollow ?? false)
                       ? Color(0xFF808080)
                       : Colors.white,

lib/mine/follow_page.dart

@@ -112,7 +112,15 @@ class _FollowPage extends State<FollowPage> {
           controller: _refreshController,
           onRefresh: (){_queryFollowList();},
           physics: BouncingScrollPhysics(),
-          child: ListView.builder(
+          child: (list == null || list.length == 0)
+              ? NoDataView(
+            src: "assets/image/guan_zhu.png",
+            isShowBtn: false,
+            text: "目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
+            fontSize: 16.sp,
+            margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+          )
+              : ListView.builder(
             itemCount: list == null ? 0 : list.length,
             shrinkWrap: true,
             physics: NeverScrollableScrollPhysics(),
@@ -124,14 +132,7 @@ class _FollowPage extends State<FollowPage> {
               );
             },
           ),
-          //     NoDataView(
-          //   isShowBtn: false,
-          //   text: "共关注0人",
-          //   fontSize: 16.sp,
-          //   margin: EdgeInsets.only(top: 120.h),
-          // ),
         ),
-
       ),
     );
   }

lib/mine/manage_address_page.dart

@@ -66,8 +66,9 @@ class _ManageAddressPage extends State<ManageAddressPage> {
           Expanded(
             child: (addressList == null || addressList.length == 0)
                 ? NoDataView(
+                    src: "assets/image/di_zhi.png",
                     isShowBtn: false,
-                    text: "目前暂无送货地址，请添加",
+                    text: "目前暂无收货地址，请添加~",
                     fontSize: 16.sp,
                     margin: EdgeInsets.only(top: 120.h),
                   )

lib/mine/mine_wallet_page.dart

@@ -172,8 +172,9 @@ class _MineWalletPage extends State<MineWalletPage> {
             margin: EdgeInsets.only(top: 14.h),
             child: (userBills == null || userBills.length == 0)
                 ? NoDataView(
+                    src: "assets/image/ding_dan.png",
                     isShowBtn: false,
-                    text: "目前暂未记录哦",
+                    text: "目前暂无记录哦~",
                     fontSize: 16.sp,
                     margin: EdgeInsets.only(top: 120.h),
                   )

lib/mine/roll_center_page.dart

@@ -152,6 +152,7 @@ class _RollCenterPage extends State<RollCenterPage> {
                         itemCount: (coupons != null && coupons.length > 0) ? coupons.length : 0,
                       )
                     : NoDataView(
+                        src: "assets/image/icon_empty.png",
                         isShowBtn: false,
                         text: S.of(context).haimeiyouyouhuiquankeyilingqu,
                         fontSize: 16.sp,

lib/mine/vip_balance_page.dart

@@ -92,6 +92,7 @@ class _VipBalancePage extends State<VipBalancePage> {
       body: Container(
         child: (userBills == null || userBills.length == 0)
             ? NoDataView(
+                src: "assets/image/icon_empty.png",
                 isShowBtn: false,
                 text: S.of(context).nihaimeiyouchongzhihuoxiaofeijilu,
                 fontSize: 16.sp,

lib/mine/vip_card_page.dart

@@ -88,6 +88,7 @@ class _VipCardPage extends State<VipCardPage> {
                   itemCount: coupons != null ? coupons.length : 0,
                 )
               : NoDataView(
+                  src: "assets/image/icon_empty.png",
                   isShowBtn: false,
                   text: "还没有会员卡～",
                   fontSize: 16.sp,

lib/order/bargain_group_order.dart

@@ -192,15 +192,10 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
           },
         ),
         controller: _refreshController,
+        physics: BouncingScrollPhysics(),
         onRefresh: _refresh,
-        child: (activityOrderList?.length ?? 0) < 0
-            ? NoDataView(
-          isShowBtn: false,
-          text: "还没有订单，快去下一单吧～",
-          fontSize: 16.sp,
-          margin: EdgeInsets.only(top: 120.h),
-        )
-            :
+        child: (activityOrderList != null && activityOrderList.length > 0)
+            ?
         ListView.builder(
           itemCount: activityOrderList?.length ?? 0,
           shrinkWrap: true,
@@ -208,6 +203,12 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
           itemBuilder: (context, position) {
             return bargainOrder(activityOrderList[position]);
           },
+        ):NoDataView(
+          src: "assets/image/icon_empty.png",
+          isShowBtn: false,
+          text: "还没有订单，快去下一单吧～",
+          fontSize: 16.sp,
+          margin: EdgeInsets.only(top: 120.h),
         ),
       ),
     );
@@ -441,7 +442,14 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
               child: Row(
                 children: [
                   GestureDetector(
-                    onTap: () {},
+                    onTap: () {
+                      Navigator.of(context)
+                          .popAndPushNamed('/router/group_details', arguments: {
+                        "actRecordId": activityOrderList.actRecordId,
+                        "actProduct":activityOrderList,
+                        "limitNumber":activityOrderList.howManyMore,
+                      });
+                    },
                     child: RoundButton(
                       height: 25.h,
                       text: "查看详情",

lib/order/exchange_history_page.dart

@@ -191,10 +191,11 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
       onLoading: queryHistory,
       child: orders == null || orders.length == 0
           ? NoDataView(
+              src: "assets/image/ding_dan.png",
               isShowBtn: false,
-              text: "暂无已完成的订单",
+              text: "目前暂无记录，手上那么多积分要赶紧用掉哦~",
               fontSize: 16.sp,
-              margin: EdgeInsets.only(top: 120.h),
+              margin: EdgeInsets.only(top: 120.h,left: 72,right: 72),
             )
           : ListView.builder(
               itemCount: orders == null ? 0 : orders.length,

lib/order/logistics_information_page.dart

@@ -153,6 +153,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
                                       position, logistics.length);
                                 })
                             : NoDataView(
+                                src: "assets/image/icon_empty.png",
                                 isShowBtn: false,
                                 text: "暂无物流信息~",
                                 fontSize: 16.sp,

lib/order/order_history_page.dart

@@ -156,8 +156,9 @@ class _OrderHistoryList extends State<OrderHistoryList>
                 );
               })
           : NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
-              text: "还没有订单，快去下一单吧～",
+              text: "目前暂无订单,快去下一单吧～",
               fontSize: 16.sp,
               margin: EdgeInsets.only(top: 120),
             ),
@@ -253,8 +254,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                       width: 1,
                       color: Color(0xFF32A060),
                       style: BorderStyle.solid,
-                    )
-                ),
+                    )),
                 child: Text(
                   "团",
                   style: TextStyle(
@@ -542,18 +542,21 @@ class _OrderHistoryList extends State<OrderHistoryList>
       },
     );
     if (payChannel != null && payChannel > 0) {
-      OrderUtils.carryOnPay(payChannel, minService, orderInfo, () {
+      OrderUtils.carryOnPay(
+        payChannel,
+        minService,
+        orderInfo,
+        () {
           SmartDialog.showToast("订单支付成功");
           Future.delayed(Duration(seconds: 1), () {
             _onRefresh();
           });
-      },);
+        },
+      );
     }
   }
 
-  payResult(BaseData baseData) {
-
-  }
+  payResult(BaseData baseData) {}
 
   orderCancel(String orderId) async {
     BaseData baseData = await apiService.orderCancel(orderId);

lib/retrofit/min_api.dart

@@ -34,8 +34,8 @@ part 'min_api.g.dart';
 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8765/app/";///费韬
-const baseUrl = "http://192.168.10.236:8765/app/";///费韬
+// const base_url = "http://192.168.10.236:8765/app/";///费韬
+// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 
 const base_url = "http://192.168.10.88:8765/app/";///詹云久

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8765/app/';
+    baseUrl ??= 'http://192.168.10.88:8765/app/';
   }
 
   final Dio _dio;
@@ -400,4 +400,209 @@ class _MinApiService implements MinApiService {
     );
     return value;
   }
+
+  @override
+  Future<BaseData<List<HomeRecommendList>>> recommendList() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'product/recommendList',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<List<HomeRecommendList>>.fromJson(
+        _result.data,
+        (json) => (json as List<dynamic>)
+            .map<HomeRecommendList>(
+                (i) => HomeRecommendList.fromJson(i as Map<String, dynamic>))
+            .toList());
+    return value;
+  }
+
+  @override
+  Future<BaseData<ShoppingHomeConfig>> homeConfig() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>('store/homeConfig',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<ShoppingHomeConfig>.fromJson(
+      _result.data,
+      (json) => ShoppingHomeConfig.fromJson(json),
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<ActivityAreaList>> findActListByType(allDay, type) async {
+    ArgumentError.checkNotNull(allDay, 'allDay');
+    ArgumentError.checkNotNull(type, 'type');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/findActListByType?allDay=$allDay&type=$type',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<ActivityAreaList>.fromJson(
+      _result.data,
+      (json) => ActivityAreaList.fromJson(json),
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<ActivityDetails>> viewProduct(actProductId, type) async {
+    ArgumentError.checkNotNull(actProductId, 'actProductId');
+    ArgumentError.checkNotNull(type, 'type');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/viewProduct?actProductId=$actProductId&type=$type',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<ActivityDetails>.fromJson(
+      _result.data,
+      (json) => ActivityDetails.fromJson(json),
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<dynamic>> launchAct(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/launchAct',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<dynamic>.fromJson(
+      _result.data,
+      (json) => json as dynamic,
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<dynamic>> joinAct(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/joinAct',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<dynamic>.fromJson(
+      _result.data,
+      (json) => json as dynamic,
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<dynamic>> actPay(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/actPay',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<dynamic>.fromJson(
+      _result.data,
+      (json) => json as dynamic,
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<List<ActivityOrderList>>> showMyActList(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/showMyActList',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<List<ActivityOrderList>>.fromJson(
+        _result.data,
+        (json) => (json as List<dynamic>)
+            .map<ActivityOrderList>(
+                (i) => ActivityOrderList.fromJson(i as Map<String, dynamic>))
+            .toList());
+    return value;
+  }
+
+  @override
+  Future<BaseData<ActivityActRecordDetails>> showOneAct(actRecordId) async {
+    ArgumentError.checkNotNull(actRecordId, 'actRecordId');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'actTemplate/showOneAct?actRecordId=$actRecordId',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<ActivityActRecordDetails>.fromJson(
+      _result.data,
+      (json) => ActivityActRecordDetails.fromJson(json),
+    );
+    return value;
+  }
 }

lib/retrofit/retrofit_api.dart

@@ -61,8 +61,8 @@ part 'retrofit_api.g.dart';
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8766/app/';
+    baseUrl ??= 'http://192.168.10.88:8766/app/';
   }
 
   final Dio _dio;
@@ -17,22 +17,17 @@ class _ApiService implements ApiService {
   String baseUrl;
 
   @override
-  Future<BaseData<UploadResult>> upload(data, folderId,bool isVideo) async {
+  Future<BaseData<UploadResult>> upload(data, folderId, isVideo) async {
     ArgumentError.checkNotNull(data, 'data');
     ArgumentError.checkNotNull(folderId, 'folderId');
+    ArgumentError.checkNotNull(isVideo, 'isVideo');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = FormData();
-    String fileName = data.path.split(Platform.pathSeparator).last;
-    if(!isVideo && !fileName.contains(".jpeg") && !fileName.contains(".png"))
-      fileName += ".jpeg";
-    else if(isVideo && !fileName.contains(".mp4"))
-      fileName += ".mp4";
     _data.files.add(MapEntry(
         'file',
         MultipartFile.fromFileSync(data.path,
-            filename: fileName)));
-    print("filename:$fileName");
+            filename: data.path.split(Platform.pathSeparator).last)));
     if (folderId != null) {
       _data.fields.add(MapEntry('folderId', folderId.toString()));
     }
@@ -74,28 +69,6 @@ class _ApiService implements ApiService {
     return value;
   }
 
-  // @override
-  // Future<BaseData<dynamic>> memberLogin(param) async {
-  //   ArgumentError.checkNotNull(param, 'param');
-  //   const _extra = <String, dynamic>{};
-  //   final queryParameters = <String, dynamic>{};
-  //   final _data = <String, dynamic>{};
-  //   _data.addAll(param ?? <String, dynamic>{});
-  //   final _result = await _dio.request<Map<String, dynamic>>(
-  //       '/auth/platform/memberLogin',
-  //       queryParameters: queryParameters,
-  //       options: RequestOptions(
-  //           method: 'POST',
-  //           headers: <String, dynamic>{},
-  //           extra: _extra,
-  //           baseUrl: baseUrl),
-  //       data: _data);
-  //   final value = BaseData<dynamic>.fromJson(
-  //     _result.data,
-  //     (json) => json as dynamic,
-  //   );
-  //   return value;
-  // }
   @override
   Future<BaseData<LoginInfo>> memberLogin(param) async {
     ArgumentError.checkNotNull(param, 'param');
@@ -374,15 +347,13 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _headers = <String, dynamic>{};
-    _headers.addAll({"Environment":"app"});
     _data.addAll(param ?? <String, dynamic>{});
     final _result = await _dio.request<Map<String, dynamic>>(
         '/creditOrder/create',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'POST',
-            headers: _headers,
+            headers: <String, dynamic>{},
             extra: _extra,
             baseUrl: baseUrl),
         data: _data);
@@ -1037,8 +1008,7 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/app-msg/stats',
+    final _result = await _dio.request<Map<String, dynamic>>('/app-msg/stats',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1415,7 +1385,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<CategorySelectList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<CategorySelectList>((i) => CategorySelectList.fromJson(i as Map<String, dynamic>))
+            .map<CategorySelectList>(
+                (i) => CategorySelectList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1450,8 +1421,7 @@ class _ApiService implements ApiService {
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
     _data.addAll(map ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/course/list',
+    final _result = await _dio.request<Map<String, dynamic>>('/course/list',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'POST',
@@ -1486,7 +1456,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<CollectClassList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<CollectClassList>((i) => CollectClassList.fromJson(i as Map<String, dynamic>))
+            .map<CollectClassList>(
+                (i) => CollectClassList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1509,7 +1480,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<CourseList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<CourseList>((i) => CourseList.fromJson(i as Map<String, dynamic>))
+            .map<CourseList>(
+                (i) => CourseList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1520,8 +1492,7 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/course/$id',
+    final _result = await _dio.request<Map<String, dynamic>>('/course/$id',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1559,13 +1530,14 @@ class _ApiService implements ApiService {
   }
 
   @override
-  Future<BaseData<List<VipBadgesList>>> findBadges(param) async {
-    ArgumentError.checkNotNull(param, 'param');
+  Future<BaseData<List<VipBadgesList>>> findBadges(map) async {
+    ArgumentError.checkNotNull(map, 'map');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/app-memberAchievement/findBadges',
+    _data.addAll(map ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/app-memberAchievement/findBadges',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'POST',
@@ -1576,13 +1548,15 @@ class _ApiService implements ApiService {
     final value = BaseData<List<VipBadgesList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<VipBadgesList>((i) => VipBadgesList.fromJson(i as Map<String, dynamic>))
+            .map<VipBadgesList>(
+                (i) => VipBadgesList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
 
   @override
-  Future<BaseData<List<AchievementDetailList>>> getAchievementDetail(achievementCategoryId) async {
+  Future<BaseData<List<AchievementDetailList>>> getAchievementDetail(
+      achievementCategoryId) async {
     ArgumentError.checkNotNull(achievementCategoryId, 'achievementCategoryId');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
@@ -1599,7 +1573,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<AchievementDetailList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<AchievementDetailList>((i) => AchievementDetailList.fromJson(i as Map<String, dynamic>))
+            .map<AchievementDetailList>((i) =>
+                AchievementDetailList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1621,7 +1596,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<VipBenefitList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<VipBenefitList>((i) => VipBenefitList.fromJson(i as Map<String, dynamic>))
+            .map<VipBenefitList>(
+                (i) => VipBenefitList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1631,8 +1607,7 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/home/vipBenefit',
+    final _result = await _dio.request<Map<String, dynamic>>('/home/vipBenefit',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1664,7 +1639,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<SecondCardList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<SecondCardList>((i) => SecondCardList.fromJson(i as Map<String, dynamic>))
+            .map<SecondCardList>(
+                (i) => SecondCardList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1774,7 +1750,8 @@ class _ApiService implements ApiService {
     final value = BaseData<List<HeadlinesList>>.fromJson(
         _result.data,
         (json) => (json as List<dynamic>)
-            .map<HeadlinesList>((i) => HeadlinesList.fromJson(i as Map<String, dynamic>))
+            .map<HeadlinesList>(
+                (i) => HeadlinesList.fromJson(i as Map<String, dynamic>))
             .toList());
     return value;
   }
@@ -1800,5 +1777,4 @@ class _ApiService implements ApiService {
     );
     return value;
   }
-
 }

lib/store/shopping/activity_prefecture_details.dart

@@ -176,7 +176,7 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
         refreshController.refreshCompleted();
       });
     } else {
-      refreshController.refreshFailed();
+      refreshController.refreshCompleted();
     }
   }
 
@@ -217,7 +217,7 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
         physics: BouncingScrollPhysics(),
         onRefresh: () {
           setState(() {
-            queryFindActListByType(pageType == "2" ? false : true);
+              queryFindActListByType((pageType == "2" && seckillIndex == 0) ? false : true);
           });
         },
         child:SingleChildScrollView(
@@ -916,6 +916,7 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
                         ],
                       ),
                     ),
+                    SizedBox(width:2.w,),
                     Expanded(
                       child: Text(
                         productList.productPrice,

lib/store/shopping/shopping_cart/shopping_cart_page.dart

@@ -13,6 +13,7 @@ import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -388,26 +389,14 @@ class _ShoppingCartPage extends State<ShoppingCartPage>
   }
 
   Widget cartGoodsList(){
-    return
-    //   ((shopCarGoods?.length ?? 0) > 0) ?Container(
-    //   // width: double.infinity,
-    //     alignment: Alignment.center,
-    //     margin: EdgeInsets.only(bottom: 47.h,left: 66.w,right: 59.w),
-    //     child:Column(children: [
-    //       Image.asset(
-    //         "assets/image/shopping_k.png",
-    //         width:double.infinity,
-    //         height: 250.h,
-    //       ),
-    //       Text(
-    //         "目前暂无商品，要快去买点好吃的哦~",
-    //         style: TextStyle(
-    //           fontSize: 16.sp,
-    //           fontWeight: MyFontWeight.regular,
-    //           color: Color(0xFF353535),
-    //         ),
-    //       ),
-    // ],)):
+    return (shopCarGoods == null || shopCarGoods.length == 0)
+          ? NoDataView(
+        src: "assets/image/shopping_k.png",
+        isShowBtn: false,
+        text:"目前暂无商品，要快去买点好吃的哦~",
+        fontSize: 16.sp,
+        margin: EdgeInsets.only(top: 150.h),
+      ):
     Container(
       margin: EdgeInsets.only(bottom: 50.h),
       child: ListView.builder(

lib/store/shopping/shopping_goods_details.dart

@@ -75,7 +75,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
   Timer _timer;
   String testTime = "2021-12-30 10:00:00";
 
-
   @override
   void dispose() {
     super.dispose();
@@ -183,8 +182,7 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
     if (baseData != null && baseData.isSuccess) {
       setState(() {
         miNiDetail = baseData.data;
-        if(pageType != null)
-        queryViewProduct(actProductId, pageType);
+        if (pageType != null) queryViewProduct(actProductId, pageType);
       });
       refreshController.refreshCompleted();
     } else {
@@ -212,7 +210,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
       setState(() {
         activityDetails = baseData.data;
         miNiDetail.productSkuVOList.forEach((element) {
-          var sku = activityDetails.actProduct.skuJson.firstWhere((ele) => ele.skuId == element.id);
+          var sku = activityDetails.actProduct.skuJson
+              .firstWhere((ele) => ele.skuId == element.id);
           if (sku == null) {
             miNiDetail.productSkuVOList.remove(sku);
           } else {
@@ -289,7 +288,11 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
   }
 
   ///选规格添加购物车
-  Future _addShopCar(MiNiDetail miNiDetail, selectSkus, int count,) async {
+  Future _addShopCar(
+    MiNiDetail miNiDetail,
+    selectSkus,
+    int count,
+  ) async {
     if (selectSkus != null && selectSkus.length == 0) {
       productSku = miNiDetail.productSkuVOList.first;
     } else {
@@ -310,14 +313,12 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
         .toString()
         .replaceAll("[", "")
         .replaceAll("]", "")
-        .replaceAll(",", "")
-    ;
+        .replaceAll(",", "");
     setState(() {
       skuId1 = skuId;
       skuValue1 = skuValue;
       count1 = count;
     });
-
   }
 
   ///商品➕1
@@ -372,8 +373,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
       setState(() {
         if ((activityDetails?.actRecordAndJoinlDTOList) != null)
           activityDetails.actRecordAndJoinlDTOList.forEach((element) {
-          var tempDateTime =
-          DateTime.parse(element.actRecord.endTime).difference(DateTime.now());
+            var tempDateTime = DateTime.parse(element.actRecord.endTime)
+                .difference(DateTime.now());
             if (tempDateTime.inSeconds < 0) {
               element.actRecord.tempDay = 0;
               element.actRecord.tempHour = 0;
@@ -382,9 +383,12 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
               return;
             }
             element.actRecord.tempDay = tempDateTime.inDays;
-          element.actRecord.tempHour = tempDateTime.inHours - (tempDateTime.inDays * 24);
-          element.actRecord.tempM = tempDateTime.inMinutes - (tempDateTime.inHours * 60);
-          element.actRecord.tempS = tempDateTime.inSeconds - (tempDateTime.inMinutes * 60);
+            element.actRecord.tempHour =
+                tempDateTime.inHours - (tempDateTime.inDays * 24);
+            element.actRecord.tempM =
+                tempDateTime.inMinutes - (tempDateTime.inHours * 60);
+            element.actRecord.tempS =
+                tempDateTime.inSeconds - (tempDateTime.inMinutes * 60);
           });
       });
     });
@@ -404,8 +408,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
       arguments: {
         "storeInfo": storeInfo,
         "tableId": tableId,
-        // "parentCode": parentCode,
-        // "parentId": parentId,
+        "parentCode": parentCode,
+        "parentId": parentId,
         "pName": pName,
         "pid": pid,
         "cName": cName,
@@ -426,7 +430,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
         // "numberOfPeople": numberOfPeople,
       },
     );
-
   }
 
   @override
@@ -465,12 +468,10 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                           buildColumn(),
 
                           ///拼团
-                          if (pageType == "1")
-                          groupOption(),
+                          if (pageType == "1") groupOption(),
 
                           ///拼团规则
-                          if(pageType == "1")
-                          groupRule(),
+                          if (pageType == "1") groupRule(),
                           goodsOption(),
                           Padding(
                             padding: EdgeInsets.only(top: 16.h, bottom: 12.h),
@@ -620,7 +621,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                 GestureDetector(
                   onTap: () {
                     if (productSku == null)
-                      SmartDialog.showToast("请选择規格!", alignment: Alignment.center);
+                      SmartDialog.showToast("请选择規格!",
+                          alignment: Alignment.center);
                     addShoppingCar();
                   },
                   child: Container(
@@ -714,7 +716,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                 ),
                               ),
                               TextSpan(
-                                text:activityDetails?.actProduct?.productPrice ?? "",
+                                text:
+                                    activityDetails?.actProduct?.productPrice ??
+                                        "",
                                 style: TextStyle(
                                   fontSize: 10.sp,
                                   fontWeight: MyFontWeight.medium,
@@ -724,8 +728,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                             ],
                           ),
                         ),
-                        Expanded(child:
-                        Text(
+                        Expanded(
+                            child: Text(
                           "原价购买",
                           style: TextStyle(
                             fontSize: 12.sp,
@@ -772,7 +776,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                   ),
                                 ),
                                 TextSpan(
-                                  text: activityDetails?.actProduct?.promotionPrice ?? "",
+                                  text: activityDetails
+                                          ?.actProduct?.promotionPrice ??
+                                      "",
                                   style: TextStyle(
                                     fontSize: 10.sp,
                                     fontWeight: MyFontWeight.medium,
@@ -782,15 +788,16 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                               ],
                             ),
                           ),
-                          Expanded(child:
-                          Text(
+                          Expanded(
+                            child: Text(
                               "我要秒杀",
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: MyFontWeight.medium,
                                 color: Colors.white,
                               ),
-                          ),),
+                            ),
+                          ),
                         ],
                       ),
                     )),
@@ -832,7 +839,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                 ),
                               ),
                               TextSpan(
-                                text:activityDetails?.actProduct?.productPrice ?? "",
+                                text:
+                                    activityDetails?.actProduct?.productPrice ??
+                                        "",
                                 style: TextStyle(
                                   fontSize: 10.sp,
                                   fontWeight: MyFontWeight.medium,
@@ -842,8 +851,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                             ],
                           ),
                         ),
-                        Expanded(child:
-                        Text(
+                        Expanded(
+                            child: Text(
                           "原价购买",
                           style: TextStyle(
                             fontSize: 12.sp,
@@ -857,7 +866,16 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                 ),
                 GestureDetector(
                     onTap: () {
-                      Navigator.of(context).popAndPushNamed('/router/bargain_details');
+                      if (count1 == 0) {
+                        SmartDialog.showToast("请先选择您要购买的商品！～");
+                        return;
+                      }
+                      Navigator.of(context)
+                          .popAndPushNamed('/router/bargain_details',arguments: {
+                        // "actRecordId": activityDetails.actRecordAndJoinlDTOList[0]
+                        //     .actRecordJoinList[index].actRecordId,
+                        "actProduct":activityDetails.actProduct,
+                      });
                     },
                     child: Container(
                       alignment: Alignment.center,
@@ -890,7 +908,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                   ),
                                 ),
                                 TextSpan(
-                                  text:activityDetails?.actProduct?.promotionPrice ?? "",
+                                  text: activityDetails
+                                          ?.actProduct?.promotionPrice ??
+                                      "",
                                   style: TextStyle(
                                     fontSize: 10.sp,
                                     fontWeight: MyFontWeight.medium,
@@ -900,22 +920,22 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                               ],
                             ),
                           ),
-                          Expanded(child:
-                          Text(
+                          Expanded(
+                            child: Text(
                               "我要砍价",
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: MyFontWeight.medium,
                                 color: Colors.white,
                               ),
-                          ),),
+                            ),
+                          ),
                         ],
                       ),
                     )),
               ],
             ),
 
-
           ///拼团按钮
           if (pageType == "1")
             Row(
@@ -951,7 +971,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                 ),
                               ),
                               TextSpan(
-                                text:activityDetails?.actProduct?.productPrice ?? "",
+                                text:
+                                    activityDetails?.actProduct?.productPrice ??
+                                        "",
                                 style: TextStyle(
                                   fontSize: 10.sp,
                                   fontWeight: MyFontWeight.medium,
@@ -961,8 +983,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                             ],
                           ),
                         ),
-                        Expanded(child:
-                        Text(
+                        Expanded(
+                            child: Text(
                           "单人购买",
                           style: TextStyle(
                             fontSize: 12.sp,
@@ -1009,7 +1031,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                                   ),
                                 ),
                                 TextSpan(
-                                  text:activityDetails?.actProduct?.promotionPrice ?? "",
+                                  text: activityDetails
+                                          ?.actProduct?.promotionPrice ??
+                                      "",
                                   style: TextStyle(
                                     fontSize: 10.sp,
                                     fontWeight: MyFontWeight.medium,
@@ -1019,15 +1043,16 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                               ],
                             ),
                           ),
-                          Expanded(child:
-                          Text(
+                          Expanded(
+                            child: Text(
                               "我要开团",
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: MyFontWeight.medium,
                                 color: Colors.white,
                               ),
-                          ),),
+                            ),
+                          ),
                         ],
                       ),
                     )),
@@ -1342,7 +1367,17 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
             height: 1.h,
             color: Color(0xFFF1F1F1),
           ),
-          Row(
+          GestureDetector(
+              onTap: () {
+                setState(() {
+                  if (pageType == null) {
+                    showStoreSelector(miNiDetail, id, 1);
+                  } else {
+                    showStoreSelector(miNiDetail, productId, 1);
+                  }
+                });
+              },
+              child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -1369,24 +1404,13 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                       ),
                     ),
                   ),
-              GestureDetector(
-                onTap: () {
-                  setState(() {
-                    if(pageType == null){
-                      showStoreSelector(miNiDetail, id, 1);
-                    }else {
-                      showStoreSelector(miNiDetail, productId, 1);
-                    }
-                  });
-                },
-                child: Icon(
+                  Icon(
                     Icons.arrow_forward_ios,
                     color: Colors.black,
                     size: 16.sp,
                   ),
-              ),
                 ],
-          ),
+              )),
           Container(
             margin: EdgeInsets.only(left: 32.w, top: 8.h, bottom: 8.h),
             width: double.infinity,
@@ -1467,9 +1491,12 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
               GestureDetector(
                 onTap: () {
                   setState(() {
-                    Navigator.of(context)
-                        .popAndPushNamed('/router/group_page_details',
-                    arguments: {"actRecordAndJoinlDTOList":json.encode(activityDetails.actRecordAndJoinlDTOList),});
+                    Navigator.of(context).popAndPushNamed(
+                        '/router/group_page_details',
+                        arguments: {
+                          "actRecordAndJoinlDTOList": json
+                              .encode(activityDetails.actRecordAndJoinlDTOList),
+                        });
                   });
                 },
                 child: Text(
@@ -1500,7 +1527,9 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                 onTap: () {
                   setState(() {});
                 },
-                child: groupItem(activityDetails.actRecordAndJoinlDTOList[position],position),
+                child: groupItem(
+                    activityDetails.actRecordAndJoinlDTOList[position],
+                    position),
               );
             },
           ),
@@ -1528,7 +1557,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
           SizedBox(width: 4.w),
           Expanded(
               child: Text(
-              actRecordAndJoinlDTOList?.actRecordJoinList[0]?.memberNickname ??"",
+            actRecordAndJoinlDTOList?.actRecordJoinList[0]?.memberNickname ??
+                "",
             style: TextStyle(
               fontSize: 12.sp,
               fontWeight: MyFontWeight.regular,
@@ -1551,7 +1581,7 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                       ),
                     ),
                     TextSpan(
-                      text:activityDetails.actRecordAndJoinlDTOList[0].actRecord.joinNum.toString(),
+                      text: (limitNumber - (activityDetails.actRecordAndJoinlDTOList[0].actRecord.joinNum)).toString(),
                       style: TextStyle(
                         fontSize: 10.sp,
                         fontWeight: MyFontWeight.regular,
@@ -1581,8 +1611,13 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
           ),
           GestureDetector(
             onTap: () {
-              Navigator.of(context).popAndPushNamed('/router/group_details',
-              arguments: {"actRecordId":activityDetails.actRecordAndJoinlDTOList[0].actRecordJoinList[index].actRecordId});
+              Navigator.of(context)
+                  .popAndPushNamed('/router/group_details', arguments: {
+                "actRecordId": activityDetails.actRecordAndJoinlDTOList[0]
+                    .actRecordJoinList[index].actRecordId,
+                "actProduct":activityDetails.actProduct,
+                "limitNumber":limitNumber,
+              });
             },
             child: Container(
               alignment: Alignment.center,
@@ -1617,7 +1652,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
               ),
             ),
           ),
-
         ],
       ),
     );

lib/store/shopping/shopping_home/group_details.dart

@@ -6,6 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/retrofit/data/activity_actRecord_details.dart';
+import 'package:huixiang/retrofit/data/activity_details.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/min_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
@@ -30,6 +31,7 @@ class GroupDetails extends StatefulWidget {
 class _GroupDetails extends State<GroupDetails> {
   MinApiService minService;
   String actRecordId;
+  // ActProduct actProduct;
   ActivityActRecordDetails activityActRecordDetails;
   bool isDispose = false;
   Timer _timer;
@@ -38,6 +40,7 @@ class _GroupDetails extends State<GroupDetails> {
   int tempHour = 0;
   int tempM = 0;
   int tempS = 0;
+  int limitNumber = 0;
 
   @override
   void dispose() {
@@ -54,7 +57,8 @@ class _GroupDetails extends State<GroupDetails> {
   void initState() {
     super.initState();
     actRecordId = widget.arguments["actRecordId"];
-
+    // actProduct = widget.arguments["actProduct"];
+    limitNumber = widget.arguments["limitNumber"];
     startCountdownTimer();
     SharedPreferences.getInstance().then((value) {
       String minToken = value.getString("minToken");
@@ -216,7 +220,7 @@ class _GroupDetails extends State<GroupDetails> {
             ),
           ),
           // MImage(
-          //   "",
+          //  actProduct?.productImg??"",
           //   width: double.infinity,
           //   height: 166,
           //   fit: BoxFit.cover,
@@ -381,7 +385,7 @@ class _GroupDetails extends State<GroupDetails> {
                       alignment: Alignment.center,
                       decoration: BoxDecoration(
                           // color: Color(0xFFD2D2D2),
-                        color: Color(0xFFF8961E),
+                        color: (((activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber) || tempDay == 0) ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                           borderRadius: BorderRadius.circular(4)),
                       child: Text(
                         tempDay.toString(),
@@ -401,7 +405,7 @@ class _GroupDetails extends State<GroupDetails> {
                           fontSize: 16.sp,
                           fontWeight: MyFontWeight.medium,
                           // color: Color(0xFFD2D2D2),
-                          color: Color(0xFFF8961E),
+                          color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                         ),
                       )),
                 ],
@@ -414,7 +418,7 @@ class _GroupDetails extends State<GroupDetails> {
                   alignment: Alignment.center,
                   decoration: BoxDecoration(
                       // color: Color(0xFFD2D2D2),
-                      color: Color(0xFFF8961E),
+                      color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                       borderRadius: BorderRadius.circular(4)),
                   child: Text(
                   tempHour.toString(),
@@ -434,7 +438,7 @@ class _GroupDetails extends State<GroupDetails> {
                       fontSize: 16.sp,
                       fontWeight: MyFontWeight.medium,
                       // color: Color(0xFFD2D2D2),
-                      color: Color(0xFFF8961E),
+                      color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                     ),
                   )),
               InkWell(
@@ -445,7 +449,7 @@ class _GroupDetails extends State<GroupDetails> {
                   alignment: Alignment.center,
                   decoration: BoxDecoration(
                       // color: Color(0xFFD2D2D2),
-                      color: Color(0xFFF8961E),
+                      color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                       borderRadius: BorderRadius.circular(4)),
                   child: Text(
                     tempM.toString(),
@@ -465,7 +469,7 @@ class _GroupDetails extends State<GroupDetails> {
                       fontSize: 16.sp,
                       fontWeight: MyFontWeight.medium,
                       // color: Color(0xFFD2D2D2),
-                      color: Color(0xFFF8961E),
+                      color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                     ),
                   )),
               InkWell(
@@ -476,7 +480,7 @@ class _GroupDetails extends State<GroupDetails> {
                   alignment: Alignment.center,
                   decoration: BoxDecoration(
                       // color: Color(0xFFD2D2D2),
-                      color: Color(0xFFF8961E),
+                      color: (activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber ? Color(0xFFD2D2D2):Color(0xFFF8961E),
                       borderRadius: BorderRadius.circular(4)),
                   child: Text(
                     tempS.toString(),
@@ -493,14 +497,16 @@ class _GroupDetails extends State<GroupDetails> {
           SizedBox(
             height: 24,
           ),
-          // Text(
-          //   "恭喜您拼团成功",
-          //   style: TextStyle(
-          //     fontSize: 18.sp,
-          //     fontWeight: MyFontWeight.semi_bold,
-          //     color: Colors.black,
-          //   ),
-          // ),
+          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber)
+          Text(
+            "恭喜您拼团成功",
+            style: TextStyle(
+              fontSize: 18.sp,
+              fontWeight: MyFontWeight.semi_bold,
+              color: Colors.black,
+            ),
+          ),
+          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) < limitNumber)
           Text.rich(
             TextSpan(
               children: [
@@ -513,7 +519,7 @@ class _GroupDetails extends State<GroupDetails> {
                   ),
                 ),
                 TextSpan(
-                  text:(activityActRecordDetails?.actRecord?.joinNum ?? 0).toString(),
+                  text:(limitNumber - (activityActRecordDetails?.actRecord?.joinNum ?? 0)).toString(),
                   style: TextStyle(
                     fontSize: 18.sp,
                     fontWeight: MyFontWeight.semi_bold,
@@ -531,14 +537,6 @@ class _GroupDetails extends State<GroupDetails> {
               ],
             ),
           ),
-          // Text(
-          //   "很遗憾，拼团失败",
-          //   style: TextStyle(
-          //     fontSize: 18.sp,
-          //     fontWeight: MyFontWeight.semi_bold,
-          //     color: Colors.black,
-          //   ),
-          // ),
           SizedBox(
             height: 32,
           ),
@@ -551,11 +549,11 @@ class _GroupDetails extends State<GroupDetails> {
               padding: EdgeInsets.zero,
               scrollDirection: Axis.horizontal,
               physics: BouncingScrollPhysics(),
-              itemCount:activityActRecordDetails?.actRecord?.joinNum ?? 0,
+              itemCount:limitNumber,
               itemBuilder: (context, position) {
                 return GestureDetector(
                   onTap: () {},
-                  child: groupItem(activityActRecordDetails.actRecordJoinList[position]),
+                  child: groupItem(position),
                 );
               },
             ),
@@ -563,6 +561,7 @@ class _GroupDetails extends State<GroupDetails> {
           SizedBox(
             height:54.h,
           ),
+          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) == limitNumber)
           InkWell(
             onTap: () {
               setState(() {
@@ -585,44 +584,44 @@ class _GroupDetails extends State<GroupDetails> {
                   ),
                 )),
           ),
-          // InkWell(
-          //   onTap: () {
-          //     setState(() {
-          //     });
-          //   },
-          //   child:Container(
-          //       width:double.infinity,
-          //       height:54.h,
-          //       margin: EdgeInsets.only(bottom: 28),
-          //       alignment: Alignment.center,
-          //       decoration: BoxDecoration(
-          //           color: Color(0xFF00A359),
-          //           borderRadius: BorderRadius.circular(27)),
-          //       child: Row(
-          //         mainAxisAlignment: MainAxisAlignment.center,
-          //         crossAxisAlignment: CrossAxisAlignment.center,
-          //         children: [
-          //           Image.asset(
-          //             "assets/image/wx.png",
-          //             width:24,
-          //             height:24,
-          //             fit: BoxFit.cover,
-          //           ),
-          //           SizedBox(
-          //             width:8,
-          //           ),
-          //           Text(
-          //             "邀请微信好友一起拼团",
-          //             style: TextStyle(
-          //               fontSize: 16.sp,
-          //               fontWeight: MyFontWeight.medium,
-          //               color: Colors.white,
-          //             ),
-          //           )
-          //         ],
-          //       )),
-          // ),
-          //
+          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) < limitNumber)
+          InkWell(
+            onTap: () {
+              setState(() {
+              });
+            },
+            child:Container(
+                width:double.infinity,
+                height:54.h,
+                margin: EdgeInsets.only(bottom: 28),
+                alignment: Alignment.center,
+                decoration: BoxDecoration(
+                    color: Color(0xFF00A359),
+                    borderRadius: BorderRadius.circular(27)),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Image.asset(
+                      "assets/image/wx.png",
+                      width:24,
+                      height:24,
+                      fit: BoxFit.cover,
+                    ),
+                    SizedBox(
+                      width:8,
+                    ),
+                    Text(
+                      "邀请微信好友一起拼团",
+                      style: TextStyle(
+                        fontSize: 16.sp,
+                        fontWeight: MyFontWeight.medium,
+                        color: Colors.white,
+                      ),
+                    )
+                  ],
+                )),
+          ),
           // InkWell(
           //   onTap: () {
           //     setState(() {
@@ -650,16 +649,19 @@ class _GroupDetails extends State<GroupDetails> {
     );
   }
 
-  Widget groupItem(ActRecordJoinList actRecordJoinList) {
+  Widget groupItem(position) {
     return Container(
       margin: EdgeInsets.only(right:25),
       child:Row(
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
+          if(position < (activityActRecordDetails?.actRecord?.joinNum ?? 0))
           Stack(
             children: [
               Container(
+                width:70,
+                height:70,
                 alignment: Alignment.center,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(60),
@@ -670,7 +672,7 @@ class _GroupDetails extends State<GroupDetails> {
                   ),
                 ),
                 child:MImage(
-                 actRecordJoinList?.memberAvatar ?? "",
+                  activityActRecordDetails.actRecordJoinList[position]?.memberAvatar ?? "",
                   width:60,
                   height:60,
                   fit: BoxFit.cover,
@@ -679,7 +681,7 @@ class _GroupDetails extends State<GroupDetails> {
                   fadeSrc: "assets/image/default_1.png",
                 ),
               ),
-              actRecordJoinList.isLeader ?
+              activityActRecordDetails.actRecordJoinList[position].isLeader ?
               Align(
                 alignment: Alignment.bottomCenter,
                 child:Container(
@@ -705,8 +707,7 @@ class _GroupDetails extends State<GroupDetails> {
               ):Container(),
             ],
           ),
-          if(
-          activityActRecordDetails.actRecord.joinNum != 0)
+          if(position >= (activityActRecordDetails?.actRecord?.joinNum ?? 0))
           Container(
             width: 60,
             height: 67,

lib/store/shopping/shopping_home/recommend_goods_list_view.dart

@@ -42,6 +42,7 @@ class _RecommendGoodsListView extends State<RecommendGoodsListView> {
           ),
         ),
         Container(
+          margin: EdgeInsets.only(top:5.h),
           color: Color(0xFF32A060),
           width: 35.w,
           height: 5.h,

lib/store/shopping/shopping_mall_home.dart

@@ -121,7 +121,7 @@ class _ShoppingMallHome extends State<ShoppingMallHome>
           children: [
             Container(
               // padding: EdgeInsets.only(top: 40.h),
-              height: 260.h,
+              height: 230.h,
               decoration: BoxDecoration(
                 gradient: new LinearGradient(
                     begin: Alignment.centerRight,

lib/store/store_view/store_activity.dart

@@ -30,6 +30,7 @@ class _StoreActivity extends State<StoreActivity> {
             ),
             color: Colors.white,
             child: NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
               text: "还没有活动～",
               iconWidth: 220,

lib/view_widget/no_data_view.dart

@@ -3,6 +3,7 @@ import 'package:huixiang/view_widget/round_button.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class NoDataView extends StatelessWidget {
+  final String src;
   final bool isShowBtn;
   final String text;
   final double fontSize;
@@ -11,6 +12,7 @@ class NoDataView extends StatelessWidget {
   final EdgeInsets margin;
 
   NoDataView({
+    this.src,
     this.isShowBtn = true,
     this.text,
     this.fontSize,
@@ -27,7 +29,7 @@ class NoDataView extends StatelessWidget {
       child: Column(
         children: [
           Image(
-            image: AssetImage("assets/image/icon_empty.png"),
+            image: AssetImage(src),
             width: iconWidth,
             height: iconHeight,
           ),
@@ -36,8 +38,10 @@ class NoDataView extends StatelessWidget {
           ),
           Text(
             text,
+            textAlign: TextAlign.center,
             style: TextStyle(
               fontSize: fontSize,
+              height: 1.5,
               color: Color(0xFF353535),
             ),
           ),

pubspec.lock

@@ -867,7 +867,7 @@ packages:
       name: xdg_directories
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.0+1"
   xml:
     dependency: transitive
     description: