feat:商品列表请求&路由

吴启风
1 parent 4224b3f8
Showing 12 changed files with 155 additions and 137 deletions
lib/common/request/apis.dart
lib/generated/json/product_entity.g.dart
lib/models/product_entity.dart
lib/pages/home/widgets/home_tab_header_widget.dart
lib/pages/shop/home/bloc/shop_home_bloc.dart
lib/pages/shop/home/bloc/shop_home_event.dart
lib/pages/shop/home/bloc/shop_home_state.dart
lib/pages/shop/home/shop_home_page.dart
lib/pages/shop/home/widgets/lesson_card_item.dart
lib/pages/shopping/bloc.dart
lib/pages/shopping/view.dart
lib/route/route.dart
@@ -82,4 +82,7 @@ class Apis {
   /// 退出课堂
   static const String exitClass = 'course/exit/class';
+
+  /// 商品列表
+  static const String productList = 'order/course/combo/list';
 }
@@ -3,31 +3,96 @@ import &#39;package:wow_english/models/product_entity.dart&#39;;
 ProductEntity $ProductEntityFromJson(Map<String, dynamic> json) {
   final ProductEntity productEntity = ProductEntity();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    productEntity.id = id;
+  }
   final String? name = jsonConvert.convert<String>(json['name']);
   if (name != null) {
     productEntity.name = name;
   }
+  final String? title = jsonConvert.convert<String>(json['title']);
+  if (title != null) {
+    productEntity.title = title;
+  }
   final double? price = jsonConvert.convert<double>(json['price']);
   if (price != null) {
     productEntity.price = price;
   }
+  final String? picUrl = jsonConvert.convert<String>(json['picUrl']);
+  if (picUrl != null) {
+    productEntity.picUrl = picUrl;
+  }
+  final String? bannerPicUrl = jsonConvert.convert<String>(
+      json['bannerPicUrl']);
+  if (bannerPicUrl != null) {
+    productEntity.bannerPicUrl = bannerPicUrl;
+  }
+  final String? detailPicUrl = jsonConvert.convert<String>(
+      json['detailPicUrl']);
+  if (detailPicUrl != null) {
+    productEntity.detailPicUrl = detailPicUrl;
+  }
+  final int? saleType = jsonConvert.convert<int>(json['saleType']);
+  if (saleType != null) {
+    productEntity.saleType = saleType;
+  }
+  final int? status = jsonConvert.convert<int>(json['status']);
+  if (status != null) {
+    productEntity.status = status;
+  }
+  final int? sortOrder = jsonConvert.convert<int>(json['sortOrder']);
+  if (sortOrder != null) {
+    productEntity.sortOrder = sortOrder;
+  }
+  final int? validityType = jsonConvert.convert<int>(json['validityType']);
+  if (validityType != null) {
+    productEntity.validityType = validityType;
+  }
   return productEntity;
 }
 Map<String, dynamic> $ProductEntityToJson(ProductEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
   data['name'] = entity.name;
+  data['title'] = entity.title;
   data['price'] = entity.price;
+  data['picUrl'] = entity.picUrl;
+  data['bannerPicUrl'] = entity.bannerPicUrl;
+  data['detailPicUrl'] = entity.detailPicUrl;
+  data['saleType'] = entity.saleType;
+  data['status'] = entity.status;
+  data['sortOrder'] = entity.sortOrder;
+  data['validityType'] = entity.validityType;
   return data;
 }
 extension ProductEntityExtension on ProductEntity {
   ProductEntity copyWith({
+    int? id,
     String? name,
+    String? title,
     double? price,
+    String? picUrl,
+    String? bannerPicUrl,
+    String? detailPicUrl,
+    int? saleType,
+    int? status,
+    int? sortOrder,
+    int? validityType,
   }) {
     return ProductEntity()
+      ..id = id ?? this.id
       ..name = name ?? this.name
-      ..price = price ?? this.price;
+      ..title = title ?? this.title
+      ..price = price ?? this.price
+      ..picUrl = picUrl ?? this.picUrl
+      ..bannerPicUrl = bannerPicUrl ?? this.bannerPicUrl
+      ..detailPicUrl = detailPicUrl ?? this.detailPicUrl
+      ..saleType = saleType ?? this.saleType
+      ..status = status ?? this.status
+      ..sortOrder = sortOrder ?? this.sortOrder
+      ..validityType = validityType ?? this.validityType;
   }
 }
 \ No newline at end of file
