fix:修复商场无法回退的问题

star_lock/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart

@@ -56,7 +56,7 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
                   widget: SafeArea(
                     bottom: false,
                     child: LockMallPage(
-                      showAppBar: false,
+                      allowReturn: false,
                     ),
                   ),
                   logic: logic,

star_lock/lib/mine/mall/lockMall_logic.dart

@@ -17,7 +17,7 @@ class LockMallLogic extends BaseGetXController {
   late LockMallState state;
 
   LockMallLogic({required bool allowReturn})
-      : state = LockMallState(allowReturn: allowReturn);
+      : state = LockMallState(allowReturn: allowReturn );
 
   //获取商城跳转地址
   Future<void> getMallURLRequest() async {
@@ -35,6 +35,7 @@ class LockMallLogic extends BaseGetXController {
           },
           onPageFinished: (String url) {
             state.webProgress.value = 1.0;
+            refreshGoBack();
           },
           onWebResourceError: (WebResourceError error) {},
           onNavigationRequest: (NavigationRequest request) async {
@@ -99,12 +100,25 @@ class LockMallLogic extends BaseGetXController {
     bool canGoBack = await state.mallWebView.canGoBack();
     if (canGoBack) {
       await state.mallWebView.goBack();
-    } else {
+    } else if (state.allowReturn) {
-      if (state.allowReturn) Get.back();
+      Get.back();
     }
+    refreshGoBack();
     return false;
   }
 
+  //刷新当前路由状态
+  void refreshGoBack(){
+    //如果属于一直返回按钮，则根据是否有路由可以回退刷新
+    if(state.allowReturn){
+      return;
+    }
+    state.mallWebView.canGoBack().then((value) {
+      state.canGoBack = value;
+      update();
+    });
+  }
+
   @override
   Future<void> onReady() async {
     super.onReady();

star_lock/lib/mine/mall/lockMall_page.dart

@@ -30,36 +30,38 @@ class _LockMallPageState extends State<LockMallPage> {
     return GetBuilder<LockMallLogic>(
         init: LockMallLogic(allowReturn: widget.allowReturn),
         builder: (LockMallLogic logic) {
-          return PopScope(
+          return Scaffold(
-            onPopInvoked: logic.canGoBack,
+            resizeToAvoidBottomInset: false,
-            canPop: false,
+            backgroundColor: const Color(0xFFFFFFFF),
-            child: Scaffold(
+            appBar: widget.showAppBar
-                resizeToAvoidBottomInset: false,
+                ? TitleAppBar(
-                backgroundColor: const Color(0xFFFFFFFF),
+                    barTitle: getWebTitle(logic),
-                appBar: widget.showAppBar
+                    haveBack: logic.state.canGoBack || logic.state.allowReturn,
-                    ? TitleAppBar(
+                    backgroundColor: AppColors.mainColor,
-                        barTitle: getWebTitle(logic),
+                    backAction: () => logic.canGoBack(false),
-                        haveBack: true,
+                  )
-                        backgroundColor: AppColors.mainColor,
+                : null,
-                      )
+            body: Obx(() => Column(
-                    : null,
+                  children: <Widget>[
-                body: Obx(() => Column(
+                    PopScope(
-                      children: <Widget>[
+                      onPopInvoked: logic.canGoBack,
-                        Container(
+                      canPop: false,
-                          padding: EdgeInsets.only(bottom: 10.w),
+                      child: SizedBox(),
-                          child: LinearProgressIndicator(
+                    ),
-                            value: logic.state.webProgress.value,
+                    Container(
-                            backgroundColor: Colors.grey,
+                      padding: EdgeInsets.only(bottom: 10.w),
-                            valueColor: AlwaysStoppedAnimation<Color>(
+                      child: LinearProgressIndicator(
-                                AppColors.mainColor),
+                        value: logic.state.webProgress.value,
-                          ),
+                        backgroundColor: Colors.grey,
-                        ),
+                        valueColor:
-                        Expanded(
+                            AlwaysStoppedAnimation<Color>(AppColors.mainColor),
-                          child: WebViewWidget(
+                      ),
-                              controller: logic.state.mallWebView),
+                    ),
-                        ),
+                    Expanded(
-                      ],
+                      child: WebViewWidget(controller: logic.state.mallWebView),
-                    ))),
+                    ),
+                  ],
+                )),
           );
         });
   }

star_lock/lib/mine/mall/lockMall_state.dart

@@ -9,6 +9,7 @@ class LockMallState {
   var lockMallUrl = "".obs;
   var webProgress = 0.0.obs;
   bool allowReturn;
+  bool canGoBack = false;
   late WebViewController mallWebView = initWebViewController();
 
   //初始化webView控制器