新版首页更改；

我的页面新增门店二维码保存，店员管理功能；（门店二维码接口暂未无，该功能暂未开放）
首页商品跳转更改；
会员页面，指定tab跳转；
新增收银台页面；
收银台页面整体接口数据流程对接；
店员管理页面/会员余额统计页面接口数据流程对接；
app权限通知图片bug更改；（文件名错误）
扫一扫页面新增收银台扫码支付流程及接口对接；
总览页面，指定tab跳转更改；
vip充值页面选择充值套餐显示隐藏流程更改；

lib/business_system/business_page.dart

@@ -48,6 +48,10 @@ class _BusinessPage extends State<BusinessPage>
                 setState(() {
                   selectStoreIndex = index;
                 });
+              },(index){
+                setState((){
+                  choiceIndex = 3;
+                });
               }),
             if (choiceIndex == 1) BusinessOrderPage(businessLoginInfo?.storeList[selectStoreIndex]?.id ?? "0"),
             // if (choiceIndex == 2) BusinessScanCode(businessLoginInfo?.storeList[selectStoreIndex]?.id ?? "0"),

lib/business_system/home/consumer_ranking_page.dart

@@ -13,6 +13,7 @@ import '../../generated/l10n.dart';
 import '../../retrofit/business_api.dart';
 import '../../retrofit/data/balance_consumption_ranking_list.dart';
 import '../../retrofit/data/base_data.dart';
+import '../../retrofit/data/store_total_money_info.dart';
 import '../../utils/business_instance.dart';
 import '../../utils/flutter_utils.dart';
 import '../../view_widget/classic_header.dart';
@@ -44,12 +45,28 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
   String networkError = "";
   int networkStatus = 0;
   List<Records> records = [];
+  StoreTotalMoneyInfo storeTotalMoneyInfo;
   int _pageNum = 1;
   String total = "0";
+  int _loadCount = 0;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      setState(() {
+        print("object: ${MediaQuery.of(context).viewInsets.bottom}");
+        if (MediaQuery.of(context).viewInsets.bottom == 0) {
+          if (isKeyBoardShow) {
+            isKeyBoardShow = false;
+            //关闭键盘 软键盘关闭了， 清除输入控件的焦点， 否则重新进入页面会导致软键盘再弹出问题
+            FocusScope.of(context).requestFocus(FocusNode());
+          }
+        } else {
+          isKeyBoardShow = true;
+        }
+      });
+    });
     titleName = widget?.arguments["titleName"] ?? "";
     _onRefresh();
   }
@@ -67,15 +84,28 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
       EasyLoading.show(
           status: S.current.zhengzaijiazai,
           maskType: EasyLoadingMaskType.black);
-    await queryStoreMoney();
+    queryStoreMoney(isRefresh:false);
-    EasyLoading.dismiss();
+    queryStoreTotalMoney();
-    if (refreshController.isRefresh) refreshController.refreshCompleted();
+  }
-    if (mounted) setState(() {});
+
+
+  addLoadCount() {
+    _loadCount += 1;
+    if (_loadCount == 2) {
+      _loadCount = 0;
+      EasyLoading.dismiss();
+      if (refreshController.isRefresh) refreshController.refreshCompleted();
+      if (mounted) setState(() {});
+    }
   }
 
   ///查询会员余额统计/消费排名
