选择规格样式更改

lib/integral/integral_detailed_page.dart

@@ -199,6 +199,7 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
           ];
         },
         body: Container(
+          color: Colors.white,
           child: SmartRefresher(
             controller: refreshController,
             enablePullDown: true,

lib/order/order_view/order_status.dart

@@ -90,6 +90,7 @@ class _OrderStatus extends State<OrderStatus> {
                               fontSize: 15.sp,
                             ),
                           ),
+                          if(widget.payStatus != 0)
                           Image.asset(
                             statusPicture(widget.title),
                             height: 66.h,

lib/settlement/settlement.dart

@@ -318,7 +318,9 @@ class _Settlement extends State<Settlement> {
       } else {
         SmartDialog.show(
             widget: Tips(
-          () {},
+          () {
+            toOrderDetails(placeOrderFirst.id);
+          },
           text: "${baseData.msg}",
         ));
       }

lib/store/store_order.dart

@@ -637,18 +637,19 @@ class _StoreOrderPage extends State<StoreOrderPage>
   }
 
   ///选规格
-  _queryMiNiDetail(String id) async {
+  _queryMiNiDetail(String id,int count) async {
     EasyLoading.show(status: S.current.zhengzaijiazai);
     BaseData<MiNiDetail> baseData = await minService.miNiDetail(id);
     if (baseData != null && baseData.isSuccess) {
-      showStoreSelector(baseData.data, id);
+      showStoreSelector(baseData.data, id,count);
     }
   }
 
   ///选规格弹窗
-  showStoreSelector(MiNiDetail miNiDetail, String id) async {
-    if (miNiDetail.attrList != null && miNiDetail.attrList.length == 1) {
-      _addShopCar(miNiDetail, [], 1);
+  showStoreSelector(MiNiDetail miNiDetail, String id,int count) async {
+    if (miNiDetail.attrList != null && miNiDetail.attrList.length == 1
+        && miNiDetail.attrList[0].attrValueList.length == 1) {
+      _addShopCar(miNiDetail, [], count);
     } else {
       EasyLoading.dismiss();
       dialogShowing = true;

lib/store/store_view/shop_car.dart

@@ -8,7 +8,7 @@ import 'package:huixiang/view_widget/round_button.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class ShopCar extends StatefulWidget {
-  final Function(String id) queryMiNiDetail;
+  final Function(String id,int count) queryMiNiDetail;
   final Function() clearShopCar;
   final Function() toDownOrder;
   final Function(ShoppingCartSkuItemListBean cart) shopCartAdd;

lib/store/store_view/shop_goods.dart

@@ -8,7 +8,7 @@ import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 
 class ShopGoods extends StatefulWidget {
-  final Function(String id) queryMiNiDetail;
+  final Function(String id,int count) queryMiNiDetail;
   final Function(ShoppingCartSkuItemListBean shoppingCartSkuItemListBean) add;
   final Function(ShoppingCartSkuItemListBean shoppingCartSkuItemListBean)
       reduce;
@@ -131,7 +131,7 @@ class _ShopGoods extends State<ShopGoods> {
                       ],
                     ),
                     Spacer(),
-                    if (!widget.isShopCart)
+                    if (!widget.isShopCart && (widget.productListBean?.attrStyle??0) == 1)
                       Stack(
                         children: [
                           Container(
@@ -150,7 +150,7 @@ class _ShopGoods extends State<ShopGoods> {
                                   widget.productListBean != null
                                       ? widget.productListBean.id
                                       : widget.shoppingCartSkuItemListBean
-                                          .productId,
+                                          .productId,0
                                 );
                               },
                             ),
@@ -173,7 +173,7 @@ class _ShopGoods extends State<ShopGoods> {
                           ),
                         ],
                       ),
-                    if (widget.isShopCart)
+                    if (widget.isShopCart || (widget.productListBean?.attrStyle??0) == 0)
                       InkWell(
                         onTap: () {
                           widget.reduce(widget.shoppingCartSkuItemListBean);
@@ -184,7 +184,7 @@ class _ShopGoods extends State<ShopGoods> {
                           height: 22,
                         ),
                       ),
-                    if (widget.isShopCart)
+                    if (widget.isShopCart || (widget.productListBean?.attrStyle??0) == 0)
                       Container(
                         width: 30,
                         alignment: Alignment.center,
@@ -197,7 +197,7 @@ class _ShopGoods extends State<ShopGoods> {
                           ),
                         ),
                       ),
-                    if (widget.isShopCart)
+                    if (widget.isShopCart || (widget.productListBean?.attrStyle??0) == 0)
                       InkWell(
                         onTap: () {
                           widget.add(widget.shoppingCartSkuItemListBean);

lib/store/store_view/store_order_list.dart

@@ -21,7 +21,7 @@ class StoreOrderListPage extends StatefulWidget {
   final ScrollController controller;
   final String minToken;
   final String tenant;
-  final Function(String id) queryMiNiDetail;
+  final Function(String id,int count) queryMiNiDetail;
 
   ShoppingCart shopCarGoods;
 
@@ -232,14 +232,14 @@ class _StoreOrderListPage extends State<StoreOrderListPage> {
     }
     return InkWell(
       onTap: () {
-        widget.queryMiNiDetail(productListBeans[position].id);
+        widget.queryMiNiDetail(productListBeans[position].id,1);
       },
       child: ShopGoods(
         (ShoppingCartSkuItemListBean shoppingCartSkuItemListBean) {
-          // widget.add(productListBeans[position].id);
+          widget.queryMiNiDetail(productListBeans[position].id,1);
         },
         (ShoppingCartSkuItemListBean shoppingCartSkuItemListBean) {
-          // widget.reduce(productListBeans[position].id);
+          widget.queryMiNiDetail(productListBeans[position].id,-1);
         },
         productListBean: productListBeans[position],
         count: count,