From 1146bffbf468c3dae64cf6bd673435adf4f75bfe Mon Sep 17 00:00:00 2001 From: fmk Date: Tue, 21 Jan 2025 15:08:02 +0800 Subject: [PATCH] =?UTF-8?q?ui=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile | 2 +- ios/Podfile.lock | 26 +- lib/store/store_order.dart | 4 +- lib/store/store_view/store_info.dart | 344 ++++++++++++++------------- 4 files changed, 191 insertions(+), 185 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 77f977f7..3f4127b2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -36,7 +36,7 @@ target 'Runner' do inherit! :search_paths end end - +cc post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 24ed3728..761542aa 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -29,7 +29,7 @@ PODS: - fluwx/pay (0.0.1): - Flutter - WechatOpenSDK-XCFramework (~> 2.0.4) - - FlyVerifyCSDK (0.0.7) + - FlyVerifyCSDK (1.0.0) - geolocator_apple (1.2.0): - Flutter - image_gallery_saver (2.0.2): @@ -38,7 +38,7 @@ PODS: - AFNetworking - Flutter - SDWebImage - - ZLPhotoBrowser (= 4.4.8.1) + - ZLPhotoBrowser (= 4.5.1) - mob_sharesdk (4.4.32): - mob_sharesdk/ShareSDK (= 4.4.32) - MOBFoundation (>= 3.2.9) @@ -59,7 +59,7 @@ PODS: - mob_sharesdk/ShareSDKUI (4.4.32): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - MOBFoundation (20241207): + - MOBFoundation (20241208): - FlyVerifyCSDK (>= 0.0.7) - number_precision (0.0.1): - Flutter @@ -100,7 +100,7 @@ PODS: - tpns_flutter_plugin (1.3.3): - Flutter - TPNS-iOS (= 1.4.0.4) - - UMCommon (7.5.0): + - UMCommon (7.5.2): - UMDevice - UMDevice (3.4.0) - umeng_common_sdk (0.0.1): @@ -117,9 +117,9 @@ PODS: - webview_flutter_wkwebview (0.0.1): - Flutter - WechatOpenSDK-XCFramework (2.0.4) - - ZLPhotoBrowser (4.4.8.1): - - ZLPhotoBrowser/Core (= 4.4.8.1) - - ZLPhotoBrowser/Core (4.4.8.1) + - ZLPhotoBrowser (4.5.1): + - ZLPhotoBrowser/Core (= 4.5.1) + - ZLPhotoBrowser/Core (4.5.1) DEPENDENCIES: - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) @@ -221,12 +221,12 @@ SPEC CHECKSUMS: flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619 flutter_pdfview: 32bf27bda6fd85b9dd2c09628a824df5081246cf fluwx: 49b4472b54762abde51daa0bc348ba05520016ac - FlyVerifyCSDK: a4aa51a1e9ba1823454d11b46b83db5623cc6536 + FlyVerifyCSDK: e4c9e728a77f3bac80d5c90a8bc46566ed4b15a7 geolocator_apple: 8846e3175d6357ec3d503cca7a490e724097e878 image_gallery_saver: 14711d79da40581063e8842a11acf1969d781ed7 - image_pickers: 93ce390c668849bb1219c57669fa429133af2aaa + image_pickers: 63391302003eb404129378966a52d9d7bf5d2677 mob_sharesdk: 9768622582952c81cd49d881a6b8cca5b3f15c0a - MOBFoundation: 84f823899a84b37293aef39aa65bee6dc5fe6329 + MOBFoundation: 9e6301995d8d1a9212feff041ba8e3afba4e5d75 number_precision: d2987d174c91e22f2349d495660f721fa8f961eb package_info_plus: 580e9a5f1b6ca5594e7c9ed5f92d1dfb2a66b5e1 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 @@ -235,12 +235,12 @@ SPEC CHECKSUMS: scan: 28e4f67b9b0d63ccd5c649acc3d6aaf94c0a7a81 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 - sharesdk_plugin: 20df73e80123818676e42a7d356469ae675b75f5 + sharesdk_plugin: 815d17abf9080e937b3d7cba110b9ca19d21829e sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3 tobias: f9c405df3ded93ad34539200fe3e7779cfb19081 TPNS-iOS: 38f2c743d01cd1e62cbdbb12455990a9a75fb492 tpns_flutter_plugin: 0d205d24df8b0959a3c5302c6648637665556aee - UMCommon: 9bfb19a2f40c2521901dacb579bccb0b1cdba8da + UMCommon: 72513a01ebca2dead52f2112b4d7c6196dbbe412 UMDevice: dcdf7ec167387837559d149fbc7d793d984faf82 umeng_common_sdk: 095b63e6f83b71548725a7c03a6c17b23be6674b url_launcher_ios: 694010445543906933d732453a59da0a173ae33d @@ -248,7 +248,7 @@ SPEC CHECKSUMS: wakelock_plus: fd58c82b1388f4afe3fe8aa2c856503a262a5b03 webview_flutter_wkwebview: 45a041c7831641076618876de3ba75c712860c6b WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f - ZLPhotoBrowser: 379473d376e3bee6f30f84778b2d5f9be09842e5 + ZLPhotoBrowser: 4d859a9d6462ba055d817b2235278a7b74e69eff PODFILE CHECKSUM: 18788feae6ffad35067750202db2fe99ca75c4d5 diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 5c210ac2..a227f983 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -221,7 +221,7 @@ class _StoreOrderPage extends State physics: ClampingScrollPhysics(), slivers: [ SliverAppBar( - expandedHeight: 360.h, + expandedHeight: 320.h, pinned: true, collapsedHeight: kToolbarHeight, systemOverlayStyle: SystemUiOverlayStyle.dark, @@ -278,7 +278,7 @@ class _StoreOrderPage extends State widget.arguments?["distance"], ), ), - top: 300, + bottom: 0, left: 0, right: 0, ), diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart index 2b0f0ffa..3bd7d3c5 100644 --- a/lib/store/store_view/store_info.dart +++ b/lib/store/store_view/store_info.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/data/store_info.dart'; import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/utils/constant.dart'; import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -30,150 +31,128 @@ class _StoreInfoView extends State { @override Widget build(BuildContext context) { return Container( - height: MediaQuery.of(context).size.width >= 650 ? 180.h : 166.h, padding: EdgeInsets.all(12.w), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8.w), ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Row( - children: [ - Expanded( - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded(child: Container( - alignment: Alignment.centerLeft, - child: Text( - widget.storeInfo != null - ? (widget.storeInfo!.storeName ?? "") - : "", - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 18.sp, - color: Colors.black, - fontWeight: MyFontWeight.medium, + child: IntrinsicHeight( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Row( + children: [ + Expanded( + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded(child: Container( + alignment: Alignment.centerLeft, + child: Text( + widget.storeInfo != null + ? (widget.storeInfo!.storeName ?? "") + : "", + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 18.sp, + color: Colors.black, + fontWeight: MyFontWeight.medium, + ), ), - ), - )), - // GestureDetector( - // behavior: HitTestBehavior.opaque, - // onTap: (){ - // Navigator.of(context).pushNamed('/router/store_html',arguments: {"remark":widget.storeInfo.remark}); - // }, - // child: Container( - // padding: EdgeInsets.symmetric(horizontal:8.w,vertical:3.h), - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(2), - // border: Border.all( - // color:Color(0xFFEDEDED), - // ) - // ), - // child: Row( - // children: [ - // Text( - // "店铺详情", - // style: TextStyle( - // fontWeight: MyFontWeight.regular, - // fontSize: 12.sp, - // color: Color(0xFF4C4C4C), - // ), - // ), - // Image.asset( - // "assets/image/icon_right_z.webp", - // height:12.h, - // width:12.w, - // ) - // ], - // ), - // ), - // ) - ], - ), - Row( - children: [ - if( widget.storeInfo?.perCapitaConsumption != null && ( widget.storeInfo?.perCapitaConsumption ?? "") != "0") - Padding(padding:EdgeInsets.only(right:20.w), - child: Text( - S.of(context).ren(widget.storeInfo?.perCapitaConsumption ?? ""), - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF353535), - ), - ),), - ]..addAll(itemServer(widget.storeInfo?.businessService ?? "")), - ), - Text( - S.of(context).yingyeshijian(widget.storeInfo == null - ? "" - : ((widget.storeInfo!.openStartTime?.isEmpty ?? true) && (widget.storeInfo!.openEndTime?.isEmpty ?? true)) - ? S.of(context).quantian - : "${widget.storeInfo!.openStartTime?.substring(0, widget.storeInfo!.openStartTime?.lastIndexOf(":"))} " - "- ${widget.storeInfo!.openEndTime?.substring(0, widget.storeInfo!.openEndTime?.lastIndexOf(":"))}"), - style: TextStyle( - color: Color(0xFF353535), - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, + )), + // GestureDetector( + // behavior: HitTestBehavior.opaque, + // onTap: (){ + // Navigator.of(context).pushNamed('/router/store_html',arguments: {"remark":widget.storeInfo.remark}); + // }, + // child: Container( + // padding: EdgeInsets.symmetric(horizontal:8.w,vertical:3.h), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(2), + // border: Border.all( + // color:Color(0xFFEDEDED), + // ) + // ), + // child: Row( + // children: [ + // Text( + // "店铺详情", + // style: TextStyle( + // fontWeight: MyFontWeight.regular, + // fontSize: 12.sp, + // color: Color(0xFF4C4C4C), + // ), + // ), + // Image.asset( + // "assets/image/icon_right_z.webp", + // height:12.h, + // width:12.w, + // ) + // ], + // ), + // ), + // ) + ], ), - ), - ], - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, + 8.d, + Row( + children: [ + if( widget.storeInfo?.perCapitaConsumption != null && ( widget.storeInfo?.perCapitaConsumption ?? "") != "0") + Padding(padding:EdgeInsets.only(right:20.w), + child: Text( + S.of(context).ren(widget.storeInfo?.perCapitaConsumption ?? ""), + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFF353535), + ), + ),), + ]..addAll(itemServer(widget.storeInfo?.businessService ?? "")), + ), + 8.d, + Text( + S.of(context).yingyeshijian(widget.storeInfo == null + ? "" + : ((widget.storeInfo!.openStartTime?.isEmpty ?? true) && (widget.storeInfo!.openEndTime?.isEmpty ?? true)) + ? S.of(context).quantian + : "${widget.storeInfo!.openStartTime?.substring(0, widget.storeInfo!.openStartTime?.lastIndexOf(":"))} " + "- ${widget.storeInfo!.openEndTime?.substring(0, widget.storeInfo!.openEndTime?.lastIndexOf(":"))}"), + style: TextStyle( + color: Color(0xFF353535), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ], + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + ), ), - ), - MImage( - widget.storeInfo?.logo ?? "", - width: 70, - height: 70, - fit: BoxFit.cover, - errorSrc: "assets/image/default_1.webp", - fadeSrc: "assets/image/default_1.webp", - ), - ], - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - ), - flex: 1, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - // Navigator.of(context).pushNamed( - // '/router/location_map', - // arguments: { - // "lat": widget.storeInfo?.latitude, - // "lng": widget.storeInfo?.longitude, - // "storeInfo":widget.storeInfo, - // "distance":widget.distance - // }, - // ); - showMapSelect(); - }, - child: Container( - color: Colors.transparent, - padding:EdgeInsets.only(right: 8.w,bottom: 8.h) , - child: Image.asset( - "assets/image/icon_union_location.webp", - width: 20, - height: 20, + MImage( + widget.storeInfo?.logo ?? "", + width: 70, + height: 70, + fit: BoxFit.cover, + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", ), - ), + ], + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, ), - Expanded( - child: GestureDetector( + flex: 1, + ), + 10.d, + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { // Navigator.of(context).pushNamed( @@ -186,45 +165,71 @@ class _StoreInfoView extends State { // }, // ); showMapSelect(); - }, - child:Padding( - padding: EdgeInsets.only(bottom: 8.h,), - child: Text( - "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo!.address : ""}", - maxLines: 2, - textAlign: TextAlign.justify, - style: TextStyle( - color: Color(0xFF353535), - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, - ), + }, + child: Container( + color: Colors.transparent, + padding:EdgeInsets.only(right: 8.w,bottom: 8.h) , + child: Image.asset( + "assets/image/icon_union_location.webp", + width: 20, + height: 20, ), ), ), - ), - if(widget.storeInfo?.tel?.isNotEmpty ?? false) - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - showCallMobile(); - }, - child: Container( - padding:EdgeInsets.only(left: 16.w,right: 8.w,bottom: 8.h) , - child: Image.asset( - "assets/image/icon_union_call.webp", - width: 24, - height: 24, + Expanded( + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + // Navigator.of(context).pushNamed( + // '/router/location_map', + // arguments: { + // "lat": widget.storeInfo?.latitude, + // "lng": widget.storeInfo?.longitude, + // "storeInfo":widget.storeInfo, + // "distance":widget.distance + // }, + // ); + showMapSelect(); + }, + child:Padding( + padding: EdgeInsets.only(bottom: 8.h,), + child: Text( + "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo!.address : ""}", + maxLines: 2, + textAlign: TextAlign.justify, + style: TextStyle( + color: Color(0xFF353535), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ), ), ), - ), - ], - ), - Container( - width: double.infinity, - height: 1, - color: Color(0xFFF4F5F2), - ), - ], + if(widget.storeInfo?.tel?.isNotEmpty ?? false) + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + showCallMobile(); + }, + child: Container( + padding:EdgeInsets.only(left: 16.w,right: 8.w,bottom: 8.h) , + child: Image.asset( + "assets/image/icon_union_call.webp", + width: 24, + height: 24, + ), + ), + ), + ], + ), + Container( + width: double.infinity, + height: 1, + color: Color(0xFFF4F5F2), + ), + ], + ), ), ); } @@ -255,7 +260,8 @@ class _StoreInfoView extends State { isDestructiveAction: true, ), ); - }); + }, + ); } callMobile(mobile) async {