Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map

lib/store/store_order.dart

@@ -97,7 +97,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   /// 小程序登录
   minLogin(SharedPreferences shared) async {
-    EasyLoading.show(status: S.of(context).zhengzaijiazai,maskType: EasyLoadingMaskType.black);
+    EasyLoading.show(
+        status: S.of(context).zhengzaijiazai,
+        maskType: EasyLoadingMaskType.black);
     apiService = ApiService(
       Dio(),
       context: context,
@@ -127,7 +129,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
           storeId: storeId,
         );
 
-
         queryMemberInfo();
 
         queryShopCar().then((value) {
@@ -327,7 +328,10 @@ class _StoreOrderPage extends State<StoreOrderPage>
                                               CrossAxisAlignment.start,
                                           children: [
                                             ///门店信息
-                                            StoreInfoView(storeInfo,widget.arguments["distance"],),
+                                            StoreInfoView(
+                                              storeInfo,
+                                              widget.arguments["distance"],
+                                            ),
                                             // Padding(padding:EdgeInsets.only(left: 14.w),
                                             // child: Text(
                                             //   S.of(context).diandan,
@@ -655,7 +659,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
         "shoppingCart": shopCarGoods,
         "numberOfPeople": numberOfPeople,
         "distance": widget.arguments["distance"],
-        "vipLevelName": memberVo?.memberRankVo?.rankName ??"",
+        "vipLevelName": memberVo?.memberRankVo?.rankName ?? "",
         "isVips": memberVo?.isVip ?? false,
         "subscribeParam": miNiDetail?.subscribeParam,
       },
@@ -753,7 +757,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   ///选规格
   _queryMiNiDetail(String id, int count) async {
-    EasyLoading.show(status: S.current.zhengzaijiazai,maskType: EasyLoadingMaskType.black);
+    EasyLoading.show(
+        status: S.current.zhengzaijiazai, maskType: EasyLoadingMaskType.black);
     if (count < 0) {
       shopCarGoods.shoppingCartSkuItemList.forEach((element) async {
         if (element.productId == id) {
@@ -1054,17 +1059,17 @@ class _Title extends State<Title> {
       double maxScrollExtent = widget.controller.position.maxScrollExtent;
       double alphaHeight = (kToolbarHeight) / 2;
       double alphaProgress = maxScrollExtent - widget.controller.offset;
-      double alphatemp = 0;
+      double alphaTemp = 0;
       if (alphaProgress <= 1) {
-        alphatemp = 1;
+        alphaTemp = 1;
       } else if (alphaProgress <= alphaHeight) {
-        alphatemp =
+        alphaTemp =
             (((alphaHeight - alphaProgress) / alphaHeight) > 0.5) ? 1 : 0;
       } else {
-        alphatemp = 0;
+        alphaTemp = 0;
       }
-      if (alpha != alphatemp && mounted) {
+      if (alpha != alphaTemp && mounted) {
-        alpha = alphatemp;
+        alpha = alphaTemp;
         print("object:  $alpha");
         widget.scrollChange(alpha);
         setState(() {});
@@ -1076,10 +1081,12 @@ class _Title extends State<Title> {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.only(bottom: 38.h),
-      child: Text(
+      child: alpha == 0
+          ? null
+          : Text(
               widget.title ?? "",
               style: TextStyle(
-          color: Colors.black.withOpacity(alpha),
+                color: Colors.black,
                 fontWeight: FontWeight.bold,
                 fontSize: 18.sp,
               ),