safety

lib/mine/mine_view/mine_view.dart

@@ -23,7 +23,6 @@ class MineView extends StatefulWidget {
 }
 
 class _MineView extends State<MineView> {
-
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -91,7 +90,23 @@ class _MineView extends State<MineView> {
             );
           });
     } else if (await Permission.camera.isGranted) {
-      Navigator.of(context).pushNamed('/router/qr_scan');
+      ///http://pos.app.gznl.top/placeorder/?tableId=1315903669597634560&tenantCode=1166&shopId=1300372027722432512
+      var result = await Navigator.of(context).pushNamed('/router/qr_scan');
+      Uri uri = Uri.parse(result);
+      String tableId = uri.queryParameters["tableId"];
+      String tenantCode = uri.queryParameters["tenantCode"];
+      String shopId = uri.queryParameters["shopId"];
+      if (tableId != null && tableId != "" && tenantCode != null && tenantCode != "" && shopId != null && shopId != "") {
+        Navigator.of(context).pushNamed(
+          '/router/store_order',
+          arguments: {
+            "id": shopId,
+            "tenant": tenantCode,
+            "storeName": "",
+            "tableId": int.tryParse(tableId),
+          },
+        );
+      }
     } else {
       await Permission.camera.request();
     }
@@ -145,13 +160,16 @@ class _MineView extends State<MineView> {
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   widget.userInfo == null
-                      ? Text(
+                      ? InkWell(
+                          child: Text(
                             S.of(context).denglu,
                             style: TextStyle(
                               fontSize: 16.sp,
                               fontWeight: MyFontWeight.medium,
                               color: Color(0xFF353535),
                             ),
+                          ),
+                          onTap: widget.toUserInfo,
                         )
                       : Row(
                           children: [

lib/mine/vip_detail_page.dart

@@ -7,6 +7,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/product.dart';
 import 'package:huixiang/retrofit/data/vip_card.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/store/scan.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/utils/location.dart';
 import 'package:huixiang/utils/painter_bg.dart';
@@ -432,8 +433,25 @@ class _VipDetailPage extends State<VipDetailPage> {
               ),
               GestureDetector(
                 onTap: () {
-                  Navigator.of(context).pushNamed('/router/union_detail_page',
-                      arguments: {"id": store.id});
+                  // Navigator.of(context).pushNamed('/router/union_detail_page',
+                  //     arguments: {"id": store.id});
+                  if(store.posType.code == "NORMALSTORE") {
+                    Scan.toScan(
+                      context,
+                      store.id,
+                      store.tenantCode,
+                      store.storeName,
+                    );
+                  } else {
+                    Navigator.of(context).pushNamed(
+                      '/router/store_order',
+                      arguments: {
+                        "id": store.id,
+                        "tenant": store.tenantCode,
+                        "storeName": store.storeName
+                      },
+                    );
+                  }
                 },
                 child: Text(
                   S.of(context).chakan,

lib/order/order_history_page.dart

@@ -11,6 +11,7 @@ import 'package:huixiang/retrofit/data/page.dart';
 import 'package:huixiang/retrofit/data/product.dart';
 import 'package:huixiang/retrofit/min_api.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/store/scan.dart';
 import 'package:huixiang/utils/status_utils.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
@@ -442,11 +443,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                             orderInfo.refundStatus,
                             orderInfo.dayFlowCode, (type) {
                             if (type == 0) {
-                              String storeId = (orderInfo != null &&
-                                      orderInfo.storeVO != null)
-                                  ? (orderInfo.storeVO.id ?? "")
-                                  : "";
-                              aginOrder(storeId);
+                              aginOrder(orderInfo);
                             } else if (type == 1) {
                               SmartDialog.show(
                                   widget: Tips(
@@ -539,12 +536,34 @@ class _OrderHistoryList extends State<OrderHistoryList>
     }
   }
 
-  aginOrder(storeId) {
+  aginOrder(OrderInfo orderInfo) {
+    // Navigator.of(context).pushNamed(
+    //   '/router/union_detail_page',
+    //   arguments: {"id": storeId},
+    // );
+    // String storeId = (orderInfo != null &&
+    //     orderInfo.storeVO != null)
+    //     ? (orderInfo.storeVO.id ?? "")
+    //     : "";
+
+    if(orderInfo.storeVO.posType.code == "NORMALSTORE") {
+      Scan.toScan(
+        context,
+        orderInfo.storeVO.id,
+        orderInfo.tenantCode,
+        orderInfo.storeVO.storeName,
+      );
+    } else {
       Navigator.of(context).pushNamed(
-      '/router/union_detail_page',
-      arguments: {"id": storeId},
+        '/router/store_order',
+        arguments: {
+          "id": orderInfo.storeVO.id,
+          "tenant": orderInfo.tenantCode,
+          "storeName": orderInfo.storeVO.storeName
+        },
       );
     }
+  }
 
   String totalPrice(orderInfo) {
     if (orderInfo == null) return "";

lib/order/order_view/order_address.dart

@@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/order_info.dart';
+import 'package:huixiang/store/scan.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/border_text.dart';
 import 'package:huixiang/view_widget/round_button.dart';
@@ -258,6 +259,25 @@ class _OrderAddress extends State<OrderAddress> {
   aginOrder(storeId, storeName) {
     Navigator.of(context).pushNamed('/router/union_detail_page',
         arguments: {"id": storeId, "storeName": storeName});
+
+    if(widget.orderInfo.storeVO.posType.code == "NORMALSTORE") {
+      Scan.toScan(
+        context,
+        widget.orderInfo.storeVO.id,
+        widget.orderInfo.tenantCode,
+        widget.orderInfo.storeVO.storeName,
+      );
+    } else {
+      Navigator.of(context).pushNamed(
+        '/router/store_order',
+        arguments: {
+          "id": widget.orderInfo.storeVO.id,
+          "tenant": widget.orderInfo.tenantCode,
+          "storeName": widget.orderInfo.storeVO.storeName
+        },
+      );
+    }
+
   }
 
   // carryOnPay() async {

lib/store/scan.dart

@@ -0,0 +1,53 @@
+
+
+import 'package:flutter/cupertino.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/view_widget/request_permission.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class Scan {
+
+  static toScan(context, id, tenantCode, storeName) async {
+    if (await Permission.camera.isPermanentlyDenied) {
+      showCupertinoDialog(
+          context: context,
+          builder: (context) {
+            return RequestPermission(
+              "assets/image/icon_camera_permission_tips.png",
+              S.of(context).ninxiangjiquanxianweikaiqi,
+              S.of(context).weilekaipaizhaoxuanzhetouxiang,
+              S.of(context).kaiqiquanxian,
+                  (result) async {
+                if (result) {
+                  await openAppSettings();
+                }
+              },
+              heightRatioWithWidth: 0.82,
+            );
+          });
+    } else if (await Permission.camera.isGranted) {
+      var result = await Navigator.of(context).pushNamed('/router/qr_scan');
+
+      if (result != null && result != "") {
+        Uri uri = Uri.parse(result);
+        String table = uri.queryParameters["tableId"];
+        if (table != null && table != "") {
+          int tableId = int.tryParse(table);
+          Navigator.of(context).pushNamed(
+            '/router/store_order',
+            arguments: {
+              "id": id,
+              "tenant": tenantCode,
+              "storeName": storeName,
+              "tableId": tableId,
+            },
+          );
+        }
+      }
+    } else {
+      await Permission.camera.request();
+    }
+
+  }
+
+}

lib/store/store_order.dart

@@ -24,7 +24,6 @@ import 'package:huixiang/store/store_view/store_order_list.dart';
 import 'package:huixiang/union/union_view/union_coupon.dart';
 import 'package:huixiang/union/union_view/vip.dart';
 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_tab.dart';
 import 'package:huixiang/view_widget/receive_success.dart';
@@ -128,8 +127,10 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   ///获取父订单（火锅订单加菜前调用）
   getParentInfo() async {
-    BaseData baseData = await minService.getParentInfo("$tableId")
-        .catchError((error) {debugPrint(error);});
+    BaseData baseData =
+        await minService.getParentInfo("$tableId").catchError((error) {
+      debugPrint(error);
+    });
     if (baseData != null && baseData.isSuccess) {
       if (baseData.data != null) {
         parentId = baseData.data["id"];
@@ -160,8 +161,10 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   /// 查询店铺信息
   queryStoreInfo() async {
-    BaseData baseData = await apiService.queryStoreInfo(storeId)
-        .catchError((error) {debugPrint(error);});
+    BaseData baseData =
+        await apiService.queryStoreInfo(storeId).catchError((error) {
+      debugPrint(error);
+    });
     if (baseData != null && baseData.isSuccess) {
       storeInfo = StoreInfo.fromJson(baseData.data);
       activitys = storeInfo.informationVOPageVO.list
@@ -175,10 +178,21 @@ class _StoreOrderPage extends State<StoreOrderPage>
   }
 
   RefreshController refreshController;
+  bool dialogShowing = false;
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
+    return WillPopScope(
+      onWillPop: () async {
+        if (dialogShowing) {
+          debugPrint("ssssasdadsasdadasd");
+          SmartDialog.dismiss();
+          return false;
+        } else {
+          return true;
+        }
+      },
+      child: Stack(
         children: [
           Positioned(
             left: 0,
@@ -443,6 +457,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
             ),
           ),
         ],
+      ),
     );
   }
 
@@ -568,19 +583,34 @@ class _StoreOrderPage extends State<StoreOrderPage>
   showShoppingCart() {
     queryShopCar().then((value) {
       this.shopCarGoods = value;
-      showModalBottomSheet(
-        context: context,
-        backgroundColor: Colors.transparent,
-        builder: (context) {
-          return ShopCar(
+      // showModalBottomSheet(
+      //   context: context,
+      //   backgroundColor: Colors.transparent,
+      //   builder: (context) {
+      //     return ShopCar(
+      //       shopCartKey,
+      //       this.shopCarGoods,
+      //       clearShopCar,
+      //       toDownOrder,
+      //       shopCartAdd,
+      //       shopCartReduce,
+      //     );
+      //   },
+      // );
+      dialogShowing = true;
+      SmartDialog.show(
+        widget: ShopCar(
           shopCartKey,
           this.shopCarGoods,
           clearShopCar,
           toDownOrder,
           shopCartAdd,
           shopCartReduce,
-          );
+        ),
+        onDismiss: () {
+          dialogShowing = false;
         },
+        alignmentTemp: Alignment.bottomCenter,
       );
     });
   }
@@ -604,20 +634,20 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   ///选规格弹窗
   showStoreSelector(MiNiDetail miNiDetail, String id) async {
-    showModalBottomSheet(
-      context: context,
-      backgroundColor: Colors.transparent,
-      builder: (context) {
-        return ProductSku(
+    dialogShowing = true;
+    SmartDialog.show(
+        widget: ProductSku(
           miNiDetail,
           shopCarGoods,
           id,
           _addShopCar,
           add,
           reduce,
-        );
+        ),
+        onDismiss: () {
+          dialogShowing = false;
         },
-    );
+        alignmentTemp: Alignment.bottomCenter,);
   }
 
   ///添加购物车
@@ -687,41 +717,43 @@ class _StoreOrderPage extends State<StoreOrderPage>
   }
 
   ///购物车➕1
-  shopCartAdd(ShoppingCartSkuItemListBean cartSkuItem) async {
+  Future<ShoppingCart> shopCartAdd(
+      ShoppingCartSkuItemListBean cartSkuItem) async {
     Map<String, dynamic> shopCarTemp = shopCarGoods.toJson();
     cartSkuItem.buyNum += 1;
     shopCarTemp["shoppingCartSkuItemList"] = [cartSkuItem.toJson()];
     BaseData<List<ShoppingCart>> baseDate =
         await minService.shoppingCartSingle(shopCarTemp);
     if (baseDate.isSuccess) {
-      queryShopCar().then((value) {
-        this.shopCarGoods = value;
+      this.shopCarGoods = await queryShopCar();
+
       print("shopingCar111111: ${this.shopCarGoods.toJson()}");
       if (shopCartKey != null) {
         shopCartKey.currentState.setState(() {});
       }
       setState(() {});
-      });
     }
+    return this.shopCarGoods;
   }
 
   ///购物车➖1
-  shopCartReduce(ShoppingCartSkuItemListBean cartSkuItem) async {
+  Future<ShoppingCart> shopCartReduce(
+      ShoppingCartSkuItemListBean cartSkuItem) async {
     Map<String, dynamic> shopCarTemp = shopCarGoods.toJson();
     cartSkuItem.buyNum -= 1;
     shopCarTemp["shoppingCartSkuItemList"] = [cartSkuItem.toJson()];
     BaseData<List<ShoppingCart>> baseDate =
         await minService.shoppingCartSingle(shopCarTemp);
     if (baseDate.isSuccess) {
-      queryShopCar().then((value) {
-        this.shopCarGoods = value;
+      this.shopCarGoods = await queryShopCar();
+
       print("shopingCar111111: ${this.shopCarGoods.toJson()}");
       if (shopCartKey != null) {
         shopCartKey.currentState.setState(() {});
       }
       setState(() {});
-      });
     }
+    return this.shopCarGoods;
   }
 
   ///商品➕1

lib/store/store_view/product_sku.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/retrofit/data/miNiDetail.dart';
@@ -59,7 +60,6 @@ class _ProductSku extends State<ProductSku> {
     if (shopSkuIndex >= 0) {
       count = widget.shopCarGoods.shoppingCartSkuItemList[shopSkuIndex].buyNum;
     }
-
   }
 
   bool skuY(ProductSkuVOListBean productSku, selectSkus) {
@@ -76,7 +76,13 @@ class _ProductSku extends State<ProductSku> {
 
   @override
   Widget build(BuildContext context) {
-    return StatefulBuilder(builder: (context1, state) {
+    return WillPopScope(
+      onWillPop: () async {
+        debugPrint("ssssasdadsasdadasd");
+        SmartDialog.dismiss();
+        return true;
+      },
+      child: StatefulBuilder(builder: (context1, state) {
         return Container(
           alignment: Alignment.topCenter,
           padding: EdgeInsets.only(
@@ -84,6 +90,7 @@ class _ProductSku extends State<ProductSku> {
             left: 16,
             right: 16,
           ),
+          height: MediaQuery.of(context).size.height / 3 * 2,
           width: double.infinity,
           decoration: BoxDecoration(
             color: Color(0xFFFAFAFA),
@@ -159,7 +166,8 @@ class _ProductSku extends State<ProductSku> {
                   Spacer(),
                   InkWell(
                     onTap: () {
-                    Navigator.of(context).pop();
+                      // Navigator.of(context).pop();
+                      SmartDialog.dismiss();
                     },
                     child: Image.asset(
                       "assets/image/icon_order_cancel.png",
@@ -177,6 +185,7 @@ class _ProductSku extends State<ProductSku> {
                   itemCount: widget.miNiDetail.attrList.length,
                   scrollDirection: Axis.vertical,
                   physics: BouncingScrollPhysics(),
+                  padding: EdgeInsets.zero,
                   itemBuilder: (context, position) {
                     return attrItem(
                           (index) {
@@ -261,6 +270,8 @@ class _ProductSku extends State<ProductSku> {
                 backgroup: Color(0xFF32A060),
                 fontSize: 16.sp,
                 callback: () {
+                  // Navigator.of(context).pop();
+                  SmartDialog.dismiss();
                   widget.addShopCar(widget.miNiDetail, selectSkus, 1);
                 },
               ),
@@ -270,7 +281,8 @@ class _ProductSku extends State<ProductSku> {
             ],
           ),
         );
-    });
+      }),
+    );
   }
 
   Widget attrItem(Function fc, AttrListBean attrListBean, position) {
@@ -297,6 +309,7 @@ class _ProductSku extends State<ProductSku> {
     return GridView.builder(
       itemCount: arrays.length,
       shrinkWrap: true,
+      padding: EdgeInsets.zero,
       physics: NeverScrollableScrollPhysics(),
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         //一行的Widget数量

lib/store/store_view/shop_car.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/shoppingCart.dart';
 import 'package:huixiang/store/store_view/shop_goods.dart';
@@ -32,10 +33,15 @@ class ShopCar extends StatefulWidget {
 }
 
 class _ShopCar extends State<ShopCar> {
-
   @override
   Widget build(BuildContext context) {
-    return StatefulBuilder(
+    return WillPopScope(
+      onWillPop: () async {
+        debugPrint("ssssasdadsasdadasd");
+        SmartDialog.dismiss();
+        return true;
+      },
+      child: StatefulBuilder(
         builder: (context1, state) {
           return Container(
             alignment: Alignment.topCenter,
@@ -105,16 +111,20 @@ class _ShopCar extends State<ShopCar> {
                             physics: BouncingScrollPhysics(),
                             itemBuilder: (context, position) {
                               return ShopGoods(
-                              (ShoppingCartSkuItemListBean cart) {
-                                widget.shopCartAdd(cart);
+                                (ShoppingCartSkuItemListBean cart) async {
+                                  widget.shopingCar =
+                                      await widget.shopCartAdd(cart);
+                                  setState(() {});
                                 },
-                              (ShoppingCartSkuItemListBean cart) {
-                                widget.shopCartReduce(cart);
+                                (ShoppingCartSkuItemListBean cart) async {
+                                  widget.shopingCar =
+                                      await widget.shopCartReduce(cart);
+                                  setState(() {});
                                 },
                                 count: widget.shopingCar
                                     .shoppingCartSkuItemList[position].buyNum,
-                              shoppingCartSkuItemListBean:
-                              widget.shopingCar.shoppingCartSkuItemList[position],
+                                shoppingCartSkuItemListBean: widget.shopingCar
+                                    .shoppingCartSkuItemList[position],
                                 queryMiNiDetail: widget.queryMiNiDetail,
                               );
                             },
@@ -188,7 +198,8 @@ class _ShopCar extends State<ShopCar> {
                               children: [
                                 InkWell(
                                   onTap: () {
-                                  Navigator.of(context).pop();
+                                    // Navigator.of(context).pop();
+                                    SmartDialog.dismiss();
                                   },
                                   child: Image.asset(
                                     "assets/image/shopp.png",
@@ -209,8 +220,8 @@ class _ShopCar extends State<ShopCar> {
                                     fontSize: 12.sp,
                                     radius: 100,
                                     callback: () {
-                                    Navigator.of(context)
-                                        .pushNamed('/router/test_page');
+                                      // Navigator.of(context)
+                                      //     .pushNamed('/router/test_page');
                                     },
                                   ),
                                 ),
@@ -227,12 +238,16 @@ class _ShopCar extends State<ShopCar> {
             ),
           );
         },
+      ),
     );
   }
 
   int itemCount() {
-    if (widget.shopingCar == null || widget.shopingCar.shoppingCartSkuItemList == null || widget.shopingCar.shoppingCartSkuItemList.length == 0) return 0;
-    int index = widget.shopingCar.shoppingCartSkuItemList.indexWhere((element) => element.buyNum == 0);
+    if (widget.shopingCar == null ||
+        widget.shopingCar.shoppingCartSkuItemList == null ||
+        widget.shopingCar.shoppingCartSkuItemList.length == 0) return 0;
+    int index = widget.shopingCar.shoppingCartSkuItemList
+        .indexWhere((element) => element.buyNum == 0);
     if (index >= 0) {
       widget.shopingCar.shoppingCartSkuItemList.removeAt(index);
     }

lib/store/store_view/store_order_list.dart

@@ -1,4 +1,3 @@
-import 'package:ai_decimal_accuracy/ai_decimal_accuracy.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/retrofit/data/activity.dart';
@@ -11,9 +10,7 @@ import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/store/store_view/shop_goods.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:huixiang/view_widget/classic_header.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';
 
 class StoreOrderListPage extends StatefulWidget {
@@ -64,6 +61,7 @@ class _StoreOrderListPage extends State<StoreOrderListPage> {
       context: context,
       token: minToken,
       tenant: tenant,
+      storeId: widget.arguments["id"],
     );
 
     BaseData<List<FindMiNiGroupList>> baseData =

lib/union/union_page.dart

@@ -14,6 +14,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/store.dart';
 import 'package:huixiang/retrofit/data/store_type.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/store/scan.dart';
 import 'package:huixiang/utils/event_type.dart';
 import 'package:huixiang/utils/location.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
@@ -272,10 +273,15 @@ class _UnionPage extends State<UnionPage>
             ),
             physics: NeverScrollableScrollPhysics(),
             itemBuilder: (context, position) {
-              return GestureDetector(
+              return InkWell(
                 onTap: () {
                   if (storeList[position].posType.code == "NORMALSTORE") {
-                    toScan(storeList[position]);
+                    Scan.toScan(
+                      context,
+                      storeList[position].id,
+                      storeList[position].tenantCode,
+                      storeList[position].storeName,
+                    );
                   } else {
                     Navigator.of(context).pushNamed(
                       '/router/store_order',
@@ -301,58 +307,6 @@ class _UnionPage extends State<UnionPage>
     _mapController = controller;
   }
 
-  toScan(Store store) async {
-    // Navigator.of(context).pushNamed(
-    //   '/router/store_order',
-    //   arguments: {
-    //     "id": store.id,
-    //     "tenant": store.tenantCode,
-    //     "storeName": store.storeName,
-    //     "tableId": 1315903669597634560,
-    //   },
-    // );
-
-    if (await Permission.camera.isPermanentlyDenied) {
-      showCupertinoDialog(
-          context: context,
-          builder: (context) {
-            return RequestPermission(
-              "assets/image/icon_camera_permission_tips.png",
-              S.of(context).ninxiangjiquanxianweikaiqi,
-              S.of(context).weilekaipaizhaoxuanzhetouxiang,
-              S.of(context).kaiqiquanxian,
-                  (result) async {
-                if (result) {
-                  await openAppSettings();
-                }
-              },
-              heightRatioWithWidth: 0.82,
-            );
-          });
-    } else if (await Permission.camera.isGranted) {
-      var result = await Navigator.of(context).pushNamed('/router/qr_scan');
-
-      if (result != null && result != "") {
-        Uri uri = Uri.parse(result);
-        String table = uri.queryParameters["tableId"];
-        if (table != null && table != "") {
-          int tableId = int.tryParse(table);
-          Navigator.of(context).pushNamed(
-            '/router/store_order',
-            arguments: {
-              "id": store.id,
-              "tenant": store.tenantCode,
-              "storeName": store.storeName,
-              "tableId": tableId,
-            },
-          );
-        }
-      }
-    } else {
-      await Permission.camera.request();
-    }
-  }
-
   Widget buildSearchItem() {
     return Container(
       height: 36.h,

lib/view_widget/selector_store_dialog.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/store.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/store/scan.dart';
 import 'package:huixiang/view_widget/border_text.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/round_button.dart';
@@ -101,9 +102,24 @@ class _SelectorStoreWidget extends State<SelectorStoreWidget> {
               ),
               InkWell(
                 onTap: () {
-                  Navigator.of(context).popAndPushNamed(
-                      '/router/union_detail_page',
-                      arguments: {"id": widget.stores[selectIndex].id});
+                  if(widget.stores[selectIndex].posType.code == "NORMALSTORE") {
+                    Scan.toScan(
+                      context,
+                      widget.stores[selectIndex].id,
+                      widget.stores[selectIndex].tenantCode,
+                      widget.stores[selectIndex].storeName,
+                    );
+                  } else {
+                    Navigator.of(context).pushNamed(
+                      '/router/store_order',
+                      arguments: {
+                        "id": widget.stores[selectIndex].id,
+                        "tenant": widget.stores[selectIndex].tenantCode,
+                        "storeName": widget.stores[selectIndex].storeName
+                      },
+                    );
+                  }
+
                 },
                 child: RoundButton(
                   text: S.of(context).queding,
@@ -117,9 +133,9 @@ class _SelectorStoreWidget extends State<SelectorStoreWidget> {
                     horizontal: 42.w,
                   ),
                 ),
-              )
+              ),
             ],
-          )
+          ),
         ],
       ),
     );

lib/web/web_view/web_header.dart

@@ -61,13 +61,26 @@ class _WebHeader extends State<WebHeader> {
                         widget.arguments["source"] == widget.activity.storeId) {
                       Navigator.of(context).pop();
                     } else {
-                      Navigator.of(context).pushNamed(
-                        '/router/union_detail_page',
-                        arguments: {
-                          "id": widget.activity.storeId,
-                          "source": widget.arguments["activityId"]
-                        },
-                      );
+                      // Navigator.of(context).pushNamed(
+                      //   '/router/union_detail_page',
+                      //   arguments: {
+                      //     "id": widget.activity.storeId,
+                      //     "source": widget.arguments["activityId"]
+                      //   },
+                      // );
+                      ///TODO: 进入店铺
+                      // if(widget.stores[selectIndex].posType.code == "NORMALSTORE") {
+                      //   toScan(widget.stores[selectIndex]);
+                      // } else {
+                      //   Navigator.of(context).pushNamed(
+                      //     '/router/store_order',
+                      //     arguments: {
+                      //       "id": widget.activity.storeId,
+                      //       "tenant": widget.stores[selectIndex].tenantCode,
+                      //       "storeName": widget.activity.storeName
+                      //     },
+                      //   );
+                      // }
                     }
                   }
                 },