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

ios/Podfile

@@ -1,5 +1,6 @@
 # Uncomment this line to define a global platform for your project
  platform :ios, '11.0'
+ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -46,7 +46,7 @@ PODS:
     - Flutter
   - fluwx (0.0.1):
     - Flutter
-    - WechatOpenSDK-XCFramework (~> 2.0.2)
+    - "OpenWeChatSDK (~> 1.9.2+1)"
   - image_pickers (0.0.1):
     - AFNetworking
     - Flutter
@@ -166,6 +166,7 @@ PODS:
     - mob_sharesdk_spec2/ShareSDK
   - number_precision (0.0.1):
     - Flutter
+  - "OpenWeChatSDK (1.9.9+1)"
   - package_info (0.0.1):
     - Flutter
   - path_provider (0.0.1):
@@ -228,6 +229,13 @@ PODS:
   - tpns_flutter_plugin (1.1.6):
     - Flutter
     - TPNS-iOS (= 1.3.4.1)
+  - UMCommon (7.4.1):
+    - UMDevice
+  - UMDevice (3.1.0)
+  - umeng_common_sdk (0.0.1):
+    - Flutter
+    - UMCommon
+    - UMDevice
   - url_launcher (0.0.1):
     - Flutter
   - video_player_avfoundation (0.0.1):
@@ -236,7 +244,6 @@ PODS:
     - Flutter
   - webview_flutter (0.0.1):
     - Flutter
-  - WechatOpenSDK-XCFramework (2.0.2)
   - ZLPhotoBrowser-objc (1.0.4):
     - SDWebImage
 
@@ -261,22 +268,25 @@ DEPENDENCIES:
   - thumbnails (from `.symlinks/plugins/thumbnails/ios`)
   - tobias (from `.symlinks/plugins/tobias/ios`)
   - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
+  - umeng_common_sdk (from `.symlinks/plugins/umeng_common_sdk/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
   - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
 
 SPEC REPOS:
-  trunk:
+  https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git:
     - AEINFoundation
     - AFNetworking
     - BaiduMapKit
     - BMKLocationKit
     - mob_sharesdk_spec2
+    - OpenWeChatSDK
     - SDWebImage
     - SSZipArchive
     - TPNS-iOS
-    - WechatOpenSDK-XCFramework
+    - UMCommon
+    - UMDevice
     - ZLPhotoBrowser-objc
 
 EXTERNAL SOURCES:
@@ -318,6 +328,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/tobias/ios"
   tpns_flutter_plugin:
     :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
+  umeng_common_sdk:
+    :path: ".symlinks/plugins/umeng_common_sdk/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
   video_player_avfoundation:
@@ -329,7 +341,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AEINFoundation: e046b5fbe75aaf120a54fdc530b1d62d4ce88dfe
-  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
+  AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
   BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
   emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
@@ -339,10 +351,11 @@ SPEC CHECKSUMS:
   flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
   flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
   flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
-  fluwx: e9e728cfdb80e82dac5f4ff974b1901a7939dcd0
+  fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492
   image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
   mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2
   number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
+  OpenWeChatSDK: ea48e9db20645f78128db9091893910280b8e4b1
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
   permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
@@ -355,13 +368,15 @@ SPEC CHECKSUMS:
   tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5
   TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
   tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
+  UMCommon: 47e0b53f6a36568e958a5abd005ed7577fcac9ad
+  UMDevice: 9ef8045b59e0479cff7062915c879a1af46fa094
+  umeng_common_sdk: a8abd7f86dfd013dbbeeae587ee143760c6582f2
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
   video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
-  WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
   ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
 
-PODFILE CHECKSUM: 9a26c1c4037e42be4afc95d70f8bd02a4b989a1c
+PODFILE CHECKSUM: f4ea28c741a7c9a1c417c066f9cfd7b29654dd12
 
 COCOAPODS: 1.11.3

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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/business_system/goods/on_sale/edit_assort.dart

@@ -47,6 +47,7 @@ class _EditAssort extends State<EditAssort> {
         FocusScope.of(context).requestFocus(FocusNode());
       },
       child: Scaffold(
+        resizeToAvoidBottomInset: false,
         backgroundColor: Colors.white,
         appBar: MyAppBar(
           title: "编辑分类",

lib/setting/binding_phone_page.dart

@@ -351,7 +351,7 @@ class _BindingPhonePage extends State<BindingPhonePage> {
               Container(
                 height: 30.h,
                 width: MediaQuery.of(context).size.width - 100.w,
-                margin: EdgeInsets.only(bottom:Platform.isIOS ? 5.h:0),
+                margin: EdgeInsets.only(bottom:Platform.isIOS ?7.h:0),
                 child: TextField(
                   style: TextStyle(
                     height: 1.h,
@@ -377,7 +377,7 @@ class _BindingPhonePage extends State<BindingPhonePage> {
                     focusedBorder: InputBorder.none,
                     enabledBorder: InputBorder.none,
                     hintText: S.of(context).qingshurushoujihao,
-                    // contentPadding: EdgeInsets.only(top: 12, bottom: 12, left: 12),
+                    // contentPadding: EdgeInsets.only(top: 12, bottom: 12,),
                     hintStyle: TextStyle(
                       fontSize: 14.sp,
                       color: Color(0xFFA29E9E),

lib/union/union_list.dart

@@ -50,20 +50,13 @@ class _UnionList extends State<UnionList> {
               header: MyHeader(),
               onRefresh: widget.onRefresh,
               child: (widget.storeList == null || widget.storeList.length == 0)
-                  ? ListView.builder(
-                  itemCount:5,
-                  padding: EdgeInsets.only(
-                    top: 8.h,
-                    bottom: 100.h, /* + (375.h - 88.h) + 4.h*/
-                  ),
-                  physics: NeverScrollableScrollPhysics(),
-                  itemBuilder: (context, position) {
-                    return InkWell(
-                      onTap: () {
-                      },
-                      child:sm(),
-                    );
-                  }):ListView.builder(
+                  ? NoDataView(
+                src:"assets/image/di_zhi.webp",
+                isShowBtn: false,
+                text: "暂无店铺列表~",
+                fontSize: 16.sp,
+                margin: EdgeInsets.only(top: 120.h),
+              ):ListView.builder(
                   itemCount:widget.storeList == null ? 0 : widget.storeList.length,
                   padding: EdgeInsets.only(
                     top: 8.h,