@@ -5,9 +5,30 @@ export &#39;package:wow_english/generated/json/product_entity.g.dart&#39;;
 @JsonSerializable()
 class ProductEntity {
-	late String name;
-	late double price;
-	late String url;
+
+	int? id;
+
+	String? name;
+
+	String? title;
+
+	/// 售卖价格
+	double? price;
+	/// 商品图片
+	String? picUrl;
+	/// 商品banner图片
+	String? bannerPicUrl;
+	/// 商品详情图片
+	String? detailPicUrl;
+	/// 销售类型
+	int? saleType;
+	/// 状态
+	int? status;
+	/// 序号
+	int? sortOrder;
+	/// 有效期类型
+	int? validityType;
+
 	ProductEntity();
@@ -104,14 +104,14 @@ class HomeTabHeaderWidget extends StatelessWidget {
                       }
                     },
                     icon: Image.asset('listen'.assetPng)),
-                // IconButton(
-                //     onPressed: (){
-                //       if(actionTap != null) {
-                //         actionTap!(HeaderActionType.shop);
-                //       }
-                //     },
-                //     icon: Image.asset('shop'.assetPng)
-                // ),
+                IconButton(
+                    onPressed: (){
+                      if(actionTap != null) {
+                        actionTap!(HeaderActionType.shop);
+                      }
+                    },
+                    icon: Image.asset('shop'.assetPng)
+                ),
                 ScreenUtil().bottomBarHeight.horizontalSpace,
               ],
             )
 import 'package:bloc/bloc.dart';
 import 'package:meta/meta.dart';
+import 'package:wow_english/common/request/dao/shop_dao.dart';
+import 'package:wow_english/models/product_entity.dart';
+
+import '../../../../common/request/exception.dart';
+import '../../../../utils/loading.dart';
+import '../../../../utils/toast_util.dart';
 part 'shop_home_event.dart';
 part 'shop_home_state.dart';
 class ShopHomeBloc extends Bloc<ShopHomeEvent, ShopHomeState> {
+
+  List<ProductEntity?> _productDatas = [];
+
+  List<ProductEntity?> get productDatas => _productDatas;
+
   ShopHomeBloc() : super(ShopHomeInitial()) {
     on<ShopHomeEvent>((event, emit) {
       // TODO: implement event handler
     });
+    on<RequestDataEvent>(_requestData);
+  }
+
+  void _requestData(RequestDataEvent event, Emitter<ShopHomeState> emitter) async {
+    try {
+      await loading(() async {
+        _productDatas = await ShopDao.productList() ?? [];
+        emitter(RequestListenDataState());
+      });
+    } catch (e) {
+      if (e is ApiException) {
+        showToast(e.message ?? '请求失败,请检查网络连接');
+      }
+    }
   }
 }
@@ -2,3 +2,5 @@ part of &#39;shop_home_bloc.dart&#39;;
 @immutable
 abstract class ShopHomeEvent {}
+
+class RequestDataEvent extends ShopHomeEvent {}
@@ -4,3 +4,5 @@ part of &#39;shop_home_bloc.dart&#39;;
 abstract class ShopHomeState {}
 class ShopHomeInitial extends ShopHomeState {}
+
+class RequestListenDataState extends ShopHomeState {}
 \ No newline at end of file
