ios

ios/Podfile.lock

@@ -174,7 +174,7 @@ PODS:
   - SDWebImage (5.12.1):
     - SDWebImage/Core (= 5.12.1)
   - SDWebImage/Core (5.12.1)
-  - shared_preferences_ios (0.0.1):
+  - shared_preferences (0.0.1):
     - Flutter
   - sharesdk_plugin (1.1.2):
     - Flutter
@@ -224,7 +224,7 @@ PODS:
     - TPNS-iOS (= 1.3.4.1)
   - url_launcher (0.0.1):
     - Flutter
-  - video_player_avfoundation (0.0.1):
+  - video_player (0.0.1):
     - Flutter
   - wakelock (0.0.1):
     - Flutter
@@ -246,13 +246,13 @@ DEPENDENCIES:
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - scan (from `.symlinks/plugins/scan/ios`)
-  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`)
   - SSZipArchive (~> 2.4.2)
   - thumbnails (from `.symlinks/plugins/thumbnails/ios`)
   - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - video_player (from `.symlinks/plugins/video_player/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
   - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
 
@@ -294,8 +294,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler/ios"
   scan:
     :path: ".symlinks/plugins/scan/ios"
-  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  shared_preferences:
+    :path: ".symlinks/plugins/shared_preferences/ios"
   sharesdk_plugin:
     :path: ".symlinks/plugins/sharesdk_plugin/ios"
   thumbnails:
@@ -304,8 +304,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
-  video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
+  video_player:
+    :path: ".symlinks/plugins/video_player/ios"
   wakelock:
     :path: ".symlinks/plugins/wakelock/ios"
   webview_flutter:
@@ -331,16 +331,16 @@ SPEC CHECKSUMS:
   permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
   scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
   SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
-  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+  shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   sharesdk_plugin: dbe766efb15fdb2605133084da7a9144a1410d71
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
   thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
   TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
   tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
-  video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
+  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
-  webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
+  webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
   ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
 
 PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c

lib/community/headlines/article_list.dart

@@ -101,7 +101,7 @@ class _ArticleList extends State<ArticleList> {
                   maxLines: 2,
                   style: TextStyle(
                     fontSize: 14.sp,
-                    height: 1.2.h,
+                    height: 1.4.h,
                     fontWeight: MyFontWeight.semi_bold,
                     color: Colors.black,
                   ),

lib/qr/invite_friends.dart

@@ -263,12 +263,12 @@ class _InviteFriends extends State<InviteFriends> {
   Widget activityRule(){
     return Container(
       width:double.infinity,
-      height: 173.h,decoration: BoxDecoration(
+      decoration: BoxDecoration(
       borderRadius: BorderRadius.circular(6),
       color: Color(0xFFFFFFFF),
     ),
       margin: EdgeInsets.only(bottom:12.h,left:14.h,right: 14.h),
-      padding: EdgeInsets.only(top: 6.h,left: 6,right: 6),
+      padding: EdgeInsets.all(6),
       child:Column(
         children: [
           Container(
@@ -291,6 +291,8 @@ class _InviteFriends extends State<InviteFriends> {
             )
           ),
           SizedBox(height: 17.h,),
+          IntrinsicHeight(
+            child:
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
@@ -527,6 +529,7 @@ class _InviteFriends extends State<InviteFriends> {
                 ),
               ],
             ),
+          ),
         ],
       ),
     );

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.78: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/";///线上
 

lib/retrofit/retrofit_api.dart

@@ -61,7 +61,7 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-const localBaseUrl = "http://192.168.10.78: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/";///线上
 

lib/store/shopping/activity_prefecture_details.dart

@@ -209,6 +209,7 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
   @override
   Widget build(BuildContext context) {
     return Container(
+      color: Colors.white,
       child: SmartRefresher(
         controller: refreshController,
         enablePullDown: true,

lib/store/shopping/shopping_home/activity_banner.dart

@@ -38,7 +38,7 @@ class _ActivityBanner extends State<ActivityBanner> {
     return Container(
       margin: EdgeInsets.only(bottom:10),
       child: AspectRatio(
-        aspectRatio: 1.32,
+        aspectRatio: 1.18,
         child: Swiper(
             viewportFraction: 0.9,
             scale: 0.7,

lib/store/store_order.dart

@@ -209,17 +209,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-        onWillPop: () async {
-          if (dialogShowing) {
-            debugPrint("ssssasdadsasdadasd");
-            SmartDialog.dismiss();
-            return false;
-          } else {
-            return true;
-          }
-        },
-        child:Container(
+    return Container(
         color: Colors.white,
         child: Stack(
           children: [
@@ -557,7 +547,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
               ),
             ),
           ],
-        )));
+        ));
   }
 
   ///领取优惠券

lib/store/store_view/shop_goods.dart

@@ -43,7 +43,7 @@ class _ShopGoods extends State<ShopGoods> {
         right: 16.w,
         // bottom: 20.h,
       ),
-      height: 120.h,
+      height: 123.h,
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.start,

lib/union/union_list.dart

@@ -58,19 +58,19 @@ class _UnionList extends State<UnionList> {
                         if (widget.storeList[position].posType.code == "NORMALSTORE") {
                           showDeleteDialog();
                         }
-                        // else if (widget.storeList[position].posType.code ==
-                        //     "DIRECT" &&
-                        //     widget.storeList[position].storeName == "一心回乡商城") {
-                        //   Navigator.of(context).pushNamed(
-                        //     '/router/shopping_mall_home',
-                        //     arguments: {
-                        //       "type": 0,
-                        //       "id": widget.storeList[position].id,
-                        //       "tenant": widget.storeList[position].tenantCode,
-                        //       "storeName": widget.storeList[position].storeName
-                        //     },
-                        //   );
-                        // }
+                        else if (widget.storeList[position].posType.code ==
+                            "DIRECT" &&
+                            widget.storeList[position].storeName == "一心回乡商城") {
+                          Navigator.of(context).pushNamed(
+                            '/router/shopping_mall_home',
+                            arguments: {
+                              "type": 0,
+                              "id": widget.storeList[position].id,
+                              "tenant": widget.storeList[position].tenantCode,
+                              "storeName": widget.storeList[position].storeName
+                            },
+                          );
+                        }
                         else
                           {
                           Navigator.of(context).pushNamed(

lib/web/web_page.dart

@@ -277,7 +277,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
                       ),
 
                       /// 富文本的评论
-                      if(Platform.isAndroid&&!ExamineInstance.instance.isExamine)
+                      if(!ExamineInstance.instance.isExamine)
                       CommentList(
                         commentKey,
                         article?.likes ?? activity?.likes ?? 0,
@@ -302,7 +302,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
             ),
 
             /// 富文本评论的输入框
-            if(Platform.isAndroid&&!ExamineInstance.instance.isExamine)
+            if(!ExamineInstance.instance.isExamine)
             InputComment(
               inputKey,
               hintText,

pubspec.lock

@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   barcode:
     dependency: transitive
     description:
@@ -56,14 +56,14 @@ packages:
       name: characters
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   chewie:
     dependency: transitive
     description:
@@ -91,7 +91,7 @@ packages:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   convert:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   ffi:
     dependency: transitive
     description:
@@ -370,7 +370,7 @@ packages:
       name: js
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   json_annotation:
     dependency: "direct main"
     description:
@@ -384,7 +384,7 @@ packages:
       name: keframe
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.6"
+    version: "3.0.0"
   like_button:
     dependency: "direct main"
     description:
@@ -405,14 +405,21 @@ packages:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
@@ -426,7 +433,7 @@ packages:
       name: network_to_file_image
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.8"
+    version: "4.0.1"
   numerus:
     dependency: transitive
     description:
@@ -447,7 +454,7 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   path_drawing:
     dependency: transitive
     description:
@@ -676,7 +683,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -718,7 +725,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.9"
   thumbnails:
     dependency: "direct main"
     description:
@@ -811,7 +818,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   video_player:
     dependency: "direct main"
     description:
@@ -897,5 +904,5 @@ packages:
     source: hosted
     version: "5.1.2"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=2.2.0"
+  dart: ">=2.17.0-0 <3.0.0"
+  flutter: ">=3.0.0"

pubspec.yaml

@@ -17,7 +17,8 @@ dependencies:
 
   gradient_widgets: ^0.6.0
 
-  keframe: ^2.0.2 #滑动组件卡顿优化
+  keframe: ^3.0.0
+#  keframe: ^2.0.2 #滑动组件卡顿优化
 
   tpns_flutter_plugin:
     git:
@@ -66,7 +67,7 @@ dependencies:
   scan: ^1.5.0
 
   path_provider: ^1.2.0
-  network_to_file_image: ^2.0.0
+  network_to_file_image: ^4.0.1
 
   flutter_html: ^2.1.5    #2.1.0
   chewie_audio: ^1.1.2