-  queryStoreMoney({nickName,isShow = true}) async {
+  queryStoreMoney({keyword,isRefresh = true}) async {
     try {
+      if (isRefresh)
+        EasyLoading.show(
+            status: S.current.zhengzaijiazai,
+            maskType: EasyLoadingMaskType.black);
       if (businessService == null) {
         businessService = BusinessApiService(Dio(),
             context: context,
@@ -84,9 +114,9 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
             storeId: widget.arguments["storeId"]);
       }
       BaseData<BalanceConsumptionRankingList> baseData = await businessService.storeMoney({
-        "startTime": titleName == "消费排名" ? selectTimeDateNum.substring(0,19):"",
+        "startTime": titleName == "消费排名" ? (selectTimeDate != ""?selectTimeDate.replaceAll("年", "-").replaceAll("月", "-").replaceAll("日", "").substring(0,19):selectTimeDateNum.substring(0,19)):"",
-        "endTime": titleName == "消费排名" ? selectTimeDateNum.substring(24,43):"",
+        "endTime": titleName == "消费排名" ? (selectTimeDate!=""?selectTimeDate.replaceAll("年", "-").replaceAll("月", "-").replaceAll("日", "").substring(22,41):selectTimeDateNum.substring(24,43)):"",
-        "nickName": titleName == "消费排名" ? "" : nickName,
+        "keyword": titleName == "消费排名" ? "" : (keyword ?? ""),
         "type":titleName == "消费排名" ? 1:0,
         "pageNum": _pageNum,
         "pageSize": 10,
@@ -100,24 +130,56 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
       if (!mounted) return;
       if (baseData != null && baseData.isSuccess) {
         records.addAll(baseData?.data?.records ?? []);
-        total = baseData?.data?.total ?? "0";
         if ((baseData?.data?.records ?? []).isEmpty ||
             records.length.toString() == baseData.data.pages)
           refreshController.loadNoData();
         else
           refreshController.loadComplete();
         networkStatus = 1;
-      } else {
-        SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
       }
     } finally {
-      if (isShow) setState(() {});
+      if(isRefresh){
+        setState(() {});
+        EasyLoading.dismiss();
+      }else
+      addLoadCount();
+    }
+  }
+
+  ///会员余额统计（总会员数，总余额数）查询/消费排名（消费会员数量，销售金额）查询
+  queryStoreTotalMoney({keyword}) async {
+    try {
+      if (businessService == null) {
+        businessService = BusinessApiService(Dio(),
+            context: context,
+            token: BusinessInstance.instance.businessToken,
+            tenant: BusinessInstance.instance.businessTenant,
+            storeId: widget.arguments["storeId"]);
+      }
+      BaseData<StoreTotalMoneyInfo> baseData = await businessService.storeTotalMoney({
+        "startTime": titleName == "消费排名" ? selectTimeDateNum.substring(0,19):"",
+        "endTime": titleName == "消费排名" ? selectTimeDateNum.substring(24,43):"",
+      }).catchError((error) {
+        networkError = AppUtils.dioErrorTypeToString(error.type);
+        networkStatus = -1;
+        setState(() {});
+        refreshController.refreshFailed();
+        refreshController.loadFailed();
+      });
+      if (!mounted) return;
+      if (baseData != null && baseData.isSuccess) {
+        storeTotalMoneyInfo = baseData.data;
+        networkStatus = 1;
+      }
+    } finally {
+      addLoadCount();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      resizeToAvoidBottomInset: false,
       appBar: MyAppBar(
         title: titleName,
         titleColor: Colors.black,
@@ -147,7 +209,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
           },
           onLoading: () {
             _pageNum++;
-            _onRefresh(isShowLoad: false);
+            queryStoreMoney();
           },
           physics: BouncingScrollPhysics(),
           scrollController: ScrollController(),
@@ -183,7 +245,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
                                   ),
                                 ),
                                 Text(
-                                  total,
+                                  (storeTotalMoneyInfo?.paySumCount ?? 0).toString(),
                                   style: TextStyle(
                                     fontSize: 14.sp,
                                     fontWeight: MyFontWeight.bold,
@@ -207,7 +269,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
                                   ),
                                 ),
                                 Text(
-                                  "12334.00",
+                                  storeTotalMoneyInfo?.storeTotalMoney ?? "0",
                                   style: TextStyle(
                                     fontSize: 14.sp,
                                     fontWeight: MyFontWeight.bold,
@@ -236,7 +298,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
                                   ),
                                 ),
                                 Text(
-                                  total,
+                                  (storeTotalMoneyInfo?.memberCount ?? 0).toString(),
                                   style: TextStyle(
                                     fontSize: 14.sp,
                                     fontWeight: MyFontWeight.bold,
@@ -260,7 +322,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
                                   ),
                                 ),
                                 Text(
-                                  "12334.00",
+                                  storeTotalMoneyInfo?.memberTotalBalance ?? "0",
                                   style: TextStyle(
                                     fontSize: 14.sp,
                                     fontWeight: MyFontWeight.bold,
@@ -293,7 +355,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
                   ? NoDataView(
                 src: "assets/image/bs_no data_logo.webp",
                 isShowBtn: false,
-                text: "暂无商品分类",
+                text: "暂无相关数据",
                 fontSize: 16.sp,
                 margin: EdgeInsets.all(20.h),
               )
@@ -329,7 +391,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
           Navigator.of(context).pushNamed('/router/custom_page',
               arguments: {"beyondDateRange": "0"}).then((value) {
             selectTimeDate = value;
-            setState((){});
+            queryStoreMoney();
           });
         },
         child: Container(
@@ -377,7 +439,8 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
           textInputAction: TextInputAction.search,
           onEditingComplete: () {
             FocusScope.of(context).requestFocus(FocusNode());
-            queryStoreMoney(nickName: editingController?.text ?? "");
+            records.clear();
+            queryStoreMoney(keyword: editingController?.text ?? "");
           },
           style: TextStyle(
             fontSize: 15.sp,
@@ -429,7 +492,7 @@ class _ConsumerRankingPage extends State<ConsumerRankingPage> {
           Padding(
             padding: EdgeInsets.only(bottom: 16.h),
             child: Text(
-              "${records?.name ?? ""}(${records?.phone}）",
+              "${records?.name ?? ""}(${records?.phone})",
               style: TextStyle(
                 fontSize: 14.sp,
                 fontWeight: MyFontWeight.bold,

lib/business_system/home/overview/trade_overview_page.dart

@@ -23,11 +23,14 @@ class TradeOverviewPage extends StatefulWidget {
 class _TradeOverviewPage extends State<TradeOverviewPage> with SingleTickerProviderStateMixin{
   final RefreshController refreshController = RefreshController();
   String storeId;
+  TabController tabController;
 
   @override
   void initState() {
     super.initState();
     storeId = widget?.arguments["storeId"] ??"";
+    tabController = TabController(
+        length: 3, vsync: this, initialIndex: widget?.arguments["index"]??0);
   }
 
   @override
@@ -55,7 +58,7 @@ class _TradeOverviewPage extends State<TradeOverviewPage> with SingleTickerProvi
               fontWeight: FontWeight.normal,
               color: Color(0xFF666666)
             ),
-            // controller: tabController,
+            controller: tabController,
             //未选中文字颜色
             unselectedLabelColor: Color(0xffA29E9E),
             indicatorSize: TabBarIndicatorSize.label,

lib/business_system/home/vip/business_vip_page.dart

@@ -28,7 +28,7 @@ class _BusinessVipPage extends State<BusinessVipPage>
   @override
   void initState() {
     super.initState();
-    tabController = TabController(length: 3, vsync: this);
+    tabController = TabController(length: 3, vsync: this, initialIndex: widget?.arguments["index"] ?? 0);
     tabController.addListener(() {
       if (!tabController.indexIsChanging) {
         setState(() {});

lib/business_system/home/vip/vip_recharge_page.dart

@@ -410,7 +410,7 @@ class _VipRechargePage extends State<VipRechargePage> {
                     rechargeList(),
 
                     ///选择充值的套餐
-                    if (networkStatus == 1)
+                    if (networkStatus == 1 && records.length > 0)
                       Container(
                         decoration: BoxDecoration(
                           color: Colors.white,
@@ -840,7 +840,7 @@ class _VipRechargePage extends State<VipRechargePage> {
                                   '/router/scan_code_page',
                                   arguments: {
                                     "storeId": widget.arguments["storeId"],
-                                    "scanCodeType": "支付",
+                                    "scanCodeType": "充值支付",
                                     "rechargePreferentialId":
                                         records[selectIndex]?.id ?? "",
                                     "memberSourceId":
@@ -1012,7 +1012,7 @@ class _VipRechargePage extends State<VipRechargePage> {
         child: (records != null && (records?.length ?? 0) > 0)
             ? ListView.builder(
                 padding: EdgeInsets.zero,
-                itemCount: records.length ?? 0,
+                itemCount: records?.length ?? 0,
                 scrollDirection: Axis.vertical,
                 shrinkWrap: true,
                 physics: BouncingScrollPhysics(),

lib/business_system/mine/business_mine_page.dart

@@ -277,8 +277,9 @@ class _BusinessMinePage extends State<BusinessMinePage>
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
-              Navigator.of(context).pushNamed('/router/shop_reservation_code',
+              // Navigator.of(context).pushNamed('/router/shop_reservation_code',
-                  arguments: {"storeId": widget.storeId,});
+              //     arguments: {"storeId": widget.storeId,});
+              SmartDialog.showToast("该功能暂未开放!", alignment: Alignment.center);
             },
             child: commonFunctionsItem(
                 "assets/image/bs_mine_code.webp", "门店预约二维码", "",18,18),

lib/business_system/scan_code_page.dart

@@ -101,6 +101,39 @@ class _ScanCodePage extends State<ScanCodePage> {
     }
   }
 
+  ///收银台支付
+  cashierPay(authCode) async {
+    try{
+      EasyLoading.show(
+          status: S.current.zhengzaijiazai,
+          maskType: EasyLoadingMaskType.black);
+      if (businessService == null) {
+        businessService = BusinessApiService(Dio(),
+            context: context,
+            token: BusinessInstance.instance.businessToken,
+            tenant: BusinessInstance.instance.businessTenant,
+            storeId: widget.arguments["storeId"]);
+      }
+      BaseData baseData = await businessService.prePayOrder({
+        "orderId": widget?.arguments["orderId"] ?? "",
+        "payChannel": widget?.arguments["payChannel"] ?? "",
+        "mid":widget?.arguments["mid"] ?? "",
+        "authCode": authCode ?? null
+      }).catchError((error) {});
+      if (baseData != null && baseData.isSuccess) {
+        Navigator.of(context).pop(1);
+        SmartDialog.show(
+            widget: SettlementTips(
+                  () {},
+              text: baseData.data,
+              color: Color(0xFF30415B),
+            ));
+      } else {
+        Navigator.of(context).pop([baseData.msg,baseData.data]);
+      }}finally{
+      EasyLoading.dismiss();
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -121,7 +154,11 @@ class _ScanCodePage extends State<ScanCodePage> {
                           widget.arguments["scanCodeType"] == null) {
                         queryTicketDetails(data);
                       } else {
-                        rechargePay(data);
+                        if(widget.arguments["scanCodeType"] == "充值支付"){
+                          rechargePay(data);
+                        }else{
+                          cashierPay(data);
+                        }
                       }
                     },
                   ),

lib/retrofit/business_api.dart

@@ -33,6 +33,7 @@ import 'data/recharge_flow_list.dart';
 import 'data/refund_reason_list.dart';
 import 'data/single_sales_list.dart';
 import 'data/store_time_info_list.dart';
+import 'data/store_total_money_info.dart';
 import 'data/ticket_details.dart';
 import 'data/ticket_record.dart';
 import 'data/ticket_show.dart';
@@ -325,7 +326,7 @@ abstract class BusinessApiService {
   @POST("member/posMemberRecharge")
   Future<BaseData> posMemberRecharge(@Body() Map<String, dynamic> param);
 
-  ///充值订单查询
+  ///充值订单手动查询
   @POST("member/manualQuery")
   Future<BaseData> manualQuery(@Body() Map<String, dynamic> param);
 
@@ -353,4 +354,20 @@ abstract class BusinessApiService {
   @POST("dashBoard/storeMoney")
   Future<BaseData<BalanceConsumptionRankingList>> storeMoney(@Body() Map<String, dynamic> param);
 
+  ///会员余额统计（总会员数，总余额数）查询/消费排名（消费会员数量，销售金额）查询
+  @POST("dashBoard/storeTotalMoney")
+  Future<BaseData<StoreTotalMoneyInfo>> storeTotalMoney(@Body() Map<String, dynamic> param);
+
+  ///收银台创建直付订单
+  @POST("order/createOrder")
+  Future<BaseData> createOrder(@Body() Map<String, dynamic> param);
+
+  ///收银台支付
+  @POST("order/prePayOrder")
+  Future<BaseData> prePayOrder(@Body() Map<String, dynamic> param);
+
+  ///收银台直付订单手动查询
+  @POST("order/queryOrder/{orderId}?login={login}")
+  Future<BaseData> queryCashierOrder(@Path("orderId") String orderId,@Path("login") bool login);
+
 }

lib/retrofit/business_api.g.dart

@@ -1076,4 +1076,91 @@ class _BusinessApiService implements BusinessApiService {
     return value;
   }
 
+  @override
+  Future<BaseData<StoreTotalMoneyInfo>> storeTotalMoney(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'dashBoard/storeTotalMoney',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<StoreTotalMoneyInfo>.fromJson(
+      _result.data,
+          (json) => (json ?? "") == "" ? null : StoreTotalMoneyInfo.fromJson(json),
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData> createOrder(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'order/createOrder',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: param);
+    final value = BaseData.fromJson(
+      _result.data,
+          (json) => (json ?? "") == "" ? null : json,
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData> prePayOrder(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        'order/prePayOrder',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: param);
+    final value = BaseData.fromJson(
+      _result.data,
+          (json) => (json ?? "") == "" ? null : json,
+    );
+    return value;
+  }
+
+  @override
+  Future<BaseData<dynamic>> queryCashierOrder(orderId,login) async {
+    ArgumentError.checkNotNull(orderId, 'orderId');
+    ArgumentError.checkNotNull(login, 'login');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>('order/queryOrder/$orderId?login=$login',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData<dynamic>.fromJson(
+      _result.data,
+          (json) => json as dynamic,
+    );
+    return value;
+  }
+
 }

lib/retrofit/data/store_total_money_info.dart

@@ -0,0 +1,51 @@
+/// storeTotalMoney : "117.00"
+/// paySumCount : 2
+/// memberCount : 9385
+/// memberTotalBalance : "42236.77"
+
+class StoreTotalMoneyInfo {
+  StoreTotalMoneyInfo({
+      String storeTotalMoney, 
+      num paySumCount, 
+      num memberCount, 
+      String memberTotalBalance,}){
+    _storeTotalMoney = storeTotalMoney;
+    _paySumCount = paySumCount;
+    _memberCount = memberCount;
+    _memberTotalBalance = memberTotalBalance;
+}
+
+  StoreTotalMoneyInfo.fromJson(dynamic json) {
+    _storeTotalMoney = json['storeTotalMoney'];
+    _paySumCount = json['paySumCount'];
+    _memberCount = json['memberCount'];
+    _memberTotalBalance = json['memberTotalBalance'];
+  }
+  String _storeTotalMoney;
+  num _paySumCount;
+  num _memberCount;
+  String _memberTotalBalance;
+StoreTotalMoneyInfo copyWith({  String storeTotalMoney,
+  num paySumCount,
+  num memberCount,
+  String memberTotalBalance,
+}) => StoreTotalMoneyInfo(  storeTotalMoney: storeTotalMoney ?? _storeTotalMoney,
+  paySumCount: paySumCount ?? _paySumCount,
+  memberCount: memberCount ?? _memberCount,
+  memberTotalBalance: memberTotalBalance ?? _memberTotalBalance,
+);
+  String get storeTotalMoney => _storeTotalMoney;
+  num get paySumCount => _paySumCount;
+  num get memberCount => _memberCount;
+  String get memberTotalBalance => _memberTotalBalance;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['storeTotalMoney'] = _storeTotalMoney;
+    map['paySumCount'] = _paySumCount;
+    map['memberCount'] = _memberCount;
+    map['memberTotalBalance'] = _memberTotalBalance;
+    return map;
+  }
+
+}

lib/setting/permission_setting_page.dart

@@ -46,7 +46,7 @@ class _PermissionSettingPage extends State<PermissionSettingPage> {
 
   List<String> tipIcons = [
     "assets/image/icon_location_permission_tips.webp",
-    "assets/image/icon_notification_permission_tips.webp",
+    "assets/image/icon_natification_permission_tips.webp",
     "assets/image/icon_camera_permission_tips.webp",
     "assets/image/icon_storage_permission_tips.webp",
   ];