Merge branch 'remove_uniapp' into new_revision_app

lib/settlement/settlement.dart

@@ -383,14 +383,14 @@ class _Settlement extends State<Settlement> {
 
   ///小程序下单
   queryPlaceOrderFirst() async {
-    for (int i = 0; i < settleOrderInfo.orderProductList.length; i++) {
+    // for (int i = 0; i < settleOrderInfo.orderProductList.length; i++) {
-      settleOrderInfo.orderProductList.forEach((element1) {
+    //   settleOrderInfo.orderProductList.forEach((element1) {
-        if (settleOrderInfo.orderProductList[i].productId ==
+    //     if (settleOrderInfo.orderProductList[i].productId ==
-            element1.productId) {
+    //         element1.productId) {
-          settleOrderInfo.orderProductList[i].skuId = element1.skuId;
+    //       settleOrderInfo.orderProductList[i].skuId = element1.skuId;
-        }
+    //     }
-      });
+    //   });
-    }
+    // }
 
     placeOrderFirst = PlaceOrderFirst();
     placeOrderFirst.cartNum = settleOrderInfo.orderNum;

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"
@@ -105,6 +105,8 @@ flutter:
 
   assets:
     - assets/image/
+    - assets/image/2x/
+    - assets/image/3x/
     - assets/map_style/
     - assets/riv/
     - assets/svg/