From 105c0a7f881fe9dc082a24933b661478b92c23a9 Mon Sep 17 00:00:00 2001 From: fmk Date: Wed, 1 Mar 2023 14:14:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/community/community_details.dart | 2 - .../community_view/class_details.dart | 5 +- lib/community/new_community_details.dart | 2 - lib/mine/recharge_page.dart | 62 +++++++++---------- lib/web/web_page.dart | 3 +- lib/web/web_view/input_comment.dart | 2 - 6 files changed, 34 insertions(+), 42 deletions(-) diff --git a/lib/community/community_details.dart b/lib/community/community_details.dart index 6c918b2f..be23c401 100644 --- a/lib/community/community_details.dart +++ b/lib/community/community_details.dart @@ -51,7 +51,6 @@ class _CommunityDetails extends State final GlobalKey inputKey = GlobalKey(); final TextEditingController commentTextController = TextEditingController(); bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -252,7 +251,6 @@ class _CommunityDetails extends State inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/community/community_view/class_details.dart b/lib/community/community_view/class_details.dart index cc60e937..e113f7ee 100644 --- a/lib/community/community_view/class_details.dart +++ b/lib/community/community_view/class_details.dart @@ -55,7 +55,6 @@ class _ClassDetails extends State with WidgetsBindingObserver { double height = 0; var isShowMore = false; bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -117,6 +116,7 @@ class _ClassDetails extends State with WidgetsBindingObserver { @override void didChangeMetrics() { WidgetsBinding.instance.addPostFrameCallback((_) { + isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; if (!mounted) return; if (MediaQuery.of(context).viewInsets.bottom == 0) { if (isKeyBoardShow) { @@ -185,7 +185,7 @@ class _ClassDetails extends State with WidgetsBindingObserver { @override Widget build(BuildContext context) { double h = MediaQuery.of(context).viewInsets.bottom; - if(h > 0 && keyboard <= 0) { + if(h > 0 && keyboard < h) { setState(() { keyboard = h; }); @@ -475,7 +475,6 @@ class _ClassDetails extends State with WidgetsBindingObserver { inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/community/new_community_details.dart b/lib/community/new_community_details.dart index 5b904034..993222af 100644 --- a/lib/community/new_community_details.dart +++ b/lib/community/new_community_details.dart @@ -57,7 +57,6 @@ class _NewCommunityDetails extends State with WidgetsBindin String commentsId; String userId; bool emojiShowing =false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -371,7 +370,6 @@ class _NewCommunityDetails extends State with WidgetsBindin inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index b511fea3..1889cb9e 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -327,37 +327,37 @@ class _RechargePage extends State { ), ), SizedBox(height:10.h), - // GestureDetector( - // onTap: () { - // setState(() { - // checkIndex = 3; - // }); - // }, - // child: Row( - // mainAxisAlignment: - // MainAxisAlignment.start, - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // Image.asset( - // "assets/image/icon_alipay.webp"), - // Expanded( - // flex: 1, - // child: Padding( - // padding: EdgeInsets.only(left: 8.w), - // child: Text( - // S.of(context).zhifubao, - // style: TextStyle( - // fontSize: 14.sp, - // color: Color(0xff353535), - // ), - // ), - // ), - // ), - // checkView(3), - // ], - // ), - // ), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 3; + }); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Image.asset( + "assets/image/icon_alipay.webp"), + Expanded( + flex: 1, + child: Padding( + padding: EdgeInsets.only(left: 8.w), + child: Text( + S.of(context).zhifubao, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + ), + ), + ), + ), + checkView(3), + ], + ), + ), ], ), ), diff --git a/lib/web/web_page.dart b/lib/web/web_page.dart index 148e141d..48d27768 100644 --- a/lib/web/web_page.dart +++ b/lib/web/web_page.dart @@ -52,7 +52,6 @@ class _WebPage extends State with WidgetsBindingObserver { final ScrollController scrollController = ScrollController(); final TextEditingController commentTextController = TextEditingController(); bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -72,6 +71,7 @@ class _WebPage extends State with WidgetsBindingObserver { @override void didChangeMetrics() { WidgetsBinding.instance.addPostFrameCallback((_) { + isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; if (MediaQuery.of(context).viewInsets.bottom == 0) { if (isKeyBoardShow) { FocusScope.of(context).requestFocus(FocusNode()); @@ -363,7 +363,6 @@ class _WebPage extends State with WidgetsBindingObserver { inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/web/web_view/input_comment.dart b/lib/web/web_view/input_comment.dart index 4a11f1ae..7f919d07 100644 --- a/lib/web/web_view/input_comment.dart +++ b/lib/web/web_view/input_comment.dart @@ -13,7 +13,6 @@ class InputComment extends StatefulWidget { final Activity activity; final Article article; final bool isKeyBoardShow; - final double keyboard_height; final double keyboard; final bool emojiShowing; final FocusNode commentFocus; @@ -30,7 +29,6 @@ class InputComment extends StatefulWidget { Key key, this.hintText, this.isKeyBoardShow, - this.keyboard_height, this.keyboard, this.emojiShowing, this.commentFocus, From 3ca55db1fe3b66bd6f4a66c204aa53ec35e19021 Mon Sep 17 00:00:00 2001 From: fmk Date: Wed, 15 Mar 2023 15:22:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?ios,=E6=9B=B4=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- .../settlement_view/settlement_order_commodity.dart | 4 +++- lib/utils/flutter_utils.dart | 11 +++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 700e6296..6164ae63 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 7e9d7012..1308a39d 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index d0cbdfe8..57d5221c 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -64,7 +64,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8766/app/";///本地 +const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index fa7a2ee1..9932374e 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -218,7 +218,9 @@ class _SettlementOrderCommodity extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Text( - S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), + productList.buyNum > 1? + S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - AppUtils.stringAsFixedDouble2(double.tryParse(productList.discountAmount ?? "0")/productList.buyNum))) + :S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), style: TextStyle( fontWeight: MyFontWeight.medium, fontSize: 14.sp, diff --git a/lib/utils/flutter_utils.dart b/lib/utils/flutter_utils.dart index 4d6b7a61..61a85847 100644 --- a/lib/utils/flutter_utils.dart +++ b/lib/utils/flutter_utils.dart @@ -17,6 +17,17 @@ class AppUtils { return "${numberFormat.format(mi / 1000)}"; } + + ///保留两位小数 + static double stringAsFixedDouble2(double value) { + String valueStr = value.toString(); + if (!valueStr.contains(".")) return value; + if (valueStr.indexOf(".") + 3 >= valueStr.length) + return value; + else + return double.tryParse(valueStr.substring(0, valueStr.indexOf(".") + 3))??0; + } + ///版本号 static bool versionCompare(String localVersion, String serverVersion) { try { From 8332fdccb4c839b2ab06d98876e27f30db3f8652 Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Thu, 16 Mar 2023 14:35:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8A=A0=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/message/system_details.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index 8e4742e4..efdc1d6e 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -51,8 +51,7 @@ class _SystemDetails extends State { msgType = widget.arguments["msgType"]; SharedPreferences.getInstance().then((value) { - apiService = - ApiService(Dio(), token: value.getString("token"), context: context); + apiService = ApiService(Dio(), token: value.getString("token"),showLoading: true, context: context); queryMessage(); }); } From 056a493365c4451188bbe5140461c956ca116a6a Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Thu, 16 Mar 2023 18:18:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=9AorderStat?= =?UTF-8?q?us=E5=A2=9E=E5=8A=A0-1=EF=BC=88=E6=9C=AA=E4=BB=98=E6=AC=BE=20?= =?UTF-8?q?=E6=B8=85=E6=A1=8C=EF=BC=89=E7=8A=B6=E6=80=81=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8orderStatus=20=3D=3D=20-1?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/order/order_detail_page.dart | 8 ++++++-- lib/order/order_history_page.dart | 7 ++----- lib/order/order_view/order_status.dart | 2 +- lib/utils/status_utils.dart | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index b12aefda..3b672481 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -237,11 +237,15 @@ class _OrderDetailPage extends State { statusTitle() { if (isTakeOut == 0) { - if (payStatus == 0) { + if (payStatus == 0 && orderStatus != -1) { title = S.of(context).dingdandaizhifu; } else { title = S.of(context).dingdanyizhifu; switch (orderStatus) { + case -1: + title = S.of(context).yiquxiao; + center = S.of(context).yiquxiao; + break; case 2: title = S.of(context).shangjiazhengzaipeican; break; @@ -312,7 +316,7 @@ class _OrderDetailPage extends State { } } } - if (orderStatus == 5) { + if (orderStatus == 5 || orderStatus == -1) { title = S.of(context).yiquxiao; center = S.of(context).yiquxiao; } diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart index c65f5708..ae78e3d5 100644 --- a/lib/order/order_history_page.dart +++ b/lib/order/order_history_page.dart @@ -314,13 +314,10 @@ class _OrderHistoryList extends State // ), // ), // ), - Container( - margin: EdgeInsets.only(left: 5.w, top: 12.h), - ), Expanded( child: Container( width: double.infinity, - margin: EdgeInsets.only(left: 6.w, top: 12.h), + margin: EdgeInsets.only(left:12.w, top: 12.h), alignment: Alignment.centerLeft, child: Text( (orderInfo != null) ? orderInfo.storeName : "", @@ -353,7 +350,7 @@ class _OrderHistoryList extends State color: (orderInfo == null) ? Color(0xFF32A060) : (orderInfo.refundStatus == 1 || - orderInfo.orderStatus >= 5) + orderInfo.orderStatus == -1 || orderInfo.orderStatus >= 5) ? Colors.grey : (orderInfo.orderStatus == 4) ? Color(0xFF32A060) diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart index 3d320c1f..595d6b23 100644 --- a/lib/order/order_view/order_status.dart +++ b/lib/order/order_view/order_status.dart @@ -142,7 +142,7 @@ class _OrderStatus extends State { children: timeWidget(), ), ), - visible: (widget.orderStatus >= 4 || widget.isTakeOut == 2) + visible: (widget.orderStatus == -1 || widget.orderStatus >= 4 || widget.isTakeOut == 2) ? false : (widget.isTakeOut == 0) ? !(widget.payStatus == 1) diff --git a/lib/utils/status_utils.dart b/lib/utils/status_utils.dart index 13b8c46f..fe58f78c 100644 --- a/lib/utils/status_utils.dart +++ b/lib/utils/status_utils.dart @@ -9,7 +9,7 @@ class StatusUtils { context, refundStatus, orderStatus, payStatus, sendStatus, isTakeOut) { String statusText = ""; if (isTakeOut == 0) { - if (payStatus == 0) { + if (payStatus == 0 && orderStatus != -1) { statusText = S.of(context).daizhifu; } else { statusText = S.of(context).yizhifu; @@ -79,7 +79,7 @@ class StatusUtils { if (refundStatus == 1) { statusText = S.of(context).yituikuan; } - if (orderStatus == 5) { + if (orderStatus == 5 || orderStatus == -1) { statusText = S.of(context).yiquxiao; } return statusText; @@ -110,7 +110,7 @@ class StatusUtils { ), ]; } - if (orderStatus > 4) { + if (orderStatus > 4 || orderStatus == -1) { return [ RoundButton( text: S.of(context).zailaiyidan, @@ -125,7 +125,7 @@ class StatusUtils { ), ]; } else { - if (payStatus == 0) { + if (payStatus == 0 && orderStatus != -1) { return [ RoundButton( text: S.of(context).quzhifu, From 7d8a2851d3bb5546b1285b52c892ee592c5117f4 Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 17 Mar 2023 15:24:06 +0800 Subject: [PATCH 5/9] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A2=9E=E9=95=BF=E4=B8=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 328 +++++++++++++------------ ios/Runner.xcodeproj/project.pbxproj | 6 +- lib/union/location_map_page.dart | 4 +- lib/view_widget/new_coupon_widget.dart | 2 +- pubspec.lock | 10 +- 5 files changed, 176 insertions(+), 174 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5c696545..0fe04321 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,4 +1,5 @@ PODS: + - AEINFoundation (3.2.40) - AFNetworking (4.0.1): - AFNetworking/NSURLSession (= 4.0.1) - AFNetworking/Reachability (= 4.0.1) @@ -49,121 +50,121 @@ PODS: - image_pickers (0.0.1): - AFNetworking - Flutter - - ZLPhotoBrowser-objc (= 1.0.4) - - mob_sharesdk (4.4.8): - - mob_sharesdk/ShareSDK (= 4.4.8) - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDK (4.4.8): - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKExtension (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Line (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SMS (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKRestoreScene (4.4.8): - - mob_sharesdk/ShareSDKExtension - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKUI (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - MOBFoundation (3.2.37) + - SDWebImage + - ZLPhotoBrowser + - mob_sharesdk_spec2 (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK (= 0.0.1) + - mob_sharesdk_spec2/ShareSDK (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDKExtension (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/DingTalk (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Douyin (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Dropbox (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Evernote (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Facebook (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Flickr (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/GooglePlus (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Instagram (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Instapaper (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Kakao (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/KuaiShou (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Line (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/LinkedIn (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Messenger (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/MingDao (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Oasis (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Pinterest (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Pocket (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/QQ (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Reddit (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SinaWeibo (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SMS (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SnapChat (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Telegram (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/TikTok (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Twitter (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/VKontakte (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WatermelonVideo (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WeChat_Lite (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WeWork (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WhatsApp (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Yixin (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/YouDaoNote (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKRestoreScene (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDKExtension + - mob_sharesdk_spec2/ShareSDKUI (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK - number_precision (0.0.1): - Flutter - OpenWeChatSDK (1.9.6) @@ -180,45 +181,45 @@ PODS: - SDWebImage/Core (5.13.4) - shared_preferences_ios (0.0.1): - Flutter - - sharesdk_plugin (1.1.3): + - sharesdk_plugin (1.1.4): - Flutter - - mob_sharesdk - - mob_sharesdk/ShareSDKExtension - - mob_sharesdk/ShareSDKPlatforms/DingTalk - - mob_sharesdk/ShareSDKPlatforms/Douyin - - mob_sharesdk/ShareSDKPlatforms/Dropbox - - mob_sharesdk/ShareSDKPlatforms/Evernote - - mob_sharesdk/ShareSDKPlatforms/Facebook - - mob_sharesdk/ShareSDKPlatforms/Flickr - - mob_sharesdk/ShareSDKPlatforms/GooglePlus - - mob_sharesdk/ShareSDKPlatforms/Instagram - - mob_sharesdk/ShareSDKPlatforms/Instapaper - - mob_sharesdk/ShareSDKPlatforms/Kakao - - mob_sharesdk/ShareSDKPlatforms/KuaiShou - - mob_sharesdk/ShareSDKPlatforms/Line - - mob_sharesdk/ShareSDKPlatforms/LinkedIn - - mob_sharesdk/ShareSDKPlatforms/Messenger - - mob_sharesdk/ShareSDKPlatforms/MingDao - - mob_sharesdk/ShareSDKPlatforms/Oasis - - mob_sharesdk/ShareSDKPlatforms/Pinterest - - mob_sharesdk/ShareSDKPlatforms/Pocket - - mob_sharesdk/ShareSDKPlatforms/QQ - - mob_sharesdk/ShareSDKPlatforms/Reddit - - mob_sharesdk/ShareSDKPlatforms/SinaWeibo - - mob_sharesdk/ShareSDKPlatforms/SMS - - mob_sharesdk/ShareSDKPlatforms/SnapChat - - mob_sharesdk/ShareSDKPlatforms/Telegram - - mob_sharesdk/ShareSDKPlatforms/TikTok - - mob_sharesdk/ShareSDKPlatforms/Twitter - - mob_sharesdk/ShareSDKPlatforms/VKontakte - - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite - - mob_sharesdk/ShareSDKPlatforms/WeWork - - mob_sharesdk/ShareSDKPlatforms/WhatsApp - - mob_sharesdk/ShareSDKPlatforms/Yixin - - mob_sharesdk/ShareSDKPlatforms/YouDaoNote - - mob_sharesdk/ShareSDKRestoreScene - - mob_sharesdk/ShareSDKUI + - mob_sharesdk_spec2 + - mob_sharesdk_spec2/ShareSDKExtension + - mob_sharesdk_spec2/ShareSDKPlatforms/DingTalk + - mob_sharesdk_spec2/ShareSDKPlatforms/Douyin + - mob_sharesdk_spec2/ShareSDKPlatforms/Dropbox + - mob_sharesdk_spec2/ShareSDKPlatforms/Evernote + - mob_sharesdk_spec2/ShareSDKPlatforms/Facebook + - mob_sharesdk_spec2/ShareSDKPlatforms/Flickr + - mob_sharesdk_spec2/ShareSDKPlatforms/GooglePlus + - mob_sharesdk_spec2/ShareSDKPlatforms/Instagram + - mob_sharesdk_spec2/ShareSDKPlatforms/Instapaper + - mob_sharesdk_spec2/ShareSDKPlatforms/Kakao + - mob_sharesdk_spec2/ShareSDKPlatforms/KuaiShou + - mob_sharesdk_spec2/ShareSDKPlatforms/Line + - mob_sharesdk_spec2/ShareSDKPlatforms/LinkedIn + - mob_sharesdk_spec2/ShareSDKPlatforms/Messenger + - mob_sharesdk_spec2/ShareSDKPlatforms/MingDao + - mob_sharesdk_spec2/ShareSDKPlatforms/Oasis + - mob_sharesdk_spec2/ShareSDKPlatforms/Pinterest + - mob_sharesdk_spec2/ShareSDKPlatforms/Pocket + - mob_sharesdk_spec2/ShareSDKPlatforms/QQ + - mob_sharesdk_spec2/ShareSDKPlatforms/Reddit + - mob_sharesdk_spec2/ShareSDKPlatforms/SinaWeibo + - mob_sharesdk_spec2/ShareSDKPlatforms/SMS + - mob_sharesdk_spec2/ShareSDKPlatforms/SnapChat + - mob_sharesdk_spec2/ShareSDKPlatforms/Telegram + - mob_sharesdk_spec2/ShareSDKPlatforms/TikTok + - mob_sharesdk_spec2/ShareSDKPlatforms/Twitter + - mob_sharesdk_spec2/ShareSDKPlatforms/VKontakte + - mob_sharesdk_spec2/ShareSDKPlatforms/WatermelonVideo + - mob_sharesdk_spec2/ShareSDKPlatforms/WeChat_Lite + - mob_sharesdk_spec2/ShareSDKPlatforms/WeWork + - mob_sharesdk_spec2/ShareSDKPlatforms/WhatsApp + - mob_sharesdk_spec2/ShareSDKPlatforms/Yixin + - mob_sharesdk_spec2/ShareSDKPlatforms/YouDaoNote + - mob_sharesdk_spec2/ShareSDKRestoreScene + - mob_sharesdk_spec2/ShareSDKUI - SSZipArchive (2.4.3) - thumbnails (0.0.1): - Flutter @@ -236,8 +237,9 @@ PODS: - Flutter - webview_flutter (0.0.1): - Flutter - - ZLPhotoBrowser-objc (1.0.4): - - SDWebImage + - ZLPhotoBrowser (4.3.7): + - ZLPhotoBrowser/Core (= 4.3.7) + - ZLPhotoBrowser/Core (4.3.7) DEPENDENCIES: - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) @@ -267,16 +269,16 @@ DEPENDENCIES: SPEC REPOS: trunk: + - AEINFoundation - AFNetworking - BaiduMapKit - BMKLocationKit - - mob_sharesdk - - MOBFoundation + - mob_sharesdk_spec2 - OpenWeChatSDK - SDWebImage - SSZipArchive - TPNS-iOS - - ZLPhotoBrowser-objc + - ZLPhotoBrowser EXTERNAL SOURCES: emoji_picker_flutter: @@ -327,6 +329,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/webview_flutter/ios" SPEC CHECKSUMS: + AEINFoundation: e046b5fbe75aaf120a54fdc530b1d62d4ce88dfe AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777 BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780 @@ -338,9 +341,8 @@ SPEC CHECKSUMS: flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 - image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 - mob_sharesdk: b707987dfbe7e180ea60ddf4b5db30126ac98390 - MOBFoundation: 2fcfc8b48bf311ace31e99c941b70f573c88880a + image_pickers: 075764ed041c5e3089fcd4d040384ecdb23840e0 + mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 OpenWeChatSDK: 8fb6c3c7ce9a57f37d001060282de1f138d09940 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 @@ -349,7 +351,7 @@ SPEC CHECKSUMS: scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad - sharesdk_plugin: ad2cacfb74c4b82fbc4100cc882d05507f908aed + sharesdk_plugin: d9c8e928116aba323b21da64b4437ed766ee843e SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 @@ -359,7 +361,7 @@ SPEC CHECKSUMS: video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 - ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 + ZLPhotoBrowser: f571bdaec6d0b64ae94a29787e4c7cbd8900d10f PODFILE CHECKSUM: 9a26c1c4037e42be4afc95d70f8bd02a4b989a1c diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6164ae63..2a9e0e35 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/union/location_map_page.dart b/lib/union/location_map_page.dart index cdc28cea..d63e223c 100644 --- a/lib/union/location_map_page.dart +++ b/lib/union/location_map_page.dart @@ -77,7 +77,7 @@ class _LocationMap extends State { ), body: Container( //BMFMapWidget 组件会自动默认沾满全屏，并且挡住所有遮盖物 ,BMFTextureMapWidget不会强制遮盖其他控件。 - child: BMFTextureMapWidget( + child:BMFMapWidget( mapOptions: BMFMapOptions( center: BMFCoordinate( double.tryParse(widget.arguments["lat"]), @@ -88,7 +88,7 @@ class _LocationMap extends State { zoomLevel: 12, ), onBMFMapCreated: onMapCreated, - ), + ) ), ); } diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index bd3cbc32..4abeec11 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -84,7 +84,7 @@ class NewCouponWidget extends StatelessWidget { children: [ Text( "${coupon != null ? coupon.couponName ?? "" : ""}", - maxLines: 1, + maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 15.sp, diff --git a/pubspec.lock b/pubspec.lock index caa771cd..5589cb7d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,7 +173,7 @@ packages: name: flutter_baidu_mapapi_base url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_baidu_mapapi_map: dependency: "direct main" description: @@ -187,21 +187,21 @@ packages: name: flutter_baidu_mapapi_search url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_baidu_mapapi_utils: dependency: "direct main" description: name: flutter_baidu_mapapi_utils url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_bmflocation: dependency: "direct main" description: name: flutter_bmflocation url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.1" flutter_easyloading: dependency: "direct main" description: @@ -314,7 +314,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.12.2" + version: "3.9.0+2" font_awesome_flutter: dependency: "direct main" description: From 6e4d05c043a50c6779ed97f011f633c420690b20 Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 17 Mar 2023 15:55:09 +0800 Subject: [PATCH 6/9] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A2=9E=E9=95=BF=E4=B8=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/view_widget/new_coupon_widget.dart | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2a9e0e35..19c6b784 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 4abeec11..550dd257 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -83,12 +83,12 @@ class NewCouponWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${coupon != null ? coupon.couponName ?? "" : ""}", + "${coupon != null ? coupon.couponName?? "" : ""}", maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 15.sp, - height: 1.2.h, + height: 1.3.h, fontWeight: MyFontWeight.semi_bold, color: Color(0xFF0D0D0D), ), From 00d657f9919d697e8647c674a383f605f719746b Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Fri, 17 Mar 2023 15:58:36 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=9B=B4=E6=94=B9ui?= =?UTF-8?q?=EF=BC=9B=20=E7=99=BB=E5=BD=95=E9=A1=B5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=97=B4=E8=B7=9D=E6=9B=B4=E6=94=B9=EF=BC=9B=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=B7=E6=96=B0=EF=BC=9B=20=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A2=9E=E5=8A=A0=E4=B8=A4=E8=A1=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/c_z.webp | Bin 702 -> 0 bytes assets/image/2x/icon_chat.webp | Bin 0 -> 1348 bytes assets/image/2x/icon_cz.webp | Bin 0 -> 1252 bytes assets/image/2x/icon_gz.webp | Bin 3614 -> 1502 bytes assets/image/2x/icon_order.webp | Bin 0 -> 1048 bytes assets/image/2x/icon_pl.webp | Bin 3154 -> 1264 bytes assets/image/2x/icon_scan_qr_code.webp | Bin 118 -> 666 bytes assets/image/2x/icon_system_message.webp | Bin 606 -> 1584 bytes assets/image/2x/icon_z.webp | Bin 3472 -> 1352 bytes assets/image/3x/c_z.webp | Bin 1598 -> 0 bytes assets/image/3x/icon_chat.webp | Bin 0 -> 2110 bytes assets/image/3x/icon_cz.webp | Bin 0 -> 1818 bytes assets/image/3x/icon_gz.webp | Bin 8154 -> 2270 bytes assets/image/3x/icon_order.webp | Bin 0 -> 1488 bytes assets/image/3x/icon_pl.webp | Bin 8214 -> 1912 bytes assets/image/3x/icon_scan_qr_code.webp | Bin 172 -> 766 bytes assets/image/3x/icon_system_message.webp | Bin 1102 -> 4798 bytes assets/image/3x/icon_z.webp | Bin 8112 -> 2002 bytes assets/image/c_z.webp | Bin 400 -> 0 bytes assets/image/icon_chat.webp | Bin 0 -> 798 bytes assets/image/icon_cz.webp | Bin 0 -> 790 bytes assets/image/icon_gz.webp | Bin 1402 -> 870 bytes assets/image/icon_order.webp | Bin 0 -> 724 bytes assets/image/icon_pl.webp | Bin 1172 -> 808 bytes assets/image/icon_scan_qr_code.webp | Bin 96 -> 600 bytes assets/image/icon_system_message.webp | Bin 340 -> 892 bytes assets/image/icon_z.webp | Bin 1402 -> 806 bytes lib/login/new_login_page.dart | 2 +- lib/main.dart | 3 + lib/message/system_message.dart | 138 +++++++++- lib/message/system_notice.dart | 323 +++++++++++++++++++++++ lib/mine/mine_view/mine_view.dart | 15 +- lib/order/order_detail_page.dart | 139 ++++++---- lib/view_widget/new_coupon_widget.dart | 2 +- 34 files changed, 549 insertions(+), 73 deletions(-) delete mode 100644 assets/image/2x/c_z.webp create mode 100644 assets/image/2x/icon_chat.webp create mode 100644 assets/image/2x/icon_cz.webp create mode 100644 assets/image/2x/icon_order.webp delete mode 100644 assets/image/3x/c_z.webp create mode 100644 assets/image/3x/icon_chat.webp create mode 100644 assets/image/3x/icon_cz.webp create mode 100644 assets/image/3x/icon_order.webp delete mode 100644 assets/image/c_z.webp create mode 100644 assets/image/icon_chat.webp create mode 100644 assets/image/icon_cz.webp create mode 100644 assets/image/icon_order.webp create mode 100644 lib/message/system_notice.dart diff --git a/assets/image/2x/c_z.webp b/assets/image/2x/c_z.webp deleted file mode 100644 index ea1056ff156c501354be8aafa4cfc1e0f0d3fa47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 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 literal 0 HcmV?d00001 diff --git a/assets/image/2x/icon_gz.webp b/assets/image/2x/icon_gz.webp index 3611d1f1576420855c569c69efaea44cf87c44e2..c2633137d01c7c64cf83a3ffba7d6e4068853372 100644 GIT binary patch literal 1502 zcmWIYbaT7L%D@or>J$(bU=hK^z`$St#QtF9>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m?4P4oxus=|NKP^3>IG*7?>v@#FAz*Fl=vSV34?l5K~#ez`)m$qafxmJu*g4H?XUG3@h#nSnvy|A4T-^1~XFR9r)g&rCaSRJT5NN3V+K zM62K5<~i1U{aZee#^Xgvx?^=AbRrVg+sNbyH>66Y86i{_AvEdS{I{b4;QO=zG8pY zX05dSmfJMXOS?DPToPM$kabeejR=XJo3G}noLtd+@*M;3+6fak8a=tYs&8V-n`04I zm#)h+vRk%W=G9E~(;YwMBKLNuSZ=(rI`4XD)R&C%Epv2VrcD2|=*eZT${8Q#9ojza z!=*yD|-m^PxY@D76Dz9}-wM=UX z>6&)Q_>IEtsuxdgCRYc^RQJ!duFP1?T)bmv(<#;b%QM6GpFQ*D^xMC@eSgdMn+`+3&A-*^&%HBeW?lGicVpw{hxbK}?{3!0j!*XK@R%+gzT|{`jn07|wVo|= zGj{M_)QkC(o(2W1AD>UjFu2vo$ot}ezj1!e{pBC|7#2&Nk2bE~bFsp`F_QE7ibxlk zg(;UVtgPMBZuoef+nt;1FV;+Qzqo&v+nx1Kdvxnsft~1_DFRr`^k@2mQTO^YR9AIWnUI;`*>q< z`q|)^+3s5_-*N8WQW^JIVBU_!uRf+tpZ?;zWwZ67sMT9$s9Vnsd%SGXZ_dujJz?o{ z3KvI|2hE6@yYjl@ddXd3OQJQsHu7D2z2$antnX_#p`bOFdF2HquTSn+)t~W0X8-@) zmtF;~Q{xPsfBDT}C8r5*4vWlRvFvPqn!TR-$CCLs-XtsQykGZNy-fXujh&hO{JD3n z6!w>TmAzi^=33>?wa%NP)zi24onL=`Lae;XZad$y+9hv(#oYY*aMNqyXV;FOS$BR` Zw7kV`yVAVcFL!?Z`G5Ysz|FsYOaQdgK_~zK literal 3614 zcmX9>3s{V48-BiTzNT+7>YYla*!4}#GR_r$v5~KlQP_-x$*HLvLgiF!PJL4oQ!7#- zR++zISy?In*ifbe!X|~pNG*{hha94$|84i0nd^G5nfH6%`+45`x$kHEeH98jOMnH_ z~s(LFEOL4+$=^u>{R7PNPTAb4C1H)itHJoo&xWluN$`Z$9Yd zJqtG8E3?k;$#IM?YW7JTeEr?aiKem5ad1Rup0}wfDsb|J3%gjNC|T;8x-4s4{NH}D z>-~=Bd@9yEnGCBh+Ryy!r8KniCuOeEb!u~Eq&VrF-;ec%%r}LFbz}e6-WagCz{NhT zeb$nOdxq&3kM1inY-o<%c0$yW4NK&>!i5DT)h3cx>7I=hzLf5t4@Ie`7PQ7dHz4H!JtBvFLks44|(C}|UsN_GMC%>&&ALKw0cZEpL zG7M0h3rP9E)AWI%MKy7s7sn@W_-!U�b=A0HP^UME0jhV_$qNic8rxGGfEo4aaFC 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 diff --git a/assets/image/2x/icon_order.webp b/assets/image/2x/icon_order.webp new file mode 100644 index 0000000000000000000000000000000000000000..8b14cf19ff221a33c0d7d34fea38f2aa8b731738 GIT binary patch literal 1048 zcmWIYbaNA6VPFV%bqWXzu!!JdU|=u+Vtp|3baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qyIUnF)>)4pPI*ae!IYs@SO}h`j-EZ+^ z-|sl7ju-n6ZOfG|f6r7p=N=>=8iLl|eD~FTaozg6Yo>yQ48DlGo@?kiNyW3z`fHNM z+B;H{R92SrM5ku2y&y4R$x@>X5ucTpR6VnoMjI}96~2Dw=2yO71trDYOXHPJUhs;Q z|GR=ceD$roQ(XsGr@jxiWoMoHxiq7>M^t)#&ZXa<{>Hk1z>|IFzpUeL+xq2;h~PzS zf7@;Mu3Xz$CGhch^SOtMzMqsAv)R*s|KfYaq|RS^tu%TMKiqgYsQ2NAm^IgWded$< zow0mAr}*68cYiXz>&#FGId+oD%ZvSS_GOFhyBOx19&KOwad}MgCQ}oi;IPXtORVPl zEx&y8q`^|zTLw8I^VQYl?wx!7`DfCzg`Lms<->18ROW43{55G~gwA?5>#CcX72A*d z-M13p>F3*1susasGWX||jRA8nmc9vAcP{n0>e0sxC|VOIbE literal 0 HcmV?d00001 diff --git a/assets/image/2x/icon_pl.webp b/assets/image/2x/icon_pl.webp index 3b61e9e0037c83226025734eca573bca1c092305..fec5889aea719fc61644b766b93ed139e0a07ff3 100644 GIT binary patch literal 1264 zcmWIYbaQ*b!oU#j>J$(bU=hK^z`$St#QtF9>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m?4P4oxus=|NKP^3>IG*7?>v@#FAz*Fl=vSV34?l5K~#ez`)m$qafxmJu*g4H?XUG3@h;iGe}i|A4T7`=JfFw>^R`eLJ@6YTk?gXQg_8 zyb#;tXTI$IlRW2U>K(U9i(bu3_W2of?EcGHfzqCRljkkyT_4RN-q5Q2e7@mNN#(Z} zll!KAugi_jlvG}I&PaCWPvxC;wazt8nVasphcR4;H(+9r{?b)15_PCOC`ENbhf;8d zqRYVsl?!RTLYbK}B4$i|dciT{w8pDR&g#3|{PuoayGU=^wLVWiS?|j%j4H?bmMThK zKXXYy$GcC~M`VIRgsAF-)Z5!Ktv}z|W}E!ZqS7$zZ+6MgYqzSO+AsRgb7xy_ii*Ro z{M38=u;2pH4jb=D_AGz>_u+XZXgVun!xGCE z&+5YwYN-5OaDXE5g&Pzd5=zg-4d$*FqWm}YD~`W zOUApxMHK(b`|ZHB6S7nsvD7jj(+ zNU_pbzdgeIv0jUS6Ne(0*z+^dX>al|<+G-HjTRakJYM=}lH4BCM1ybFZ0A)SE_uuQ zdawB#{(A)$Dv@c2?M{~GXRn$3Vrg#I{@y5tHaqukMc3xLPZ_t_Jnb~} z|M}Z>`tlv87vFhW`R`LedF7_vHuvJ^9*mVe5R literal 3154 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 diff --git a/assets/image/2x/icon_scan_qr_code.webp b/assets/image/2x/icon_scan_qr_code.webp index 87b4da159e26ea0f46f89072706fea0f75a7cf70..d177630f557249fc204b306ce7646fd612fe88fc 100644 GIT binary patch literal 666 zcmWIYbaR`;#J~{l>J$(bU=hK^z`$St#QI?5>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m?4P4oxus=|NKP^3>IG*7?>v@#FAz*Fl=vSV34?l5K~#ez`)m$qafxmJu*g4H?XUG3>Jhs8C=30Jng;f{KC(^Pl<8Cr@a&!1JMgp1c#2 zlktK7m30$1BY3tqbe)uD_`ixdkUMOmighOM0tHDAu7tm{m5#sf_@`ZP+wJ6o84m@4 zhQUFI=Oh&n+GsF$VXViw7omN>{~N9ToAW(#d+gi#jrB_Dw}B~*fgyf}_T76Ir~N)t j-SgaX{*UFhcJ=b-?$7_f^ZEDvmp{M%`{nen} literal 118 zcmWIYbaTsNU|3a0|#Q2zVq~>mm^fJsgu>m>q~WWqIro^jIS{ zE`_7;CrhUI{eSLX>X~lw`#Fl1Jrj7!+FRFP$ehSj?k5=aRJF^Mal9{?iEC;k8c diff --git a/assets/image/2x/icon_system_message.webp b/assets/image/2x/icon_system_message.webp index dc24acb0fd3604544c7e993766746b3d77663861..3b15d414dc862babe87ef58e8613c4bda0fea6c4 100644 GIT binary patch literal 1584 zcmaixc~FyA5Wt@m5GaQcTdUmoK?7Be2BQR|kPsjqfC1zbqrEF5DXw_84XB`6$n8MG? zfDk-3U~j;-P+b6kBdq@K76FF~=vVvYQ|Ieip7te@=lcr#W=@vs|U+Ih!22a9st6gW#95lXwmd&xIR2&SU*ch06>Y=)3@-WIsr8N!n<7H`VRg#j8<1^xNsrD zp3E&Yc^Kg4U~#4JiJKhcJvwMN4RBI;a3dTdyo87uxLFrr2?r-J`UN@Z~m5Cf0P#xOCP$g9rlzQgBi8o=4tXcN@ys z;e?~Jko+KV|3q{U^Q3#lrJHG|_TjjPzuq$BSHVB2GC!edP*GjVu?jEjs%SaSv3XEf zKQsU1rsL$0N|O^42ab$+CQW`Rx~JD8n(x;(JL__&qq@Q>kZ#;4X5=UMX0589sVqtOW zR3RkiF;aKc3a!l&E|u>T(QHDw9_LZ5M;e!8`e{0I;=k`wp1RtiO!U0%0}=$zZfG>x z%kNPrF}#x7#y;HJA=Ilzi^E<|_~*Q|RyM`mOqI7I?*AZ4u3tb@Q1HnHT{}rJj%S=@ zWrHIjTBp;^dE@9otLyz<<5xGnoV3dFVI|{gcB5qZxNyu4`!Z>tR#|#K%i9Vskl&Z> zmgf}EDY^PZ#uNr%#5k5bZ+dP zuqI<#r<+m2ZfoX9HE#ipj)>}VeVnI)_P*d?sI@4<_b;Ylv7|rq)T(Uz>0n5HVjXH4 zGZC3R$8M4)9W><(BxO)>>&D5yN#%LPQ=<&@HPysM_WZfHq&MT8PoV|J?;03NR@cve zmfn1LEPkq>`>p)M+ZX9`1tNE8S#gv*mSnCNAZ5!rGRRXPp+Mv>;WE$$(-LoK7P@-ECeP;jEzOu&wah^P F`~!?2W+wmu literal 606 zcmV-k0-^mZU{~vcm zM9{Wv%AfMTc>Wc+ZQC5vNqqw$(~vP!0TCdW2^ob^3PWascb;LuCMX}p%o8p$iC`*I z%y##igk*%l=H9mt>|thm@3Y57xtQ<%QSP4tl#HR6JlxOyZzf>_m5VUX7y`zt?A&4$ zGn1`wdG;)FpesQ%*ks^WZCcAXzW}mr+cxcJL>EcQh|O{ZW&5IR8?kwflbSz%adOUj zO=}VTp8$Z)$W%gRCZ-~tlnlfj8SBIYK;W|s{v3d~Opep(*yMCZWOQW8s;Puk3GHdQ zcya&nw+7`Ogn$EibG~&@a^9GY%Qck#XUmI&ls9F1lu8Xr-wEJK?)|bqzTTV|8ylOH zG(?r((2aiemLX39xv!)J-qTI0Qah^f>?o;*K>=JV43L$W+3P#8jjc0K4ESH~;_u diff --git a/assets/image/2x/icon_z.webp b/assets/image/2x/icon_z.webp index 77b48e80df2c2e3c7334ca925c64564a467dc284..65835cb42c4e429bfb4379da214848ba9784c600 100644 GIT binary patch literal 1352 zcmWIYbaQiHWnc(*bqWXzu!!JdU|=u+Vt+95baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qj=Pl@6AI%cZ-f;cS&ff0ooYm z`olYvKeyv^lKZ`2-H-NH0~X}|h?7_$TC*VTgh3!HcaOM|go0x;V^EU{tBR(Vtn13~ zS6kFt{WJuEM3|&>*tjzi*+rF1B3Ks$EjQz6l~Q(HDjuY<$Y6EZyI9bs_rp-Ufcg-Kl9dJm6IU}?^d?H-Svze z7FIx7AwIX1eevAp!-t#aUR-c{)iXx84R!C#e9DW#08oaeYg)_SQ~PQDy&D zJ$1_0uyvM-oxqbLgANORl=@&scCwE;F;5 z_iflN=Skb7=Wg+8Rm{vk+~l-W^X1`XsvA!gU+O=5`qJB}dm=r{+~2HOKAH7ox6u4& zPZOKI=hUulpPmP!fP4^asU2&*|O z%fGJQv@CtG#PuzF->zLfzHe#W+#6p40uxdiXLUZ>bLDpg^DQy22kYjU8JGnKg>O^T zx-`N3YQJ*xexH4-N?!ly_I?s9;u;7>{CRVySVmnv)?<9m^7))%5aInVH2?gmB=_(q zXReBOA5Gf0V~1O+zl&ZuyHdJc&acYYv*r^|H%~kvIlbeYi(Y@3Q}S~K6FxrY#}~BY zQ!4IO>fHWVbyD@Fs-66owoUB3Hbt{Hm0tOJ{CcX)q_v-?*~@ulcdj!37rVf~@7dmu zUNXn0R~{2LUs{)c*{?BU$_MQiW(KPgQLlFh!xneqBY#oS!Y+_|#vnRNocF_zVK-JGE+ z93w9pGhaMTUMgn3OpLtzy*Y|IEIkT}XFYi4aq#TUrrC#C&DD8w`y}toG2LQWP*D8p T!m}3(&;I;B|GmJ$T6IPMLh;~5 literal 3472 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 diff --git a/assets/image/3x/c_z.webp b/assets/image/3x/c_z.webp deleted file mode 100644 index cd545fe5c1f28f0b11bb791b3bae5a2bbc5c1d62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1598 zcmV-E2EqAKNk&FC1^@t8MM6+kP&iB}1^@srcfcJGHBr&FZQ0yxJv;d+%*@QpJj~3@ z^v(CZ|Ci?tl)0kmB{y;Kx4W+qP}nwr#^<0DxuF|6kb=O={b= zjd?4h+O~Fl|MU<-8Kz$!LBuh(MEI65+kx9iid0_a-DBtv%%)%v!r6#WiwS_u1i)#8 z!DWKcVT1wlepoU4=tc5pQ&EhCBr`x)Ge8d$Kp!Iven{fts|r?FJ5yU$eamJT?nW5g zMi_jMNKwv$ODbCnjCKb&!TQ`N#8%#lJvX8+};9~o30PeGJ-=8~ z;`h&~)v0ULl;zPZ7zQ+zVo3EZhHlxM|9q9PzPMpQ>qF0Csj=NuhD!rI6-Aux*-Xgp zF7EM>{7100QvR3t*H`%QsZXU+T`8h<=Qg2GHHFBf-ARTJte52f#cMRHp^*`~a~n~p zrOy+7dSX4rK0f}ofr@sKQ2hIc^_B4X>y%7@2K(%>_Yc-veq+1I4hl-r1h?KG<&V%k zd}IX?3l!AU$fmOXhP4R?Nc4J@O4=v0f6iO1F8}zb>zno+&#l{g6$FIrPFkmu@c!wR z&yA|BRrD-XG%mf@c-GKrs-_Uk^FM3YtQ?O90yM{cr>o*P2C#LA#aPYc(hLb$rcEgD zF{^vxDG%ZjBa0su6!nc`kQtZqa_5eo!pM)?@IyLBjVJS#Xf zT8dlpou0))7X4(oc6%cMU|dtDEn{Q9_AC@iPy}RX7Y!x6f0%xl-Fu_`kfD*?^aLmV zEsj}qZ`Njgk^gG@G z0DG@uDe?2evV=KswJR@Rs5}vtqzHX#4Q7eLfy-SDl_XQMbf0SNPFXU>x!H28x6(P( zTL+aOaZqSz*8SDD)=1}2Yj_SP3sO(w_i_V7%^!PzBc2C#g|M!f6!G}ZR;4)<2MU~ z((XlHUzl>V)Yhp0>>7T2;LHXYGc{~~=fBwa&NoWc)G)IJs&4KZd6s$)<^US8-$L+5&^JJG)idEfP zUdRFg!Mi*46Zxl2Fd+Krc6x2SD&qXYYKXjVcj@+6qY2)gJcbkZ-au(MfK9IR9L*HG zMw5WmE{D~5PiCcQ5(sGN^{^l-H}v(VAfSqr7x(Xeh^L1Z@tw=fEpKL?gRJ@BG>_-~$;Bjn>0Lr`62k08m-Nxt9gxzqvHX zD95My&R0Sie8)?+d)8zDe~bbhCK#xtQ$*k1M9wSg-CNF1c>l0~r2nOX)kN!?!uR4H zU#ypZUIa0RgdHDrYDcsQhn@s6&(+bXBCl_{v{M_}E#pAX@X-C84&MVuoSxPINtGm= zZ-!YL-}!0{qQ7vwv`PDD0@_{JU?X`+PF(PbN;iC%Jm2Qe@4Rl=lHP0L$_RRSIFo3dIrs^4XlReO)!9& wZ~Fm~G9qBe`~P-%|IaUP{eryp8uHesNL!C1Z~c+9^;Xi>mq}euCvW{A08O4Fb^rhX diff --git a/assets/image/3x/icon_chat.webp b/assets/image/3x/icon_chat.webp new file mode 100644 index 0000000000000000000000000000000000000000..935c3deed04f0e9b5a34aec3caada4b8773b006b GIT binary patch literal 2110 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 aG|!x-4yEl}&wS68SZB44{za=f5B>$+wAP0J literal 0 HcmV?d00001 diff --git a/assets/image/3x/icon_gz.webp b/assets/image/3x/icon_gz.webp index ab41b159c62dead62f0e72da2979104f49fa6a17..ff4ff7f53724e2ba956ea2a444360c3daf416984 100644 GIT binary patch literal 2270 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 S)ib5;eS2uUG8SzE{ diff --git a/assets/image/3x/icon_order.webp b/assets/image/3x/icon_order.webp new file mode 100644 index 0000000000000000000000000000000000000000..7a418bf02acfcfbd67dad66b771e7d0575e62fba GIT binary patch literal 1488 zcmWIYbaOkw%D@or>J$(bU=hK^z`$St#O`3^>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m>~!lJWdGz=PzPlu=vWrz&rsVmNb)rVS6hBgTyU_n92eM2L2WXhHd8& zVu&y)NGwVOnhy+QAZAKSV_^8SoPmKil7T_^0s{kAG*}Ku;BcD)P)Y{qu6!U&XUJhl zWl&)7WXNMkX3zt&jDV49$Y2JHVV|4K3=I122LuK34{J`Gt@3Kds(r(0ALd=!rsh*53W!SrZi4_rK|{ zuh=x_eg3bl<&wAS3iZCuzZunIef;tM`hS}r7tV;YD?0hUX0nX^@t^NKPI1n7{=Rw2 z+4#E)=ijt>rE<5?A^k&|u{LAZn;bTYmpmZ`0t*ygFa#?4I4oUyWy`$$9v#mKhD+2Y znucnhe!A)xL(rF)o;544Un(|IG!2y(SdqnfB|9+pdwZOBuVX6bO3o=l0ZL3$I2r>Q z1+=CxrKC8WU0KDb7&0L*ce0YYsQ)$H*HYj4WpfJJcI@Uos2K45e|71qs^3gXzs@@_ zUbZ;cRJ`=A@Z!e;rSLUA=hv@0=O5m+)1{)OWI_i5h}45>_$WN27$;FFJ~X_AhSh?hT5{)C_JQfFtkV=mkFF}=uHI&ZFlK<{-i zMu*or*B+gEa3G?Nk-^7;`{zbRUy~>%hG0L*%z<`b3CfM#;2Ehc_8o za?jXy({rL~^kV*LB5TB6TV?-A$s@H6}^`ef@| z`0#%6oBpovi&~^E_^tKv(|_h<8FLcz~}Y2SY;Ge)NDc3QYAp=L*NTG}+0 zclS8g$h~rjI#8^?&+zoy*Tszd%dAgEAKF!YM(XxtgJSlh%T?CD32To&S-R}jo`7jF z{^zf{bbGGbY~v#`b7Bnt=5s37Erk~zJhQ2?<5EIe!4`(k0pSLni&5S;D z`SZ4fx~pPqZZ%iloig_;3OLJswlVM2wZ{uiSN;ezcHMsAq4)7Z87QjUwm#D1```cn z-~QhB9*XQEKL35rvwiB;yZ?8ujWrnjuUmh<{OzCYx-Omn+rBnbc6@PIZfD3h(N6I7(t590 z#f#oWf4{k|ELQoowtb$-n%yc@o7(r8u3={VwQc!5zAH=L@7Hn*p3e6A?Y&>|3nqWh zOSSr0wtnSg)?fE$RUMi4>%^?8v(tWEoL6;i)~{RBs_xJG*KGP%Ao`c_wlCdlUdBgW P^548?f4cAfi3|(?e0N7M literal 0 HcmV?d00001 diff --git a/assets/image/3x/icon_pl.webp b/assets/image/3x/icon_pl.webp index d0a79b70b6cf2e108a33dfcbcb8a84c4ce3eeb80..abc8b393f23168c285cc6f18748244c3e02dabbb 100644 GIT binary patch literal 1912 zcmaixdpy)>7r-B^O)g8QmT_;is+U2^xW$gdATuFT5xI@R7`NfWU>a1mvgFcIuT@#H zG1g^_YPP03lgp6ZVaztO+hxWsQVpgt4f~t=l>X@bywC4B=X{@Y&gVSm_nct#u3f3C z0Koa6uwhu_K1~3CJtW!hHrm@8+ou8@fl8lJe*uLEDVgcPz9@@*`wv(seIHhIY)0w_ z{)~mHEO5cQTBEj~iT^*>>bUrfSSaZwB=B_Ta;PUmhz%3ovyGBt-m|-svoljOp&YD| z(?f&3A&!ICCgBr~`GjLr)0O$Bp&WNYGD&%taw$93j!)Se0$B}6Oh5(*2EG8b^8dt3 z03hc9P%B^Y#nb}Oa}0p5Csus$3jpXA1Hj;{_*UK|H99>Sst-LfB&v8k0Ix3tptBzU zgJA$P!{5aq^*?&EfI=ovUqt9j0LdU8SO7Fg0kOaiB1dSb4q!Vp;XtZ70Ep~crh1fT zn=9b=ubkuMYe#WdN53h%MnERQ*=HP?V`RU6^WJZ-j$O}Mi)OS8OzUWPfh8@^t9|up zMm>aQNHk|UGH6!I%L1D)M0%nhDhaWy_7rl{0;XFOSC3p!iBU-VSN=9D_~%3h&l=^vA^rsz-p;pwb9KY z^*9YGn5WlR-LZR+JKTT#pR^6w(L(ISOQ+p=piZi$SOYOsaKH4g-6P+$C#n`r{n3^1nFfmQ0*#(wLyL+5|t5W@# z^&W=JHW6ox&PPtTZ$wwXpnDqU!n+B>&6)@7FD+3*gx#nL_|MFw z#+Dtz<(4Y~p0{It7Lp%c{gk_%iK)n0E$<@aph@0t@Y>7mTSI?15z2MQ@E1J}N^pHR zXCxSU%V~Iv==NxJ4}OG1SHx+mRhC+xqjTyH8#FS+{Ixwp^IIM3vKWG&t@qB&R>b+= zNueD3s)!$#NFZb5VJ;SPnM6iu)`mw)Gcg6VLZuy4%>icBT{lK~6^Y=2{ zE7`y(*a4w$?{&O$JT>t_=!=cG@U&B;v-A;s%SoR2M%ucmd<;t>@wEEPTF#S*o@U3k z@6dHK)80iGvIN+xyk6nE-s$`ukiNwXHh z_gav8K7)F-!UV7=^oXM~fbHR62dPy|LFnsi}73$gJbR(e|GPql72)P#TuSD{8ht zhAV44es(t@GT;7*%B;Jr+U&gTOz(udp0tFRU>$PwrXoFfSR|9j{`m4DM$5o$+vyg` zC|^LHy&+vuOM|-0VR3mUkJL5w{Z_blT^OzNdVDplD0Gj;VN>hCR(4u+wN}1>0*9{1 zd4=0O=ce21@q~QNRN?(&3HhF`lkNy>Sd2i5|C=%7@=;y893>Btpt9zx4=R$gcNk-| z2W3472dA0R0QqKHrB;oHQnMh6&qY90wSy6ZT6Ntey@l+XkaBU_^`y>*bz^ zf^QM^uhHo;!!Fr|-}897N1pdPNs6R96m5wGFZs?fk|Mn1B3{D6OCD!Qo$o41Tcbt8o&iGVg#{@iglmFfD;x? z08!B@MsURn5pbbaq%MFPP>Tv`716q≀Hz<(f*LjiuPJx*5%Mwq2*|!bq9ePS| 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 diff --git a/assets/image/3x/icon_scan_qr_code.webp b/assets/image/3x/icon_scan_qr_code.webp index e990082000566ce3772b0c2d472f2d547e42c773..ab7e546a12c185cc3504fd02cf5cf67a007a873f 100644 GIT binary patch literal 766 zcmWIYbaVU0#J~{l>J$(bU=hK^z`$St#O`3^>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m>~!lJWdGz=PzPlu=vWrz&rsVmNb)rVS6hBgTyU_n92eM2L2WXhHd8& zVu&y)NGwVOnhy+QAZAKSV_^8SoPmKil7T_^0s{kAG*}Ku;BcD)P)Y{qu6!U&XUJhl zWl&)7WXNMkX3zt&jDV49$Y2JHVIK}g1_pii1A+qX3s&SxuXwxd|5^FVH#D3`e&7FN*gLVw!)(QOXXdXgfp!cJ{(pZrFD3OEV}J{fr-#ymE8E_# znkD7HC|VjOpnBmk1Mi3b+kE%w?>AcXpXZKQ(3DgwnJQ+Ov$4==+f_U#LC_PE%IC8} zPJS+*m%H@Y+$B+YicjZPiF{P_=5N$|cv`vk#1rQaUOzs0$Zy&^drC(wZ$BuIV1VuH zB%OErzkIOKefTLla=WU{?fJg8SBzJrpPn)0SXIe>Iq9H&-Briu^~>*iy7+ac4Xk~AcWKq@H|fm9PH6@NIJ%Ds1g5&fTl>rXpGROL0o z>oFw{@t1W4e=dX)guKQk8tcue#GLZp@ensvxrVtpI(n{lHaEPb%Du}um6%grV-t<_ a2qg%401^OxF5%b2l)O%@H_WKKe<}bUe@A%$ diff --git a/assets/image/3x/icon_system_message.webp b/assets/image/3x/icon_system_message.webp index e6d478bc6e29eda0fe395f82658a9e24ef2ec804..e82bf99e1cde3d091280de3494d2c500610916f4 100644 GIT binary patch literal 4798 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 I^l!|60Ht)0!TZIhor zx>ya62Oq?tSD}j@17^`Dl!-n_Q}B! z=oA?tcZH`2ihwB!NUEcx5>AP!6k`}&pOE;S5|aJHSBPNxwJ0PDKAFfE=v`{&{;tGHPh=Jbwd=Ji2`&kJ~b^eSDF_j@sBs~+vc#<3GzDdmWfV%QmTzQ$?JwIpb5Ca>k0i~y;JI8-- zCl-R#0RYXnJIA_G4V$ zw$^2oEJM7whiF@ zEG%g(z<49+P&J_b5lIKi07J~A=@z(VO1j(;sGMb{%bkJVlJ30%xXzm??ehe%GNklR z0M?mFvq}MHCH>$AmKbVz1z?k;-@U+WLoF>2?3MJ32bgE5870B>uaxy|5nz>>(mr)T z4M`8*12|x&GcN$|OG+IKSdY#0XChduB^_@9_++H1Wq>YMB(3rSUpQ8WsI0FFl$b0@ zZvu(y9IJg){zwG+U6T~74759Aq$wq#xtTc8GEX&>4K9Z!H!#u$7hfeWR%;o%jGEnv(IpwiNg~48&03?r*WBxy_Vj(!u0`LsI z=^T2vvPFJ6#K79hK%@O~)CY?`7}O_w-?`a_7mMDhwyuPlTjl6ie`^pmZT|ABEpqtq z(N_|qrOb3W|KmB$i$=+iM?bF>2PnL$YaAfiqw9Ihr;P1ymCeK8R6|Mk*FNRS<)ypE zl5T!f&7IBrV}`+`bt6gwt@p|7p>^-}`uM1AxF@I$#RIqZ#shoj#RK#Fw)t#-gX88q z-oP3eFt3>Z1Hp)?BEf){oZY^W$88hY$4C0y U>sI4gdfE diff --git a/assets/image/3x/icon_z.webp b/assets/image/3x/icon_z.webp index b26cd79c2c0db05f4805099742b5911747b3e2ce..953f1d79b6707385e7c35cba021e8e50f98f023b 100644 GIT binary patch literal 2002 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 diff --git a/assets/image/icon_chat.webp b/assets/image/icon_chat.webp new file mode 100644 index 0000000000000000000000000000000000000000..4bd90fb9cb13de2d647b89f39c30d38dc08d7cc7 GIT binary patch literal 798 zcmWIYbaNA9W?%?+bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qt@nvV z^_;!6`H#-q85S`Jh;Z?8*fAX7jtFc>VD^!zU}XKlXx`++z}s-_$PqRUDTaex4_ew8 zxENR&7&^A*&R!Qbr{;EAj`iyQ%i;=}xs-mbKaeY(dZv9n%;69^&wZ8EF5c+!)wdEC z8pP-ph(Bnn%X|0G`?YlR3+vw2Z!+_5#@{}$er|61n_tXJN`5~yWeq*Q?eNa4p)bGP zjyiA2a4Rj*u6<2z!j2}Jn2gEcwF{SuPl$J97W#E$quj?OoGW(wSLEbbr^_7docz|{ zlgNvo`+D!c$?f^c|2f{I{&DM<ev1tZ}$F80o~^Q S{MS#eHUAWQPUaOe69WK?Im^`m literal 0 HcmV?d00001 diff --git a/assets/image/icon_cz.webp b/assets/image/icon_cz.webp new file mode 100644 index 0000000000000000000000000000000000000000..c769ed49f347b8bc00867918afce3c5ab205a9a6 GIT binary patch literal 790 zcmWIYbaUflW?%?+bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qd_0&_zQoIB-SQ|}Z2j9ZJl=k@`5CvOEx+Tsoh_P$cTPC*|6l8x6)!#u^}4Lp zTGi#k)F8FRB`EZWkmJ7J92L)B*)kkasuuCinW($Lbz{a`X48xnj2sON4Tn!`oBL$a zI?LxeRlna0R=)rEMq$x^t~=WTt=b+}vobI^+?vZ$1M6mk!l= literal 0 HcmV?d00001 diff --git a/assets/image/icon_gz.webp b/assets/image/icon_gz.webp index 9e2a50c107f1fe7350e89bcd4ed3fdbb11003572..42b9de8715839477e291a166aec1559c97f2a9b1 100644 GIT binary patch literal 870 zcmWIYbaRViW?%?+bqWXzu!!JdU|=u+Vs$X`baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qgXO6o(&&^_nN>&&j0O}aAY zu-k+ncFn)jSsR!1zP|r6T*Na-`YpGfM?KF6B?h~DPpcl-{d2!?@p@z42hRu<1qGG& zsX0N-Ek{HpStSJ|Im0zHiWd8vI%7LQ!{UpmkVB4&=fsfH(Z|1^iTQVX$CbO6-#fVc z7u}Y7o2Br3!Svt2WCsMH#uHR5O+-P=ij~t;Jd0wlx&_O6R(0x4TIFdpX+`Xplq=Qj z%97tNI#2w)m38XGi(Kr=r){g^7JiOCE;+H<^PbAf?Ct;K)GD^F?-Ty-IZ4H{`~S_r z)WRQAZT@ex2<>%zsPVJTz{B_ZodpHGH?As}MtE2C-6+mE?=NW0%CDYu(Rt7Jk0N$& z`T6IwUVn7=*m0+muU>4Z*!bby!jF^qqxY=&5%D~F=hW@lHtSx@_^w(oSD*XcA8y<3 ye*dRBcYR`FJiV&rE8pwB{rl{t)jNk&F;1pok7MM6+kP&iCw1pojqC%_3139?Ds7-_qu5&e%ARt<$3(N(@s z$VL)WfCJcj{MimkP1{J4we@%W@ePKn4YG~YJi#N(pXyNhA0A>%(S;B+ikldCOiWx9 z|2+Ue=eBLr)-1p8&$ewuw!bg5S&S-jX4^KS4{=pw+qP{#-l`q!b^h9^;_I1@k>q_%xldEohQCTp3dxh8Gh*|v~mv+~=N zMk?vc!SBB&sZ2V1_qW%*`=5_a^7hI)x4Qw_mfL*+oAg zq!18i<IeV@l+YiY55_G_Vnih0Ta z0fSR@i!ELLtaRE%ujnHUHmz#<@^k_ELT&SsmQ7p;7vh!6rm2neVY0IWiY0wioX zO;JP$MaBzK0)PMl0Hb5|tck5`e7Skzj-LQ5mX?56$Q9Zlr18;Nu3UuxAi&x(m)&P| zErgK9=Flqu0$2bn0w5rh`|tcWNvNC;s!*>^7F*4NE*I{@ywtc?>M$ANQnEf6aJ01_OU`=JBR$1?x` zHDm(T8aZUY41iRJ6fpfXhg0RRL5(lMW1%Y+ah1V|wU2l>tb03hP~g$yi(006=Q zBG^4h*?JJV7N z2(Z?-jy?3~AcVB+xc@>30U!hj2mpYr7N`&qc9prq*Ly5(O=!Ruo0oS?XmsfSLVyqg z0!pn!Hc$wJBaBo39g`-1?|6O3cRR?~#=J(qj!XN-2uA@#iv)=*egl9)NHk0?`23l{ zM$?Wy4MGUXn`Yzs^R-*%8^a7j2oL~L;J2g+0U!hjfUr6L^G7orZ^yOw7-r3C3~eO* zvg3XE&H8q8e^wz^M#Vq?h(aJ10E7hu zB+k0_gJ0g0`c%wji$X$(4OE2$v|)AV!Z diff --git a/assets/image/icon_order.webp b/assets/image/icon_order.webp new file mode 100644 index 0000000000000000000000000000000000000000..c6b9f905283f5d2eb52de23f997e431f43d51621 GIT binary patch literal 724 zcmWIYbaOky#J~{l>J$(bU=hK^z`$St#NuG&>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m?4P4oxus=|NKP^3>IG*7?>v@#FAz*Fl=vSV34?l5K~#ez`)m$qafxmJu*g4H?XUG3;{}s8C=00IR_C1v_%3-Ctg>Z=e0|Ti7KJq2lsC z+|@t$y6TJ9t4&&BVK@1nY<>#^SENLmvgNJX^+y%w9PEr?`13ctNbq6p0fwsQv$irg za+Ln^;GX*QuJWZ7z8V%h2h4IqF0EMcf4=UCi*_9^_A_nIoznO4M;s#q!v%j8OJFGN zFrTDSsebI#YmZGuR+AfZJ_h`p=&crW=G$Zy&nkQMVr|RWFN5b?pYcfKcoO%IgV9xx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qprx9zA&%tk;kM- zws+pXWc;A^|3biRw@I6-Klog9kAG8M*QMl{wYc^m>&t$|IF^R?`+IK-xBai@>0ozp z-owDT;fi`%&vvhtPjl{m=TQFY`8D-EcffpRKIRR+(o%o3m@KSA(%JOwU=Kz!6E6+(P`*;7!$W-tQmrz}kJw zbk&1uZ7b!~p?YrD*nh{js{mDdR*C#O|0Mimn^T%c5&r_0x#jhuU3Y!OX6bS3&x?+! z^Di{6aP2OQoR$hi)rBpa&{4MykE&N6F itbfmLHkBV=bY=lzu2}_+3wP&QkyJQB zwE~rnwX>BJbNs%HaRK7a01k09H0m4wB$Fn{HYGwVFcL-xDl|e3qY@w+M?d)AD74(U z5QLN?_`$^^g{qdpd!KXdmlQ}`zsU|c1~3Ie&Lj}``n@6hQ4oL+UN=A?w(N+Mn@@qSzTw^!@Jj zcl1y;%^~*bH|{QXB?E~20gt^;1tDXqv%jxJL0+_9^i}9_3tJh^cea>s-WCE}=Lia> zMFkQt)hmz(mZUb6ia7PS|;Xp0@bMi06{p{iq-_u3B~}>Z~`QonNczQ4iz*=6U5aZ;i-F&Yet>{m5n2#D$yuJhR!tr2v;aJrDpR8MpxJ mpyTiN6_JgDwN?%H8l*JCYY3zyaYe)#taUc0r#1)vWdHzt8y5Zm diff --git a/assets/image/icon_scan_qr_code.webp b/assets/image/icon_scan_qr_code.webp index fef2d544b9d0f4279781ea4380f3443256cffd52..afe8afde72f86a8023ae63bffc3e2f38d7e3252e 100644 GIT binary patch literal 600 zcmWIYbaM+}Vqge&bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34q0g73aRQ$Gt#P`UK~bYp|c#DDR8 zEGnM=?#rmn0Ox9c`G{MRz*Qt=Gbm0cMv qyEtoquvNc`%a?klANHmWqIwbWY(Ddh@7>{>QE>3rBCeGO{{sNy_#gKG diff --git a/assets/image/icon_system_message.webp b/assets/image/icon_system_message.webp index 8a42f3861955cef7d650a745e71b80fe2e3b866e..c7f691869ed6730e601a97a7a971f4a5a89e2686 100644 GIT binary patch literal 892 zcmWIYbaN|VW?%?+bqWXzu!!JdU|=u+Vs$X`baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qAw=* zKD_n(;F+5Hr{@1U`DE(J=^S&#e+&HYtLeM*WNlrI-Tax+Z3my;jGp!P*-OV+`6 Yo%L_&%gkAJ=`a7*|B=u9FUY_E03q!TlmGw# literal 340 zcmV-a0jvH}Nk&FY0RRA3MM6+kP&iCL0RR9mE5Hf>r=p;38!7xD-&50I*tU(M>_6|7 zFNw*pZQDrRf8q8XoAVzCi2&;gDuQ4t0byOs{P(l}Cu0WQeZ1%Ozh4ON{e*X~go=9WD1*M5Z3lgw*z3GVXWbJi}pgBeBbc^_tvnxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34qYF0&|qF4&TdT=2G2<{u0dwye8w;T^UF>Oin4J35}$Z`Td&~aYV~*gU_Y4L zb(!?!iYbUK@U&`@%E|M~;?DA_NT#x>UZ1pNQl@j?lC0zdGq2?K&DgZV^x}#$)8_P? znf)*B`sOcnLT9f9ekv2{-6j;{zJ&8^uM@AY`X`CUFP~qu`<9lL_Ra9izLIZ`Kc$sD zI(X)MMt{bC&N9iCmF5Pm-KX_hTYvBK<=VGjp?U4=3+wFd@7>t3Qr}blVVGb+(jL!U hps{)qkr&fh7t52c8-R_nY-B3;@si*E;|J literal 1402 zcmV-=1%>)jNk&F;1pok7MM6+kP&iCx1pojqC%_312{UcmsB^#aM?4Y{{ST6UTyDy0 zER;l&8Cw(Uk?@cl~Bwrz2%yUdE2$)n^Y@ETH8$BJBCK25Psf$V;I*sXBd@J*NSip;u}&hG;46t(IT_Nu z3!?f)74vCJq=Kj>AcS&=gpI7#^-jK_G>IuvU&RW!g-Rl!m}=`^T5P+tlyO~oGKU2h z%Zeh>HC;{)q+Hvihl44pnO!qxtd+Jz(baJtW|*V`ALg+y+s@_ z%2JK20x+!8*T3?f>w2^(lw}UV=Jj_JGXVhvx7c7?Owy@Fn*VPxE}5y8RmdX7&wBjR zP@1MU7Dn%O(=}gtCeEP*KWpsi(K1#@8}yf{0DS76r|tE)?TEJ0PD30w4)D4czVP0d zZo~`?4w-FplTAo&eA2Hzh|nk|8_b3@;5%>q?>C@Vn;xwIAdi`^H{x$?2mvw)#1ZrD zX{P`G2JNB4z2I+9b7x{Uvx!ZPhMX zX>sEW-0C%33~NIKngBV;*+3f%f`PIL2_U78QkIcD6{G|tNs{CV;;Kw!rFaO=U@*ZT zfs!NvZa21D^VUQOTW6b4ycAt_mNKcR6-$WU5)MNmF=;J)1tq3*6d4R&dEuN0ARvIjxd>tk2-aI; zsnI0}MEwUV(uhRYEd5L41x(jc=3G3d+zS;E0004KYbgUt)~n&$$TLaJIRQeZ5g396 zl92qchHs#3;78>Z5E8XChd|&AM5cHKKR}&|~bIa);kjwUz&5zv)^SFj1XzO1ptib)h3l1Is~L@VVwf}%kAT_TsnhOzLz I#_gKF3~Ez-v;Y7A diff --git a/lib/login/new_login_page.dart b/lib/login/new_login_page.dart index 4edfb2e4..78229327 100644 --- a/lib/login/new_login_page.dart +++ b/lib/login/new_login_page.dart @@ -416,7 +416,7 @@ class _NewLoginPage extends State { Container( height: 30.h, width: MediaQuery.of(context).size.width - 100.w, - margin: EdgeInsets.only(bottom: 10.h), + margin: EdgeInsets.only(bottom:5.h), child: TextField( style: TextStyle( height: 1.h, diff --git a/lib/main.dart b/lib/main.dart index 236b1317..d3e6be7a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -98,6 +98,7 @@ import 'login/new_login_page.dart'; import 'login/phone_address_page.dart'; import 'main_page.dart'; import 'message/system_details.dart'; +import 'message/system_notice.dart'; import 'mine/coupon_page.dart'; import 'mine/edit_signature.dart'; import 'mine/invitation_record.dart'; @@ -423,4 +424,6 @@ Map routers = { ScanWeb(arguments:arguments), '/router/vip_pay_code': (context, {arguments}) => VipPayCode(), + '/router/system_notice': (context, {arguments}) => + SystemNotice(), }; diff --git a/lib/message/system_message.dart b/lib/message/system_message.dart index 48eeff31..c253b071 100644 --- a/lib/message/system_message.dart +++ b/lib/message/system_message.dart @@ -204,14 +204,13 @@ class _SystemMessagePage extends State { ), ), ), - Spacer(), Expanded( child: Text( S.of(context).xiaoxi, style: TextStyle( color: Colors.black, - fontSize: 16.sp, - fontWeight: MyFontWeight.regular, + fontSize: 18.sp, + fontWeight: MyFontWeight.bold, ), )), GestureDetector( @@ -236,11 +235,59 @@ class _SystemMessagePage extends State { ], ), ), - newsSurvey(), - SizedBox( - height: 16.h, + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: (){ + Navigator.of(context).pushNamed('/router/system_details', + arguments: {"msgType": 6}).then((value) { + setState(() { + msgNumber["6"] = 0; + }); + }); + }, + child:messageItem("assets/image/icon_pl.webp", S.of(context).pinglun, msgNumber["6"].toString()), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: (){ + Navigator.of(context).pushNamed('/router/system_details', + arguments: {"msgType": 5}).then((value) { + setState(() { + msgNumber["5"] = 0; + }); + }); + }, + child: messageItem("assets/image/icon_z.webp", S.of(context).dianzan, msgNumber["5"].toString()), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: (){ + Navigator.of(context).pushNamed('/router/system_details', + arguments: {"msgType": 4}).then((value) { + setState(() { + msgNumber["4"] = 0; + }); + }); + }, + child:messageItem("assets/image/icon_gz.webp", S.of(context).guanzhu,msgNumber["4"].toString()), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: (){ + Navigator.of(context).pushNamed('/router/system_notice').then((value) { + setState(() { + msgNumber["2"] = 0; + msgNumber["3"] = 0; + }); + }); + }, + child:messageItem("assets/image/icon_system_message.webp", S.of(context).xitongxiaoxi, (msgNumber["2"]+msgNumber["3"]).toString()), ), - buildMessage(), + // newsSurvey(), + // SizedBox( + // height: 16.h, + // ), + // buildMessage(), ], ), ), @@ -250,6 +297,83 @@ class _SystemMessagePage extends State { ); } + Widget messageItem(img, title, messageNum) { + return Container( + padding: EdgeInsets.only(top:14.h, left:14.w, bottom:10.h, right:14.w), + decoration: BoxDecoration( + color: Colors.white, + ), + child: Column( + children: [ + Row( + children: [ + Image.asset( + img, + fit: BoxFit.fill, + ), + SizedBox( + width: 12.w, + ), + Text( + title, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF060606), + fontWeight: MyFontWeight.semi_bold, + ), + ), + SizedBox( + width: 9.w, + ), + if(messageNum != "0") + ((double.tryParse(messageNum) < 100)? + Container( + width: 16, + height: 16, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(100), + color: Color(0xFFFF441A), + ), + child: RoundButton( + text:messageNum, + textColor: Colors.white, + fontWeight: MyFontWeight.regular, + backgroup: Color(0xFFFF441A), + fontSize: 10.sp, + radius: 100, + )): + Container( + padding: EdgeInsets.symmetric(horizontal:4.w,vertical:2.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(100), + color: Color(0xFFFF441A), + ), + child: RoundButton( + text:"99+", + textColor: Colors.white, + fontWeight: MyFontWeight.regular, + backgroup: Color(0xFFFF441A), + fontSize: 10.sp, + radius: 100, + ))), + Spacer(), + Icon( + Icons.keyboard_arrow_right, + size: 24, + ), + ], + ), + Container( + margin: EdgeInsets.only(top: 12.h), + width: double.infinity, + height: 1.h, + color: Color(0xFFF7F7F7), + ) + ], + ), + ); + } + Widget newsSurvey() { return Container( color: Colors.white, diff --git a/lib/message/system_notice.dart b/lib/message/system_notice.dart new file mode 100644 index 00000000..47d23f30 --- /dev/null +++ b/lib/message/system_notice.dart @@ -0,0 +1,323 @@ +import 'dart:convert'; + +import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/base_data.dart'; +import 'package:huixiang/retrofit/data/message.dart'; +import 'package:huixiang/retrofit/data/page.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/classic_header.dart'; +import 'package:huixiang/view_widget/custom_image.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:huixiang/view_widget/my_footer.dart'; +import 'package:huixiang/view_widget/no_data_view.dart'; +import 'package:huixiang/view_widget/round_button.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class SystemNotice extends StatefulWidget { + + @override + State createState() { + return _SystemNotice(); + } +} + +class _SystemNotice extends State { + ApiService apiService; + int pageNum = 1; + List messages = []; + int msgType = 0; + + // String parenId = "0"; + var commentFocus = FocusNode(); + String hintText = S.current.liuxianinjingcaidepinglunba; + bool isKeyBoardShow = false; + final GlobalKey commentKey = GlobalKey(); + final GlobalKey inputKey = GlobalKey(); + final TextEditingController commentTextController = TextEditingController(); + int indexMsg = 0; + + @override + void initState() { + super.initState(); + // msgType = widget.arguments["msgType"]; + + SharedPreferences.getInstance().then((value) { + apiService = + ApiService(Dio(), token: value.getString("token"), context: context); + queryMessage(); + }); + } + + _refresh() { + pageNum = 1; + queryMessage(); + } + + queryMessage() async { + BaseData> baseData = await apiService.msgList({ + "pageNum": pageNum, + "pageSize": 10, + "searchKey": "", + "state": "", + "typed": "" + }).catchError((onError) { + _refreshController.loadFailed(); + _refreshController.refreshFailed(); + }); + + if (baseData != null && baseData.isSuccess) { + if (pageNum == 1) { + messages.clear(); + } + List message = []; + message.addAll(baseData.data.list); + message.forEach((element) { + if (element.typed == 2 || element.typed == 3) { + messages.add(element); + } + }); + _refreshController.loadComplete(); + _refreshController.refreshCompleted(); + if (mounted) setState(() {}); + if (pageNum * 10 > int.tryParse(baseData.data.total)) { + _refreshController.loadNoData(); + } else { + pageNum += 1; + } + } else { + _refreshController.loadFailed(); + _refreshController.refreshFailed(); + } + } + + RefreshController _refreshController = RefreshController(); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: SmartRefresher( + enablePullDown: true, + enablePullUp: true, + header: MyHeader(), + physics: BouncingScrollPhysics(), + footer: CustomFooter( + loadStyle: LoadStyle.ShowWhenLoading, + builder: (BuildContext context, LoadStatus mode) { + return (messages.length == 0) ? Container() : MyFooter(mode); + }, + ), + controller: _refreshController, + onRefresh: _refresh, + onLoading: () { + queryMessage(); + }, + child: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + child: Column( + children: [ + Container( + color: Colors.white, + padding: EdgeInsets.only( + top: MediaQuery.of(context).padding.top + 10.h, + bottom: 10.h, + right: 16.w), + child: Row( + children: [ + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + Navigator.of(context).pop(); + }, + child: Container( + alignment: Alignment.centerRight, + margin: EdgeInsets.only( + left: 12, + ), + padding: EdgeInsets.all(6), + child: Icon( + Icons.arrow_back_ios, + color: Colors.black, + size: 24, + ), + ), + ), + Text( + "消息通知", + style: TextStyle( + color: Colors.black, + fontSize: 18.sp, + fontWeight: MyFontWeight.bold, + ), + ), + ], + ), + ), + buildMessage() + ], + ), + ), + ), + ), + ), + ); + } + + Widget buildMessage() { + return Container( + color: Colors.white, + width: double.infinity, + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (messages == null || messages.length == 0) + ? NoDataView( + src: "assets/image/icon_empty.webp", + isShowBtn: false, + text: S.of(context).haimeiyouxiaoxi, + fontSize: 16.sp, + margin: EdgeInsets.only(top: 120.h), + ) + : ListView.builder( + padding: EdgeInsets.only(top: 16), + itemCount: messages.length, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + itemBuilder: (context, position) { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + if (messages[position].typed == 2) + Navigator.of(context).pushNamed( + '/router/system_details', + arguments: {"msgType": 2}); + else if (messages[position].typed == 3) + Navigator.of(context).pushNamed( + '/router/system_details', + arguments: {"msgType": 3}); + }, + child: buildMessageItem(messages[position]), + ); + }), + ], + )); + } + + Widget buildMessageItem(Message message) { + return Container( + margin: EdgeInsets.only(top: 8.h, bottom: 8.h,left: 16.w,right: 17.w), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset( + (message.typed == 1) + ? "assets/image/icon_order.webp" + : (message.typed == 2) + ? "assets/image/icon_order.webp" + : "assets/image/icon_cz.webp", + width: 24.w, + height: 24.h, + ), + SizedBox( + width: 8.w, + ), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Expanded( + child: Text( + (message.typed == 1) + ? S.of(context).xitongtongzhi + : (message.typed == 2) + ? S.of(context).dingdanxiaoxi + : S.of(context).chongzhixiaoxi, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF060606), + ), + )), + Text( + message.updateTime, + style: TextStyle( + fontSize: 10.sp, + color: Color(0xFFA29E9E), + ), + ), + ], + ), + SizedBox( + height: 24.h, + ), + (message.typed != 3) + ? Row( + mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Text( + S.of(context).ninyouyigexindedingdan, + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF353535), + ), + ), + ), + Icon( + Icons.keyboard_arrow_right, + size: 24, + ), + ], + ) + : Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Expanded( + child: Text( + message.content, + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF353535), + ), + )), + + Icon( + Icons.keyboard_arrow_right, + size: 24, + ), + ], + ), + Container( + margin: EdgeInsets.only(top: 16.h, bottom: 8.h), + height: 1.h, + width: double.infinity, + color: Color(0xFFF7F7F7), + ), + ], + ), + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index e0292ffe..f8b5c7d0 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -76,6 +76,7 @@ class _MineView extends State { Container( height: 24.h, alignment: Alignment.center, + margin: EdgeInsets.only(right: 12.w), child: GestureDetector( onTap: () { Navigator.of(context) @@ -90,10 +91,9 @@ class _MineView extends State { child: Stack( children: [ Image.asset( - "assets/image/icon_notices.webp", - width: 32, - height: 32, - color: Colors.white, + "assets/image/icon_chat.webp", + width:24, + height: 24, ), if (widget.totalMsg != 0) Container( @@ -128,12 +128,11 @@ class _MineView extends State { toScan(); }, child: Container( - padding: EdgeInsets.all(8.h), + padding: EdgeInsets.only(left: 12.w,right:16.w,top:8.h,bottom:8.h), child: Image.asset( "assets/image/icon_scan_qr_code.webp", - width: 32, - height: 32, - color: Colors.white, + width: 22, + height: 22, ), ), ), diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 3b672481..a9fac982 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -15,9 +15,13 @@ import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import '../utils/flutter_utils.dart'; +import '../view_widget/classic_header.dart'; +import '../view_widget/my_footer.dart'; import 'order_utils.dart'; class OrderDetailPage extends StatefulWidget { @@ -35,17 +39,14 @@ class _OrderDetailPage extends State { ApiService apiService; MinApiService minService; int jumpState; + final RefreshController refreshController = RefreshController(); @override void initState() { super.initState(); SharedPreferences.getInstance().then((value) { - apiService = ApiService( - Dio(), - context: context, - token: value.getString("token"), - showLoading: true - ); + apiService = ApiService(Dio(), + context: context, token: value.getString("token"), showLoading: true); queryDetails(); }); jumpState = widget.arguments["jumpState"]; @@ -89,17 +90,20 @@ class _OrderDetailPage extends State { queryDetails() async { if (apiService == null) { - SharedPreferences value = await SharedPreferences.getInstance(); - apiService = ApiService( - Dio(), - context: context, - token: value.getString("token"), - showLoading: false - ); - } + SharedPreferences value = await SharedPreferences.getInstance(); + apiService = ApiService(Dio(), + context: context, + token: value.getString("token"), + showLoading: false); + } BaseData baseData = await apiService .orderDetail(widget.arguments["id"]) - .catchError((error) {}); + .catchError((error) { + SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type), + alignment: Alignment.center); + refreshController.refreshFailed(); + refreshController.loadFailed(); + }); if (baseData != null && baseData.isSuccess) { orderInfo = baseData.data; payStatus = orderInfo.payStatus; @@ -119,8 +123,12 @@ class _OrderDetailPage extends State { setState(() { statusTitle(); }); - }else{ - SmartDialog.showToast(baseData.msg,alignment: Alignment.center); + refreshController.refreshCompleted(); + refreshController.loadComplete(); + } else { + SmartDialog.showToast(baseData.msg, alignment: Alignment.center); + refreshController.refreshFailed(); + refreshController.loadFailed(); } } @@ -155,27 +163,31 @@ class _OrderDetailPage extends State { leadingColor: Colors.white, brightness: Brightness.dark, ), - body: Container( - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Container( - child: Column( - children: [ - ///订单状态显示 - OrderStatus( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - orderInfo, - ), - - ///订单取货地址，或， 收货地址 - if(orderInfo != null && orderInfo.addressExt != null) - OrderAddress( + body: SmartRefresher( + controller: refreshController, + enablePullDown: true, + enablePullUp: false, + header: MyHeader(), + footer: CustomFooter( + builder: (context, mode) { + return MyFooter(mode); + }, + ), + onRefresh:(){ + setState(() { + queryDetails(); + }); + }, + physics: BouncingScrollPhysics(), + scrollController: ScrollController(), + child: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + child: Column( + children: [ + ///订单状态显示 + OrderStatus( orderStatus, isTakeOut, sendStatus, @@ -183,24 +195,38 @@ class _OrderDetailPage extends State { refundStatus, title, center, - paySelected, - _orderCancel, orderInfo, - jumpState ), - ///订单商品 - if(orderInfo != null) - OrderCommodity(orderInfo), + ///订单取货地址，或， 收货地址 + if(orderInfo != null && orderInfo.addressExt != null) + OrderAddress( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + paySelected, + _orderCancel, + orderInfo, + jumpState + ), + + ///订单商品 + if(orderInfo != null) + OrderCommodity(orderInfo), - ///显示订单信息 - if(orderInfo != null) - OrderInfoView(orderInfo, isTakeOut), + ///显示订单信息 + if(orderInfo != null) + OrderInfoView(orderInfo, isTakeOut), - Container( - height: 42.h, - ), - ], + Container( + height: 42.h, + ), + ], + ), ), ), ), @@ -227,11 +253,12 @@ class _OrderDetailPage extends State { } } - payResult(BaseData baseData) async{ + payResult(BaseData baseData) async { await queryDetails(); Future.delayed(Duration(milliseconds: 800), () { EasyLoading.dismiss(); - SmartDialog.showToast(baseData?.msg == "ok" ?"订单支付成功" :baseData?.msg,alignment: Alignment.center); + SmartDialog.showToast(baseData?.msg == "ok" ? "订单支付成功" : baseData?.msg, + alignment: Alignment.center); }); } @@ -525,10 +552,10 @@ class _OrderDetailPage extends State { if (baseData != null && baseData.isSuccess) { SmartDialog.showToast("订单取消成功"); // Future.delayed(Duration(milliseconds:450), () { - queryDetails(); + queryDetails(); // }); - }else{ - SmartDialog.showToast(baseData.msg,alignment: Alignment.center); + } else { + SmartDialog.showToast(baseData.msg, alignment: Alignment.center); } } diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index bd3cbc32..4abeec11 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -84,7 +84,7 @@ class NewCouponWidget extends StatelessWidget { children: [ Text( "${coupon != null ? coupon.couponName ?? "" : ""}", - maxLines: 1, + maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 15.sp, From a3edc6b49f62a8c748f89ebf5455543032974d3f Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Sat, 18 Mar 2023 14:18:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B6=88=E6=81=AFui=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/message/system_details.dart | 4 +- lib/message/system_message.dart | 4 +- lib/order/order_detail_page.dart | 85 ++++++++++++++------------------ 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index efdc1d6e..7e70d7f0 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -243,7 +243,7 @@ class _SystemDetails extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 24.w, height: 24.h, ), @@ -370,7 +370,7 @@ class _SystemDetails extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 24.w, height: 24.h, ), diff --git a/lib/message/system_message.dart b/lib/message/system_message.dart index c253b071..7312b58b 100644 --- a/lib/message/system_message.dart +++ b/lib/message/system_message.dart @@ -154,6 +154,7 @@ class _SystemMessagePage extends State { // ), // ], // ), + backgroundColor: Colors.white, body: SmartRefresher( enablePullDown: true, enablePullUp: true, @@ -363,6 +364,7 @@ class _SystemMessagePage extends State { ), ], ), + if(title != S.of(context).xitongxiaoxi) Container( margin: EdgeInsets.only(top: 12.h), width: double.infinity, @@ -643,7 +645,7 @@ class _SystemMessagePage extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 40.w, height: 40.h, ), diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index a9fac982..0d9344aa 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -174,61 +174,52 @@ class _OrderDetailPage extends State { }, ), onRefresh:(){ - setState(() { - queryDetails(); - }); + queryDetails(); }, physics: BouncingScrollPhysics(), scrollController: ScrollController(), - child: Container( - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Container( - child: Column( - children: [ - ///订单状态显示 - OrderStatus( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - orderInfo, - ), + child: Column( + children: [ + ///订单状态显示 + OrderStatus( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + orderInfo, + ), - ///订单取货地址，或， 收货地址 - if(orderInfo != null && orderInfo.addressExt != null) - OrderAddress( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - paySelected, - _orderCancel, - orderInfo, - jumpState - ), + ///订单取货地址，或， 收货地址 + if(orderInfo != null && orderInfo.addressExt != null) + OrderAddress( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + paySelected, + _orderCancel, + orderInfo, + jumpState + ), - ///订单商品 - if(orderInfo != null) - OrderCommodity(orderInfo), + ///订单商品 + if(orderInfo != null) + OrderCommodity(orderInfo), - ///显示订单信息 - if(orderInfo != null) - OrderInfoView(orderInfo, isTakeOut), + ///显示订单信息 + if(orderInfo != null) + OrderInfoView(orderInfo, isTakeOut), - Container( - height: 42.h, - ), - ], - ), + Container( + height: 42.h, ), - ), + ], ), ), ) From 93de462bfc9a9f79c4864eb92aedadf4ae4d258c Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Wed, 22 Mar 2023 17:10:57 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9B=20=E4=BC=98=E5=8C=96=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=A2=9C=E8=89=B2=EF=BC=9B=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=88=B7=E6=96=B0?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/base_state.dart | 76 ++++++++++++++++------------- lib/main_page.dart | 25 +++++----- lib/order/order_detail_page.dart | 4 +- lib/view_widget/classic_header.dart | 7 ++- 4 files changed, 63 insertions(+), 49 deletions(-) diff --git a/lib/base_state.dart b/lib/base_state.dart index 916e047a..74dd3e55 100644 --- a/lib/base_state.dart +++ b/lib/base_state.dart @@ -6,6 +6,9 @@ import 'package:shared_preferences/shared_preferences.dart'; abstract class BaseState extends State with WidgetsBindingObserver { + + int lastTime = DateTime.now().millisecondsSinceEpoch; + @override void dispose() { super.dispose(); @@ -20,8 +23,11 @@ abstract class BaseState extends State break; case AppLifecycleState.resumed: //从后台切换前台，界面可见 pushRoute(); + if(DateTime.now().millisecondsSinceEpoch - lastTime > 300000) + Navigator.of(context).popAndPushNamed('/router/main_page'); break; case AppLifecycleState.paused: // 界面不可见，后台 + lastTime = DateTime.now().millisecondsSinceEpoch; break; case AppLifecycleState.detached: // APP结束时调用 break; @@ -49,41 +55,41 @@ abstract class BaseState extends State if (pushMap != null) { String routeName = ""; Map params = {}; - switch (pushMap["typed"]) { - case 1: - routeName = "/router/store_detail_page"; - params["articleId"] = pushMap["info"]; - break; - case 2: - routeName = "/router/store_detail_page"; - params["activityId"] = pushMap["info"]; - break; - case 3: - routeName = "/router/store_order"; - params["id"] = pushMap["info"]; - params["tenant"] = pushMap["tenant"]; - params["storeName"] = pushMap["storeName"]; - break; - case 4: - routeName = "/router/integral_store_page"; - params["goodsId"] = pushMap["info"]; - break; - case 5: - routeName = "/router/order_details"; - params["id"] = pushMap["info"]; - break; - case 6: - routeName = "/router/community_details"; - params["businessId"] = pushMap["info"]; - break; - case 8: - routeName = "/router/mine_wallet"; - params["id"] = pushMap["info"]; - break; - case 9: - routeName = "/router/welfare_page"; - params["id"] = pushMap["info"]; - break; + switch (pushMap["typed"].toString()) { + case "1":case "ARTICLE": + routeName = "/router/web_page"; + params["articleId"] = pushMap["info"]; + break; + case "2":case "ACTIVITY": + routeName = "/router/web_page"; + params["activityId"] = pushMap["info"]; + break; + case "3":case "SHOP": + routeName = "/router/store_order"; + params["id"] = pushMap["info"]; + params["tenant"] = pushMap["tenant"]; + params["storeName"] = pushMap["storeName"]; + break; + case "4":case "CREDIT_GOODS": + routeName = "/router/integral_store_page"; + params["goodsId"] = pushMap["info"]; + break; + case "5":case "ORDER": + routeName = "/router/order_details"; + params["id"] = pushMap["info"]; + break; + case "6":case "MEMBER": + routeName = "/router/community_details"; + params["businessId"] = pushMap["info"]; + break; + case "8":case "WALLET": + routeName = "/router/mine_wallet"; + params["id"] = pushMap["info"]; + break; + case "9":case "WELFARE": + routeName = "/router/welfare_page"; + params["id"] = pushMap["info"]; + break; } sharedPreferences.setString("pushData", ""); print("xgPushClickAction: routeName: $routeName"); diff --git a/lib/main_page.dart b/lib/main_page.dart index 85b3f8e2..18c3518f 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -57,7 +57,7 @@ class _MainPage extends State with WidgetsBindingObserver { final GlobalKey vipPageKey = GlobalKey(); // List iconn; ApiService apiService; - + int lastTime = DateTime.now().millisecondsSinceEpoch; @override void dispose() { @@ -73,8 +73,11 @@ class _MainPage extends State with WidgetsBindingObserver { break; case AppLifecycleState.resumed: //从后台切换前台，界面可见 pushRoute(); + if(DateTime.now().millisecondsSinceEpoch - lastTime > 300000) + Navigator.of(context).popAndPushNamed('/router/main_page'); break; case AppLifecycleState.paused: // 界面不可见，后台 + lastTime = DateTime.now().millisecondsSinceEpoch; break; case AppLifecycleState.detached: // APP结束时调用 break; @@ -224,7 +227,7 @@ class _MainPage extends State with WidgetsBindingObserver { ); } - /// @typed: 1文章 2活动 3店铺 4积分商品 5订单 6动态 7用户 8平台余额/钱包 9福利中心 + /// @typed: ARTICLE(1)文章 ACTIVITY(2)活动 SHOP(3)店铺 CREDIT_GOODS(4)积分商品 ORDER(5)订单 TREND(6)动态 MEMBER(7)用户 WALLET(8)平台余额/钱包 WELFARE(9)福利中心 xgFlutterPlugin.addEventHandler(xgPushClickAction: (event) async { print("xgPushClickAction1: $event"); if (event["actionType"] == 2) return event; @@ -288,38 +291,38 @@ class _MainPage extends State with WidgetsBindingObserver { if (pushMap != null) { String routeName = ""; Map params = {}; - switch (pushMap["typed"]) { - case 1: + switch (pushMap["typed"].toString()) { + case "1":case "ARTICLE": routeName = "/router/web_page"; params["articleId"] = pushMap["info"]; break; - case 2: + case "2":case "ACTIVITY": routeName = "/router/web_page"; params["activityId"] = pushMap["info"]; break; - case 3: + case "3":case "SHOP": routeName = "/router/store_order"; params["id"] = pushMap["info"]; params["tenant"] = pushMap["tenant"]; params["storeName"] = pushMap["storeName"]; break; - case 4: + case "4":case "CREDIT_GOODS": routeName = "/router/integral_store_page"; params["goodsId"] = pushMap["info"]; break; - case 5: + case "5":case "ORDER": routeName = "/router/order_details"; params["id"] = pushMap["info"]; break; - case 6: + case "6":case "MEMBER": routeName = "/router/community_details"; params["businessId"] = pushMap["info"]; break; - case 8: + case "8":case "WALLET": routeName = "/router/mine_wallet"; params["id"] = pushMap["info"]; break; - case 9: + case "9":case "WELFARE": routeName = "/router/welfare_page"; params["id"] = pushMap["info"]; break; diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 0d9344aa..37d61db5 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -167,7 +167,9 @@ class _OrderDetailPage extends State { controller: refreshController, enablePullDown: true, enablePullUp: false, - header: MyHeader(), + header: MyHeader( + color: Colors.white, + ), footer: CustomFooter( builder: (context, mode) { return MyFooter(mode); diff --git a/lib/view_widget/classic_header.dart b/lib/view_widget/classic_header.dart index 1bb7cccc..c744ceef 100644 --- a/lib/view_widget/classic_header.dart +++ b/lib/view_widget/classic_header.dart @@ -11,6 +11,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:rive/rive.dart'; class MyHeader extends StatelessWidget { + final Color color; + MyHeader({this.color}); + @override Widget build(BuildContext context) { return MyClassicHeader( @@ -22,11 +25,11 @@ class MyHeader extends StatelessWidget { idleText: S.of(context).xialashuaxin, iconPos: IconPosition.left, completeTextStyle: TextStyle( - color: Color(0xFF32A060), + color:color?? Color(0xFF32A060), ), completeIcon: Icon( Icons.done, - color: Color(0xFF32A060), + color: color??Color(0xFF32A060), ), refreshingIcon: SpinKitCircle( color: Colors.grey,