@@ -3,7 +3,7 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
-import 'package:wow_english/pages/shop/home/widgets/lesson_card_item.dart';
+import 'package:wow_english/pages/shop/home/widgets/product_item.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/toast_util.dart';
@@ -15,7 +15,7 @@ class ShopHomePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => ShopHomeBloc(),
+      create: (context) => ShopHomeBloc()..add(RequestDataEvent()),
       child: _ShopHomeView(),
     );
   }
@@ -30,7 +30,9 @@ class _ShopHomeView extends StatelessWidget {
     );
   }
-  Widget _shopHomeWidget() => BlocBuilder<ShopHomeBloc, ShopHomeState>(builder: (context, state) {
+  Widget _shopHomeWidget() =>
+      BlocBuilder<ShopHomeBloc, ShopHomeState>(builder: (context, state) {
+        final bloc = BlocProvider.of<ShopHomeBloc>(context);
         return Scaffold(
           appBar: WEAppBar(
             actions: [
@@ -62,7 +64,7 @@ class _ShopHomeView extends StatelessWidget {
             child: Padding(
               padding: EdgeInsets.symmetric(vertical: 25.h, horizontal: 25.w),
               child: GridView.builder(
-                  itemCount: 4,
+                  itemCount: bloc.productDatas.length,
                   gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
                     crossAxisCount: 2,
                     childAspectRatio: 2,
@@ -70,10 +72,10 @@ class _ShopHomeView extends StatelessWidget {
                     crossAxisSpacing: 4.5.w,
                   ),
                   itemBuilder: (BuildContext context, int index) {
-                    return LessonCardItem(onTap: () {
-                      showToast('购买');
-                      pushNamed(AppRouteName.pay);
-                    });
+                    final productEntity = bloc.productDatas[index];
+                    return ProductItem(onTap: () {
+                      pushNamed(AppRouteName.pay, arguments: productEntity);
+                    }, entity: productEntity);
                   }),
             ),
           ),
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class LessonCardItem extends StatelessWidget {
-  const LessonCardItem({super.key, required this.onTap});
-
-  final Function() onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(10.r),
-        color: Colors.blue,
-        border: Border.all(
-          width: 1.0,
-          color: Colors.black
-        )
-        // image: DecorationImage(
-        //   image: AssetImage(
-        //     ''.assetPng,
-        //   ),
-        //   fit: BoxFit.fill
-        // )
-      ),
-      padding: EdgeInsets.symmetric(horizontal: 16.w,vertical: 16.h),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Container(
-            width: 124.w,
-            decoration: BoxDecoration(
-                border: Border.all(
-                  width: 1.0,
-                  color: const Color(0xFF333333),
-                ),
-                image: const DecorationImage(
-                  fit: BoxFit.fill,
-                  image: NetworkImage('https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2Faa1c2213-820a-4223-8757-5f8cee318a28%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1688713226&t=192b18a613683bcdc5bd76f65c9ff032'),
-                )
-            ),
-          ),
-          21.5.horizontalSpace,
-          Expanded(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(
-                  'Wow English 课程年卡',
-                  softWrap: true,
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                      fontSize: 12.sp,
-                      color: const Color(0xFF333333)
-                  ),
-                ),
-                RichText(
-                  text: TextSpan(
-                      children:[
-                        TextSpan(
-                            text: '¥',
-                            style: TextStyle(
-                              fontSize: 21.sp,
-                              color: const Color(0xFFF51A1A),
-                            )
-                        ),
-                        TextSpan(
-                            text: '998',
-                            style: TextStyle(
-                              fontSize: 40.sp,
-                              color: const Color(0xFFF51A1A),
-                            ),
-                        )
-                      ]
-                  ),
-                ),
-                GestureDetector(
-                  onTap: () {
-                    onTap();
-                  },
-                  child: Container(
-                    decoration: BoxDecoration(
-                        color: const Color(0xFFF5C51F),
-                        borderRadius: BorderRadius.circular(5.r),
-                        border: Border.all(
-                          color: const Color(0xFF333333),
-                          width: 1.0,
-                        )
-                    ),
-                    padding: EdgeInsets.symmetric(
-                      vertical: 1.h,
-                      horizontal: 26.5.w,
-                    ),
-                    child: Text(
-                      '立即购买',
-                      style: TextStyle(
-                          fontSize: 10.sp,
-                          color: const Color(0xFF333333)
-                      ),
-                    ),
-                  ),
-                )
-              ],
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}
 \ No newline at end of file
@@ -16,7 +16,7 @@ class ShoppingBloc extends Bloc&lt;ShoppingEvent, ShoppingState&gt; {
   PaymentChannel get curPaymentChannel => _curPaymentChannel;
-  ShoppingBloc() : super(ShoppingState().init()) {
+  ShoppingBloc(this._productData) : super(ShoppingState().init()) {
     //页面初始化时刻
     on<InitEvent>(_init);
     on<ChangePaymentChannelEvent>(_changePaymentChannel);
@@ -3,6 +3,7 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/models/product_entity.dart';
 import '../../common/core/assets_const.dart';
 import '../../common/widgets/we_app_bar.dart';
@@ -45,13 +46,15 @@ Widget buildRadioOption({
 }
 class ShoppingPage extends StatelessWidget {
-  const ShoppingPage({super.key});
+  const ShoppingPage({super.key, this.productEntity});
+
+  final ProductEntity? productEntity;
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (BuildContext context) =>
-      ShoppingBloc()
+      ShoppingBloc(productEntity)
         ..add(InitEvent()),
       child: _ShoppingView(),
     );
@@ -77,7 +80,7 @@ class _ShoppingView extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               CachedNetworkImage(
-                imageUrl: "${bloc.productData?.url}",
+                imageUrl: "${bloc.productData?.detailPicUrl}",
                 imageBuilder: (context, imageProvider) =>
                     Container(
                       decoration: BoxDecoration(
@@ -111,7 +114,7 @@ Widget _paymentWidget() =&gt;
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text('套餐价格：${bloc.productData?.price ?? "199（记得删除）"}',
+            Text('套餐价格：${bloc.productData?.price ?? ''}',
                 style: TextStyle(
                     color: const Color(0xFF333333), fontSize: 16.sp)),
             const SizedBox(height: 15.0),
@@ -2,6 +2,7 @@ import &#39;package:flutter/cupertino.dart&#39;;
 import 'package:flutter/material.dart';
 import 'package:wow_english/app/splash_page.dart';
 import 'package:wow_english/common/pages/wow_web_page.dart';
+import 'package:wow_english/models/product_entity.dart';
 import 'package:wow_english/pages/home/home_page.dart';
 import 'package:wow_english/pages/lessons/lesson_page.dart';
 import 'package:wow_english/pages/listen/listen_page.dart';
@@ -26,6 +27,7 @@ import &#39;../pages/reading/reading_page.dart&#39;;
 import '../pages/shopping/view.dart';
 import '../pages/user/setting/delete_account_page.dart';
 import '../pages/user/setting/reback_page.dart';
+import '../utils/log_util.dart';
 class AppRouteName {
   static const String splash = 'splash';
@@ -104,7 +106,11 @@ class AppRouter {
       case AppRouteName.shop:
         return CupertinoPageRoute(builder: (_) => const ShopHomePage());
       case AppRouteName.pay:
-        return CupertinoPageRoute(builder: (_) => const ShoppingPage());
+        var productEntity = ProductEntity();
+        if (settings.arguments != null && settings.arguments is ProductEntity) {
+          productEntity = settings.arguments as ProductEntity;
+        }
+        return CupertinoPageRoute(builder: (_) => ShoppingPage(productEntity: productEntity));
       case AppRouteName.exLesson:
         return CupertinoPageRoute(builder: (_) => const ExchangeLessonPage());
       case AppRouteName.exList: