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/read_web/view.dart

@@ -25,7 +25,12 @@ class _ReadPageState extends State<ReadPage> {
   }
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<ReadController>(
+    return WillPopScope(
+      onWillPop: () async {
+        context.pop(true);
+        return false;
+      },
+      child: GetBuilder<ReadController>(
         init: ReadController(bookId: widget.bookId, chapterId: widget.chapterId,chapterName: widget.chapterName,bookDetailModel: widget.bookDetailModel),
         builder: (readController) => Scaffold(
           appBar: CustomAppBar(
@@ -84,8 +89,8 @@ class _ReadPageState extends State<ReadPage> {
                      'chapter_id': readController.chapterId,
                      'token':UserStore.to.token
                    };
-                 Console.log('param--------------------------------$param');
-                 controller.evaluateJavascript(source: 'callbackInFlutterComponent("$param");');
+                   String str = '${readController.bookId},${readController.chapterId},${UserStore.to.token}';
+                   controller.evaluateJavascript(source: 'callbackInFlutterComponent("$str");');
 
                    // 添加单击事件
                    controller.evaluateJavascript(source: '''
@@ -205,6 +210,7 @@ class _ReadPageState extends State<ReadPage> {
            ),
          ),
         ),
+      ),
     );
 
   }

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,7 +10,12 @@ class UserCoinPage extends StatefulWidget {
 class _UserCoinPageState extends State<UserCoinPage> {
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<UserCoinController>(
+    return WillPopScope(
+      onWillPop: () async {
+        context.pop(true);
+        return false;
+      },
+      child: GetBuilder<UserCoinController>(
         init: UserCoinController(),
         builder: (controller) => Scaffold(
           appBar: CustomAppBar(
@@ -61,6 +66,7 @@ class _UserCoinPageState extends State<UserCoinPage> {
             ),
           ),
         ),
+      ),
     );
   }
 }