From 8a47c0e102cf8385b89c2e73cbc8abddbb610b40 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 19 May 2022 18:50:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A6=8F=E6=A0=BC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/settlement/settlement.dart | 16 ++++++++--------
 pubspec.yaml                   |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index 215f5cfc..fa1c88e7 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -257,14 +257,14 @@ class _Settlement extends State<Settlement> {
 
   ///小程序下单
   queryPlaceOrderFirst() async {
-    for (int i = 0; i < settleOrderInfo.orderProductList.length; i++) {
-      settleOrderInfo.orderProductList.forEach((element1) {
-        if (settleOrderInfo.orderProductList[i].productId ==
-            element1.productId) {
-          settleOrderInfo.orderProductList[i].skuId = element1.skuId;
-        }
-      });
-    }
+    // for (int i = 0; i < settleOrderInfo.orderProductList.length; i++) {
+    //   settleOrderInfo.orderProductList.forEach((element1) {
+    //     if (settleOrderInfo.orderProductList[i].productId ==
+    //         element1.productId) {
+    //       settleOrderInfo.orderProductList[i].skuId = element1.skuId;
+    //     }
+    //   });
+    // }
 
     placeOrderFirst = PlaceOrderFirst();
     placeOrderFirst.cartNum = settleOrderInfo.orderNum;
diff --git a/pubspec.yaml b/pubspec.yaml
index 3b0dede4..c4196d2a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -106,6 +106,8 @@ flutter:
 
   assets:
     - assets/image/
+    - assets/image/2x/
+    - assets/image/3x/
     - assets/map_style/
     - assets/riv/
     - assets/svg/

From 44993d2c2f2c0255c243cd7ce49a2f6ca2b8c352 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 19 May 2022 19:02:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c4196d2a..551b0d6c 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: 1.0.95+3
+version: 1.0.96+4
 
 environment:
   sdk: ">=2.7.0 <3.0.0"