diff --git a/lib/models/scan_result_model.dart b/lib/models/scan_result_model.dart index 05e37fb..105641a 100644 --- a/lib/models/scan_result_model.dart +++ b/lib/models/scan_result_model.dart @@ -12,6 +12,7 @@ class ScanResultModel { final num commission; final String goodsImg; final num inventory; + final int goodsID; ScanResultModel( this.skuID, @@ -24,6 +25,7 @@ class ScanResultModel { this.commission, this.goodsImg, this.inventory, + this.goodsID, ); Map toMap() { @@ -38,6 +40,7 @@ class ScanResultModel { 'commission': commission, 'goodsImg': goodsImg, 'inventory': inventory, + 'goodsID': goodsID, }; } @@ -53,6 +56,7 @@ class ScanResultModel { map['commission'], map['goodsImg'], map['inventory'], + map['goodsID'], ); } @@ -63,7 +67,7 @@ class ScanResultModel { @override String toString() { - return 'ScanResultModel(skuID: $skuID, skuCode: $skuCode, skuName: $skuName, brandName: $brandName, brandImg: $brandImg, goodsName: $goodsName, discount: $discount, commission: $commission, goodsImg: $goodsImg, inventory: $inventory)'; + return 'ScanResultModel(skuID: $skuID, skuCode: $skuCode, skuName: $skuName, brandName: $brandName, brandImg: $brandImg, goodsName: $goodsName, discount: $discount, commission: $commission, goodsImg: $goodsImg, inventory: $inventory, goodsID: $goodsID)'; } @override @@ -80,7 +84,8 @@ class ScanResultModel { other.discount == discount && other.commission == commission && other.goodsImg == goodsImg && - other.inventory == inventory; + other.inventory == inventory && + other.goodsID == goodsID; } @override @@ -94,6 +99,7 @@ class ScanResultModel { discount.hashCode ^ commission.hashCode ^ goodsImg.hashCode ^ - inventory.hashCode; + inventory.hashCode ^ + goodsID.hashCode; } } diff --git a/lib/pages/home/barcode/qr_scaner_result_page.dart b/lib/pages/home/barcode/qr_scaner_result_page.dart index b1a420c..aeff4da 100644 --- a/lib/pages/home/barcode/qr_scaner_result_page.dart +++ b/lib/pages/home/barcode/qr_scaner_result_page.dart @@ -6,15 +6,14 @@ import 'package:recook/manager/user_manager.dart'; import 'package:recook/models/base_model.dart'; import 'package:recook/models/order_preview_model.dart'; import 'package:recook/models/scan_result_model.dart'; +import 'package:recook/pages/home/classify/commodity_detail_page.dart'; import 'package:recook/pages/home/classify/mvp/goods_detail_model_impl.dart'; import 'package:recook/pages/home/classify/order_preview_page.dart'; -import 'package:recook/pages/home/classify/sku_choose_page.dart'; import 'package:recook/pages/home/widget/plus_minus_view.dart'; import 'package:recook/pages/shopping_cart/mvp/shopping_cart_model_impl.dart'; import 'package:recook/utils/app_router.dart'; import 'package:recook/widgets/custom_image_button.dart'; import 'package:recook/widgets/progress/re_toast.dart'; -import 'package:recook/widgets/progress/sc_dialog.dart'; import 'package:recook/widgets/recook/recook_scaffold.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:recook/widgets/toast.dart'; @@ -181,7 +180,12 @@ class _QRScarerResultPageState extends State { .withRounded(value: 10.w) .width(double.infinity) .color(Colors.white) - .make(); + .make() + .onInkTap(() { + Get.to(() => CommodityDetailPage(arguments: {"goodsID": widget.model.goodsID},)); + // AppRouter.push(context, RouteName.COMMODITY_PAGE, + // arguments: CommodityDetailPage.setArguments(widget.model.goodsId)); + }); } Widget emptyWidget() {