From c94ea72f2d3e6ff8736c5fb7d383423ed0d52f0a Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Fri, 21 Oct 2022 09:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/home/guide_page.dart                 |  2 +-
 lib/retrofit/data/vip_card_home.dart     | 10 +++++++++-
 lib/settlement/settlement.dart           |  6 +++---
 lib/vip/vip_view/vip_goods_discount.dart | 13 ++++++++-----
 pubspec.yaml                             |  2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/home/guide_page.dart b/lib/home/guide_page.dart
index 9f367238..59d39ead 100644
--- a/lib/home/guide_page.dart
+++ b/lib/home/guide_page.dart
@@ -24,7 +24,7 @@ class _GuidePage extends State<GuidePage> {
   @override
   void initState() {
   super.initState();
-  if(Platform.isAndroid&&!ExamineInstance.instance.isExamine)
+  if(Platform.isAndroid)
   isLogin();
   }
 
diff --git a/lib/retrofit/data/vip_card_home.dart b/lib/retrofit/data/vip_card_home.dart
index 8f2f02c8..949d39a4 100644
--- a/lib/retrofit/data/vip_card_home.dart
+++ b/lib/retrofit/data/vip_card_home.dart
@@ -153,7 +153,8 @@ class ProductVips {
       String info,
       num buyCount,
       num sellCountLimit,
-      String vipDiscount,}){
+      String vipDiscount,
+    String tenantCode}){
     _id = id;
     _createTime = createTime;
     _createUser = createUser;
@@ -193,6 +194,7 @@ class ProductVips {
     _buyCount = buyCount;
     _sellCountLimit = sellCountLimit;
     _vipDiscount = vipDiscount;
+    _tenantCode = tenantCode;
 }
 
   ProductVips.fromJson(dynamic json) {
@@ -235,6 +237,7 @@ class ProductVips {
     _buyCount = json['buyCount'];
     _sellCountLimit = json['sellCountLimit'];
     _vipDiscount = json['vipDiscount'];
+    _tenantCode =json['tenantCode'];
   }
   String _id;
   String _createTime;
@@ -275,6 +278,7 @@ class ProductVips {
   num _buyCount;
   num _sellCountLimit;
   String _vipDiscount;
+  String _tenantCode;
 ProductVips copyWith({  String id,
   String createTime,
   String createUser,
@@ -314,6 +318,7 @@ ProductVips copyWith({  String id,
   num buyCount,
   num sellCountLimit,
   String vipDiscount,
+  String tenantCode,
 }) => ProductVips(  id: id ?? _id,
   createTime: createTime ?? _createTime,
   createUser: createUser ?? _createUser,
@@ -353,6 +358,7 @@ ProductVips copyWith({  String id,
   buyCount: buyCount ?? _buyCount,
   sellCountLimit: sellCountLimit ?? _sellCountLimit,
   vipDiscount: vipDiscount ?? _vipDiscount,
+  tenantCode:tenantCode ?? _tenantCode,
 );
   String get id => _id;
   String get createTime => _createTime;
@@ -393,6 +399,7 @@ ProductVips copyWith({  String id,
   num get buyCount => _buyCount;
   num get sellCountLimit => _sellCountLimit;
   String get vipDiscount => _vipDiscount;
+  String get tenantCode => _tenantCode;
 
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
@@ -435,6 +442,7 @@ ProductVips copyWith({  String id,
     map['buyCount'] = _buyCount;
     map['sellCountLimit'] = _sellCountLimit;
     map['vipDiscount'] = _vipDiscount;
+    map['tenantCode'] = _tenantCode;
     return map;
   }
 
diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index da243452..68b40587 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -751,7 +751,7 @@ class _Settlement extends State<Settlement> {
                                 minOrderInfo,
                                 tableId,
                                 pageType,
-                                (coupons != "" || promotions!="") ? (useVipPriceSelect == false) :(useVipPriceSelect == true)
+                                (coupons != "" || promotions!="") ? false :useVipPriceSelect
                               ),
 
                               ///优惠券/备注/会员优惠金额
@@ -962,7 +962,7 @@ class _Settlement extends State<Settlement> {
           productSkuId ?? "",
           actProductId ?? "",
           actProductSkuId ?? "",
-          false,
+          useVipPriceSelect,
           count1,
           payChannel,
           tableId);
@@ -995,7 +995,7 @@ class _Settlement extends State<Settlement> {
         productSkuId ?? "",
         actProductId ?? "",
         actProductSkuId ?? "",
-        false,
+        useVipPriceSelect,
         count1,
         payChannel,
         tableId);
diff --git a/lib/vip/vip_view/vip_goods_discount.dart b/lib/vip/vip_view/vip_goods_discount.dart
index 8ecc94b8..668e729d 100644
--- a/lib/vip/vip_view/vip_goods_discount.dart
+++ b/lib/vip/vip_view/vip_goods_discount.dart
@@ -129,11 +129,14 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
         itemBuilder: (context, position) {
           return GestureDetector(
             onTap: () {
-              Navigator.of(context)
-                  .pushNamed('/router/shop_details_page', arguments: {
-                "id": widget?.vipCardHome?.productVips[position].id,
-                "storeId": widget?.vipCardHome?.productVips[position].storeId,
-              });
+              Navigator.of(context).pushNamed(
+                '/router/store_order',
+                arguments: {
+                  "id":widget?.vipCardHome?.productVips[position].storeId,
+                  "tenant": widget?.vipCardHome?.productVips[position].tenantCode,
+                  "storeName": widget?.vipCardHome?.productVips[position].supplierName
+                },
+              );
             },
             child: vipGoodsRecommendItem(widget.vipCardHome.productVips[position]),
           );
diff --git a/pubspec.yaml b/pubspec.yaml
index 5306629c..db2dc6e4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: 一心回乡.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 3.1.5+32
+version: 3.1.5+33
 
 environment:
   sdk: ">=2.7.0 <3.0.0"