Merge remote-tracking branch 'origin/test' into test

lib/pages/book_detail/view.dart

@@ -133,7 +133,10 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
 
                         // 1免费 0 不免费
                         if(controller.bookDetails.isFree == 1){
-                          context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                          final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                          if (result == true){
+                            controller.getBookDetails();
+                          }
                         }
                         else {
                           // 没有购买
@@ -159,11 +162,18 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
                                }
                              }
                              else{
-                               context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                               final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                               if (result == true){
+                                 controller.getBookDetails();
+                               }
                              }
                           }
                           else{
-                            context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                            final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                            if (result == true){
+                              controller.getBookDetails();
+                            }
+
                           }
                         }
                       },

lib/pages/course/widgets/banner.dart

@@ -43,7 +43,7 @@ class BuildBanner extends StatelessWidget {
             //CustomImage.network(item.pic??'',)
             child: GestureDetector(
               onTap: (){
-                if (onTap !=null) onTap!(item);
+                if (onTap !=null && item.url!.isNotEmpty) onTap!(item);
               },
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(8.w),

lib/pages/user_coin/index.dart

@@ -12,6 +12,7 @@ import 'package:flutter_inapp_purchase/modules.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
+import 'package:go_router/go_router.dart';
 import 'package:tobias/tobias.dart';
 
 import '../../apis/index.dart';

lib/pages/user_coin/view.dart

@@ -10,53 +10,59 @@ class UserCoinPage extends StatefulWidget {
 class _UserCoinPageState extends State<UserCoinPage> {
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<UserCoinController>(
-      init: UserCoinController(),
-      builder: (controller) => Scaffold(
-        appBar: CustomAppBar(
-          title: const Text('紫荆币'),
-          actions: [
-            GestureDetector(
-              onTap: (){
-                showModalBottomSheet(
-                  context: context,
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
+    return WillPopScope(
+      onWillPop: () async {
+        context.pop(true);
+        return false;
+      },
+      child: GetBuilder<UserCoinController>(
+        init: UserCoinController(),
+        builder: (controller) => Scaffold(
+          appBar: CustomAppBar(
+            title: const Text('紫荆币'),
+            actions: [
+              GestureDetector(
+                onTap: (){
+                  showModalBottomSheet(
+                    context: context,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
+                    ),
+                    builder: (BuildContext context) {
+                      return const CoinRechargePage();
+                    },
+                  ).then((value) {
+                     controller.getCoin();
+                  });
+                },
+                  child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
+              )
+            ],
+          ),
+          body: CustomPullScrollView(
+            controller: controller.refreshController,
+            onRefresh: controller.onRefresh,
+            onLoading: controller.onLoading,
+            child: Container(
+              margin: EdgeInsets.all(10.w),
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(8.w),
+                color: Colors.white,
+                boxShadow: [
+                  BoxShadow(
+                    color: const Color(0xFFC7C7C7).withOpacity(0.5),
+                    offset: Offset(3.w, 0),
+                    blurRadius: 10.w,
+                    spreadRadius: 0.w,
                   ),
-                  builder: (BuildContext context) {
-                    return const CoinRechargePage();
-                  },
-                ).then((value) {
-                   controller.getCoin();
-                });
-              },
-                child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
-            )
-          ],
-        ),
-        body: CustomPullScrollView(
-          controller: controller.refreshController,
-          onRefresh: controller.onRefresh,
-          onLoading: controller.onLoading,
-          child: Container(
-            margin: EdgeInsets.all(10.w),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(8.w),
-              color: Colors.white,
-              boxShadow: [
-                BoxShadow(
-                  color: const Color(0xFFC7C7C7).withOpacity(0.5),
-                  offset: Offset(3.w, 0),
-                  blurRadius: 10.w,
-                  spreadRadius: 0.w,
-                ),
-              ],
-            ),
-            child: ListView.builder(
-              itemBuilder: (BuildContext context, int index){
-                return BuildCell(model: controller.coins[index],);
-              },
-              itemCount: controller.coins.length,
+                ],
+              ),
+              child: ListView.builder(
+                itemBuilder: (BuildContext context, int index){
+                  return BuildCell(model: controller.coins[index],);
+                },
+                itemCount: controller.coins.length,
+              ),
             ),
           ),
         ),