From 5e4256a76680d0d5c911b383f98d379a590d49a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”> Date: Tue, 2 Jul 2024 10:56:33 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E7=BB=9F=E4=B8=80=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E3=80=81=E9=82=AE=E4=BB=B6=E3=80=81=E5=AE=9E=E5=90=8D=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E3=80=81=E9=AB=98=E7=BA=A7=E5=8A=9F=E8=83=BD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E8=AE=B0=E5=BD=95=E5=92=8C?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=B9=B6=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=202=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=A2=9E?= =?UTF-8?q?=E5=80=BC=E6=9C=8D=E5=8A=A1--=E9=82=AE=E4=BB=B6=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=AE=B0=E5=BD=95=EF=BC=9A=E5=B0=91=E4=BA=86=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=96=B9=E8=B4=A6=E5=8F=B7=E5=92=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=9A=E4=B9=85=E7=9A=84=E5=A4=87=E6=B3=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=203=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=80=BC=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1--=E7=9F=AD=E4=BF=A1=20=E5=B0=91=E4=BA=86=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=96=B9=E8=B4=A6=E5=8F=B7=E3=80=81=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=A4=9A=E4=B9=85=E7=9A=84=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E3=80=82=E8=AE=B0=E5=BD=95=E8=BF=9B=E5=85=A5=E6=9C=89?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=9C=80=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=9C=89=E8=8B=B1=E6=96=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 24 +-- lib/appRouters.dart | 5 - .../authorizedAdmin_logic.dart | 5 +- .../electronicKeyDetail_logic.dart | 7 +- .../view/sendElectronicKeyView_logic.dart | 4 +- .../advancedFunctionRecord_entity.dart | 132 --------------- .../advancedFunctionRecord_logic.dart | 5 +- .../advancedFunctionRecord_page.dart | 4 +- .../advancedFunctionRecord_state.dart | 4 +- ...dedServicesBuyAndUseRecordManage_page.dart | 32 ---- ...dServicesBuyAndUseRecordManage_tabbar.dart | 111 ------------- ...alueAddedServicesBuyAndUseRecord_page.dart | 111 ------------- .../use_record_list_entity.dart | 51 +++++- .../value_added_services_record_logic.dart | 52 +++--- .../value_added_services_record_page.dart | 153 +++++++++--------- .../value_added_services_record_state.dart | 9 +- lib/network/api_repository.dart | 16 +- 17 files changed, 192 insertions(+), 533 deletions(-) delete mode 100755 lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart delete mode 100755 lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_page.dart delete mode 100755 lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_tabbar.dart delete mode 100755 lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecord_page.dart diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3ffb1e4d..613467b6 100755 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -127,6 +127,8 @@ PODS: - Flutter - network_info_plus (0.0.1): - Flutter + - open_filex (0.0.2): + - Flutter - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): @@ -188,6 +190,7 @@ DEPENDENCIES: - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`) + - open_filex (from `.symlinks/plugins/open_filex/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) @@ -280,6 +283,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/just_audio/ios" network_info_plus: :path: ".symlinks/plugins/network_info_plus/ios" + open_filex: + :path: ".symlinks/plugins/open_filex/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: @@ -318,7 +323,7 @@ SPEC CHECKSUMS: audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d Bugly: 217ac2ce5f0f2626d43dbaa4f70764c953a26a31 - camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e + camera_avfoundation: 8b8d780bcfb6a4a02b0fbe2b4bd17b5b71946e68 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed DKImagePickerController: 0a24ebfe7b48beeb74c27531540aaa2cc1dac6cf @@ -332,33 +337,34 @@ SPEC CHECKSUMS: flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907 flutter_pcm_sound: de0572ca4f99091cc2abfcc31601b8a4ddd33c0e flutter_voice_processor: 2b89b93d69b02227ae3fd58589ee0bcfa3ca2a82 - fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db + fluttertoast: 77ff8760d90ff5041a97e3d0c0ecaaa8472524d2 fluwx: c18fd6c16b03a2187cd07d6e48e32a7801962849 google_maps_flutter_ios: f135b968a67c05679e0a53538e900b5c174b0d99 GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4 image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb - image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18 + image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 JCore: 05f0f3489672ea3fa55338bae4866224bc092b1f JPush: 76668b765fcfd7c15f86b05ca0e5cdc01945ce23 jpush_flutter: 1f436f1a02db5c5ef9e9b42378f557096ccd328b just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f + open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149 SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 system_settings: 8f5cdbfa72c677fc8d665b863bcc20d393d87e9d Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 - webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 + url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579 + webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4 WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f PODFILE CHECKSUM: 317f9473a5705c6fe4d79d95e81676f248048fdc -COCOAPODS: 1.14.3 +COCOAPODS: 1.12.1 diff --git a/lib/appRouters.dart b/lib/appRouters.dart index e5d54058..47b83b66 100755 --- a/lib/appRouters.dart +++ b/lib/appRouters.dart @@ -186,7 +186,6 @@ import 'mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.d import 'mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_page.dart'; import 'mine/supportStaff/supportStaff_page.dart'; import 'mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart'; -import 'mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_page.dart'; import 'mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart'; import 'mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesListEmailTemplate/valueAddedServicesListEmailTemplate_page.dart'; import 'mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart'; @@ -895,10 +894,6 @@ abstract class AppRouters { name: Routers.valueAddedServicesAddEmailTemplatePage, page: () => const ValueAddedServicesAddEmailTemplatePage(), ), - GetPage( - name: Routers.valueAddedServicesBuyAndUseRecordManagePage, - page: () => const ValueAddedServicesBuyAndUseRecordManagePage(), - ), GetPage( name: Routers.lockScreenPage, page: () => const LockScreenPage(), diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart index 47a682c4..5fa6bac4 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart @@ -5,11 +5,10 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_entity.dart'; import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/notice_template_entity.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_entity.dart'; import 'package:star_lock/tools/NativeInteractionTool.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/showCupertinoAlertView.dart'; @@ -244,7 +243,7 @@ class AuthorizedAdminLogic extends BaseGetXController { //检测实名认证是否支持开启 Future keyCheckFace() async { - final AdvancedFunctionRecordEntity entity = + final ValueAddedServicesHighFunctionEntity entity = await ApiRepository.to.keyCheckFace( lockId: CommonDataManage().currentKeyInfo.lockId ?? 0, ); diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart index e48c8f0f..bb24a222 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; @@ -6,7 +5,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_state.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_entity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/showCupertinoAlertView.dart'; @@ -148,7 +147,7 @@ class ElectronicKeyDetailLogic extends BaseGetXController { Future checkRealNameStatus(int realNameAuthStatus) async { //打开实名认证 必须输入身份证号和真实姓名 if (realNameAuthStatus == 1) { - final AdvancedFunctionRecordEntity entity = + final ValueAddedServicesHighFunctionEntity entity = await ApiRepository.to.keyCheckFace( lockId: CommonDataManage().currentKeyInfo.lockId ?? 0, ); @@ -397,7 +396,7 @@ class ElectronicKeyDetailLogic extends BaseGetXController { //检测实名认证是否支持开启 Future keyCheckFace() async { - final AdvancedFunctionRecordEntity entity = + final ValueAddedServicesHighFunctionEntity entity = await ApiRepository.to.keyCheckFace( lockId: CommonDataManage().currentKeyInfo.lockId ?? 0, ); diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart index c0317682..0f5ef873 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart @@ -5,7 +5,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_entity.dart'; import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/notice_template_entity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_entity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/NativeInteractionTool.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -205,7 +205,7 @@ class SendElectronicKeyViewLogic extends BaseGetXController { //检测实名认证是否支持开启 Future keyCheckFace() async { - final AdvancedFunctionRecordEntity entity = + final ValueAddedServicesHighFunctionEntity entity = await ApiRepository.to.keyCheckFace( lockId: CommonDataManage().currentKeyInfo.lockId ?? 0, ); diff --git a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart deleted file mode 100755 index 5d36ca71..00000000 --- a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart +++ /dev/null @@ -1,132 +0,0 @@ -class AdvancedFunctionRecordEntity { - int? errorCode; - String? description; - String? errorMsg; - Data? data; - - AdvancedFunctionRecordEntity( - {this.errorCode, this.description, this.errorMsg, this.data}); - - AdvancedFunctionRecordEntity.fromJson(Map json) { - errorCode = json['errorCode']; - description = json['description']; - errorMsg = json['errorMsg']; - data = json['data'] != null ? Data.fromJson(json['data']) : null; - } - - Map toJson() { - final Map data = {}; - data['errorCode'] = errorCode; - data['description'] = description; - data['errorMsg'] = errorMsg; - if (this.data != null) { - data['data'] = this.data!.toJson(); - } - return data; - } -} - -class Data { - int? pageNo; - int? pageSize; - int? total; - List? recordList; - - Data({this.pageNo, this.pageSize, this.total, this.recordList}); - - Data.fromJson(Map json) { - pageNo = json['pageNo']; - pageSize = json['pageSize']; - total = json['total']; - if (json['list'] != null) { - recordList = []; - json['list'].forEach((v) { - recordList!.add(RecordItem.fromJson(v)); - }); - } - } - - Map toJson() { - final Map data = {}; - data['pageNo'] = pageNo; - data['pageSize'] = pageSize; - data['total'] = total; - if (recordList != null) { - data['list'] = recordList!.map((v) => v.toJson()).toList(); - } - return data; - } -} - -class RecordItem { - int? id; - int? userId; - String? orderNumber; - String? type; - int? recordType; - int? smsCount; - int? emailCount; - int? cloudauthCount; - int? vipLockCount; - int? vipYear; - String? amount; - String? createdAt; - String? updatedAt; - String? useDate; - String? buyDate; - - RecordItem( - {this.id, - this.userId, - this.orderNumber, - this.type, - this.recordType, - this.smsCount, - this.emailCount, - this.cloudauthCount, - this.vipLockCount, - this.vipYear, - this.amount, - this.createdAt, - this.updatedAt, - this.useDate, - this.buyDate}); - - RecordItem.fromJson(Map json) { - id = json['id']; - userId = json['user_id']; - orderNumber = json['order_number']; - type = json['type']; - recordType = json['record_type']; - smsCount = json['sms_count']; - emailCount = json['email_count']; - cloudauthCount = json['cloudauth_count']; - vipLockCount = json['vip_lock_count']; - vipYear = json['vip_year']; - amount = json['amount']; - createdAt = json['created_at']; - updatedAt = json['updated_at']; - useDate = json['useDate']; - buyDate = json['buyDate']; - } - - Map toJson() { - final Map data = {}; - data['id'] = id; - data['user_id'] = userId; - data['order_number'] = orderNumber; - data['type'] = type; - data['record_type'] = recordType; - data['sms_count'] = smsCount; - data['email_count'] = emailCount; - data['cloudauth_count'] = cloudauthCount; - data['vip_lock_count'] = vipLockCount; - data['vip_year'] = vipYear; - data['amount'] = amount; - data['created_at'] = createdAt; - data['updated_at'] = updatedAt; - data['useDate'] = useDate; - data['buyDate'] = buyDate; - return data; - } -} diff --git a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_logic.dart b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_logic.dart index 0a45a484..0135735d 100755 --- a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_logic.dart +++ b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_logic.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_state.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import '../../../../network/api_repository.dart'; import '../../../../tools/baseGetXController.dart'; @@ -28,8 +28,7 @@ class AdvancedFunctionRecordLogic extends BaseGetXController { if (!load) { buyPageNo = 1; } - AdvancedFunctionRecordEntity entity = - await ApiRepository.to.getBuyRecordList( + UseRecordListEntity entity = await ApiRepository.to.getBuyRecordList( type: type, recordType: 10, pageNo: buyPageNo, diff --git a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart index 915dc299..6da02664 100755 --- a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart +++ b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_logic.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import 'package:star_lock/tools/noData.dart'; import '../../../tools/titleAppBar.dart'; @@ -44,7 +44,7 @@ class _AdvancedFunctionRecordPageState )); } - Widget _recordKeyItem(RecordItem itemData) { + Widget _recordKeyItem(UseItemData itemData) { return Container( color: Colors.white, margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 10.h), diff --git a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_state.dart b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_state.dart index 99e52e5b..d3dc0036 100755 --- a/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_state.dart +++ b/lib/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_state.dart @@ -1,6 +1,6 @@ import 'package:get/get.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; class AdvancedFunctionRecordState { - var buyRecordList = [].obs; + var buyRecordList = [].obs; } diff --git a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_page.dart b/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_page.dart deleted file mode 100755 index a14e1343..00000000 --- a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_page.dart +++ /dev/null @@ -1,32 +0,0 @@ - -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - -import '../../../../app_settings/app_colors.dart'; -import '../../../../tools/titleAppBar.dart'; -import '../../../../translations/trans_lib.dart'; -import 'valueAddedServicesBuyAndUseRecordManage_tabbar.dart'; - -class ValueAddedServicesBuyAndUseRecordManagePage extends StatefulWidget { - const ValueAddedServicesBuyAndUseRecordManagePage({Key? key}) : super(key: key); - - @override - State createState() => _ValueAddedServicesBuyAndUseRecordManagePageState(); -} - -class _ValueAddedServicesBuyAndUseRecordManagePageState extends State { - var index=0; - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.white, - appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.sendKey!.tr, haveBack:true, backgroundColor: AppColors.mainColor), - body: Column( - children: [ - ValueAddedServicesBuyAndUseRecordManageTabbar(initialIndex: index,), - ], - ), - ); - } -} diff --git a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_tabbar.dart b/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_tabbar.dart deleted file mode 100755 index 981ddf27..00000000 --- a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecordManage/valueAddedServicesBuyAndUseRecordManage_tabbar.dart +++ /dev/null @@ -1,111 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; - -import '../../../../app_settings/app_colors.dart'; -import '../../../../tools/CustomUnderlineTabIndicator.dart'; -import '../valueAddedServicesBuyAndUseRecord_page.dart'; - -class ValueAddedServicesBuyAndUseRecordManageTabbar extends StatefulWidget { - var initialIndex = 1; - - ValueAddedServicesBuyAndUseRecordManageTabbar( - {Key? key, required this.initialIndex}) - : super(key: key); - - @override - State createState() => - _ValueAddedServicesBuyAndUseRecordManageTabbarState(); -} - -class _ValueAddedServicesBuyAndUseRecordManageTabbarState - extends State - with SingleTickerProviderStateMixin { - late TabController _tabController; - - final List _itemTabs = [ - ItemView(title: "购买记录", type: "0"), - ItemView(title: "使用记录", type: "1") - // ItemView(title: TranslationLoader.lanKeys!.once!.tr, type: "2"), - // ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, type: "3"), - ]; - - @override - void initState() { - // TODO: implement initState - super.initState(); - _tabController = TabController( - vsync: this, - length: _itemTabs.length, - initialIndex: widget.initialIndex); - } - - @override - Widget build(BuildContext context) { - return Expanded( - child: Column( - children: [ - _tabBar(), - _pageWidget(), - ], - )); - } - - TabBar _tabBar() { - return TabBar( - controller: _tabController, - tabs: _itemTabs.map((ItemView item) => _tab(item)).toList(), - isScrollable: true, - indicatorColor: Colors.red, - unselectedLabelColor: Colors.black, - unselectedLabelStyle: TextStyle( - color: AppColors.mainColor, - fontSize: 24.sp, - ), - automaticIndicatorColorAdjustment: true, - labelColor: AppColors.mainColor, - labelStyle: TextStyle( - color: AppColors.mainColor, - fontSize: 24.sp, - fontWeight: FontWeight.w600), - indicator: CustomUnderlineTabIndicator( - borderSide: BorderSide(color: AppColors.mainColor, width: 4.w), - strokeCap: StrokeCap.round, - width: 30.w), - ); - } - - Tab _tab(ItemView item) { - return Tab( - // text: item.title, - child: Container( - width: 1.sw / 4, - margin: EdgeInsets.all(10.w), - // color: Colors.red, - child: Text( - item.title, - textAlign: TextAlign.center, - ), - ), - ); - } - - Widget _pageWidget() { - return Expanded( - child: TabBarView( - controller: _tabController, - children: _itemTabs - .map((ItemView item) => ValueAddedServicesBuyAndUseRecordPage( - type: item.type, - )) - .toList(), - ), - ); - } -} - -class ItemView { - const ItemView({required this.title, required this.type}); - - final String title; - final String type; -} diff --git a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecord_page.dart b/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecord_page.dart deleted file mode 100755 index c939af17..00000000 --- a/lib/mine/valueAddedServices/valueAddedServicesBuyAndUseRecord/valueAddedServicesBuyAndUseRecord_page.dart +++ /dev/null @@ -1,111 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:star_lock/app_settings/app_colors.dart'; - -class ValueAddedServicesBuyAndUseRecordPage extends StatefulWidget { - final String type; - - const ValueAddedServicesBuyAndUseRecordPage({Key? key, required this.type}) - : super(key: key); - - @override - State createState() => - _ValueAddedServicesBuyAndUseRecordPageState(); -} - -class _ValueAddedServicesBuyAndUseRecordPageState - extends State { - @override - Widget build(BuildContext context) { - return ListView.builder( - itemCount: 20, - itemBuilder: (c, index) { - if (index % 2 == 0) { - return _dateItem("2023-06-29"); - } else { - return _operatingRecordItem('images/controls_user.png', "张三", - "2023.6.21 11.15", "2023.6.21 11.15", () { - // Navigator.pushNamed(context, Routers.electronicKeyDetailPage); - }); - } - }); - } - - Widget _dateItem(String lockDate) { - return Container( - height: 60.h, - color: AppColors.mainBackgroundColor, - padding: EdgeInsets.only(left: 20.h, right: 20.h), - child: Row( - children: [ - Text( - lockDate, - style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), - ), - ], - ), - ); - } - - Widget _operatingRecordItem(String lockTypeIcon, String lockTypeTitle, - String beginTime, String endTime, Function() action) { - return GestureDetector( - onTap: action, - child: Container( - height: 90.h, - // padding: EdgeInsets.only(left: 20.w, right: 20.w), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(10.w), - ), - child: Row( - children: [ - SizedBox( - width: 30.w, - ), - Image.asset( - lockTypeIcon, - width: 50.w, - height: 50.w, - ), - SizedBox( - width: 20.w, - ), - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - children: [ - Text( - lockTypeTitle, - style: TextStyle( - fontSize: 24.sp, color: AppColors.blackColor), - ), - ], - ), - SizedBox(height: 10.h), - Container( - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - "2023.6.21 11.15", - style: TextStyle( - fontSize: 20.sp, - color: AppColors.darkGrayTextColor), - ), - ], - ), - ), - SizedBox(width: 20.h), - ], - ), - ), - SizedBox(width: 20.h), - ], - ), - ), - ); - } -} diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart index d0d6092a..d9b3d58a 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart @@ -30,18 +30,18 @@ class Data { int? pageNo; int? pageSize; int? total; - List? useRecordList; + List? recordList; - Data({this.pageNo, this.pageSize, this.total, this.useRecordList}); + Data({this.pageNo, this.pageSize, this.total, this.recordList}); Data.fromJson(Map json) { pageNo = json['pageNo']; pageSize = json['pageSize']; total = json['total']; if (json['list'] != null) { - useRecordList = []; + recordList = []; json['list'].forEach((v) { - useRecordList!.add(UseItemData.fromJson(v)); + recordList!.add(UseItemData.fromJson(v)); }); } } @@ -51,8 +51,8 @@ class Data { data['pageNo'] = pageNo; data['pageSize'] = pageSize; data['total'] = total; - if (useRecordList != null) { - data['list'] = useRecordList!.map((v) => v.toJson()).toList(); + if (recordList != null) { + data['list'] = recordList!.map((v) => v.toJson()).toList(); } return data; } @@ -71,6 +71,15 @@ class UseItemData { String? createdAt; String? updatedAt; String? useDate; + String? orderNumber; + int? recordType; + int? smsCount; + int? emailCount; + int? cloudauthCount; + int? vipLockCount; + int? vipYear; + String? amount; + String? buyDate; UseItemData( {this.id, @@ -83,7 +92,17 @@ class UseItemData { this.lockName, this.consCount, this.createdAt, - this.updatedAt}); + this.updatedAt, + this.useDate, + this.orderNumber, + this.recordType, + this.smsCount, + this.emailCount, + this.cloudauthCount, + this.vipLockCount, + this.vipYear, + this.amount, + this.buyDate}); UseItemData.fromJson(Map json) { id = json['id']; @@ -98,6 +117,15 @@ class UseItemData { createdAt = json['created_at']; updatedAt = json['updated_at']; useDate = json['useDate']; + orderNumber = json['order_number']; + recordType = json['record_type']; + smsCount = json['sms_count']; + emailCount = json['email_count']; + cloudauthCount = json['cloudauth_count']; + vipLockCount = json['vip_lock_count']; + vipYear = json['vip_year']; + amount = json['amount']; + buyDate = json['buyDate']; } Map toJson() { @@ -114,6 +142,15 @@ class UseItemData { data['created_at'] = createdAt; data['updated_at'] = updatedAt; data['useDate'] = useDate; + data['order_number'] = orderNumber; + data['record_type'] = recordType; + data['sms_count'] = smsCount; + data['email_count'] = emailCount; + data['cloudauth_count'] = cloudauthCount; + data['vip_lock_count'] = vipLockCount; + data['vip_year'] = vipYear; + data['amount'] = amount; + data['buyDate'] = buyDate; return data; } } diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart index 1f7bed72..2fe278ae 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart @@ -1,12 +1,9 @@ -import 'dart:async'; - import 'package:get/get.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_arg.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart'; +import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; -import '../../../network/api_repository.dart'; class ValueAddedServicesRecordLogic extends BaseGetXController { ValueAddedServicesRecordLogic(); @@ -25,6 +22,7 @@ class ValueAddedServicesRecordLogic extends BaseGetXController { return; } type = data['type']; + loadBuyRecordList(false); } //请求购买记录列表 @@ -32,16 +30,21 @@ class ValueAddedServicesRecordLogic extends BaseGetXController { if (!load) { buyPageNo = 1; } - final AdvancedFunctionRecordEntity entity = - await ApiRepository.to.getBuyRecordList( + final UseRecordListEntity entity = await ApiRepository.to.getBuyRecordList( type: type, recordType: 10, pageNo: buyPageNo, ); if (entity.errorCode!.codeIsSuccessful) { - state.buyRecordList.value = entity.data!.recordList!; + if (load) { + state.buyRecordList.addAll(entity.data!.recordList!); + } else { + state.buyRecordList.value = entity.data!.recordList!; + } state.buyRecordList.refresh(); } + + loadUseRecordList(false); } //请求使用记录列表 @@ -54,27 +57,34 @@ class ValueAddedServicesRecordLogic extends BaseGetXController { pageNo: buyPageNo, ); if (entity.errorCode!.codeIsSuccessful) { - state.useRecordList.value = entity.data!.useRecordList!; + if (load) { + state.useRecordList.addAll(entity.data!.recordList!); + } else { + state.useRecordList.value = entity.data!.recordList!; + } state.useRecordList.refresh(); } } - String getBuyRecordListTitle(RecordItem itemData) { + void getBuyAndUserInfoStr(UseItemData itemData) { if (itemData.type == UseRecordListArg.sms['type']) { - return '${itemData.smsCount}条'; + state.buyCountStr.value = '${itemData.smsCount}条'; + state.useCountStr.value = + '${itemData.receiverAccount ?? ""} ${itemData.consCount}条'; + state.buyAmountStr.value = '￥${itemData.amount}'; } else if (itemData.type == UseRecordListArg.email['type']) { - return '${itemData.emailCount}封'; + state.buyCountStr.value = '${itemData.emailCount}封'; + state.useCountStr.value = + '${itemData.receiverAccount ?? ""} ${itemData.consCount}封'; + state.buyAmountStr.value = '￥${itemData.amount}'; } else if (itemData.type == UseRecordListArg.cloudauth['type']) { - return '实名认证/${itemData.cloudauthCount}次'; + state.buyCountStr.value = '实名认证/${itemData.cloudauthCount}次'; + state.useCountStr.value = + '${itemData.lockName ?? ""} ${itemData.realName ?? ""}'; + state.buyAmountStr.value = '￥${itemData.amount}'; } - return ''; - } - - @override - void onReady() { - super.onReady(); - - loadBuyRecordList(false); - loadUseRecordList(false); + state.buyCountStr.refresh(); + state.useCountStr.refresh(); + state.buyAmountStr.refresh(); } } diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart index dc641f9d..629bcc3f 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart @@ -2,7 +2,6 @@ import 'package:easy_refresh/easy_refresh.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart'; import 'package:star_lock/tools/noData.dart'; @@ -19,85 +18,84 @@ class ValueAddedServicesRecordPage extends StatefulWidget { class _ValueAddedServicesRecordPageState extends State { + final ValueAddedServicesRecordLogic logic = + Get.put(ValueAddedServicesRecordLogic()); + @override Widget build(BuildContext context) { - return GetBuilder( - init: ValueAddedServicesRecordLogic(), - builder: (ValueAddedServicesRecordLogic logic) { - return Scaffold( - backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar( - barTitle: '记录'.tr, - haveBack: true, - backgroundColor: AppColors.mainColor), - body: DefaultTabController( - length: 2, - child: Column( - children: [ - TabBar( - tabs: [tabTextItem('购买记录'.tr), tabTextItem('使用记录'.tr)], - indicatorColor: AppColors.mainColor, - indicatorSize: TabBarIndicatorSize.label, - labelColor: AppColors.mainColor, - unselectedLabelColor: AppColors.darkGrayTextColor, - ), - Expanded( - child: Obx(() => TabBarView(children: [ - _PurchaseRecords( - buyRecordList: logic.state.buyRecordList.value, - ), - _UseRecordsTable( - useRecordList: logic.state.useRecordList.value, - ), - ])), - ), - ], - ), + return Scaffold( + backgroundColor: AppColors.mainBackgroundColor, + appBar: TitleAppBar( + barTitle: '记录'.tr, + haveBack: true, + backgroundColor: AppColors.mainColor, + ), + body: DefaultTabController( + length: 2, + child: Column( + children: [ + TabBar( + tabs: [tabTextItem('购买记录'.tr), tabTextItem('使用记录'.tr)], + indicatorColor: AppColors.mainColor, + indicatorSize: TabBarIndicatorSize.label, + labelColor: AppColors.mainColor, + unselectedLabelColor: AppColors.darkGrayTextColor, ), - ); - }); + Expanded( + child: TabBarView( + children: [ + _PurchaseRecords( + buyRecordList: logic.state.buyRecordList, logic: logic), + _UseRecordsTable( + useRecordList: logic.state.useRecordList, logic: logic), + ], + )), + ], + ), + ), + ); } -} -Widget tabTextItem(String tabText) { - return Container( - margin: EdgeInsets.symmetric(vertical: 16.h), - child: Text( - tabText, - style: TextStyle(fontSize: 24.sp), - ), - ); + Widget tabTextItem(String tabText) { + return Container( + margin: EdgeInsets.symmetric(vertical: 16.h), + child: Text( + tabText, + style: TextStyle(fontSize: 24.sp), + ), + ); + } } // 购买记录 class _PurchaseRecords extends StatelessWidget { - const _PurchaseRecords({required this.buyRecordList}); - final List buyRecordList; + const _PurchaseRecords({required this.buyRecordList, required this.logic}); + final List buyRecordList; + final ValueAddedServicesRecordLogic logic; @override Widget build(BuildContext context) { - return GetBuilder( - builder: (ValueAddedServicesRecordLogic logic) { - return EasyRefresh( + return EasyRefresh( onRefresh: () async { logic.loadBuyRecordList(false); }, onLoad: () async { logic.loadBuyRecordList(true); }, - child: buyRecordList.isNotEmpty - ? ListView.builder( - itemCount: buyRecordList.length, - itemBuilder: (BuildContext context, int index) { - return _recordKeyItem(buyRecordList[index], logic); - }) - : NoData(), - ); - }); + child: Obx( + () => buyRecordList.isNotEmpty + ? ListView.builder( + itemCount: buyRecordList.length, + itemBuilder: (BuildContext context, int index) { + logic.getBuyAndUserInfoStr(buyRecordList[index]); + return _recordKeyItem(buyRecordList[index], logic); + }) + : NoData(), + )); } Widget _recordKeyItem( - RecordItem itemData, ValueAddedServicesRecordLogic logic) { + UseItemData itemData, ValueAddedServicesRecordLogic logic) { return Container( color: Colors.white, margin: EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h), @@ -115,7 +113,7 @@ class _PurchaseRecords extends StatelessWidget { fontWeight: FontWeight.bold), ), Expanded(child: Container()), - Text('￥${itemData.amount}', + Text(logic.state.buyAmountStr.value, style: TextStyle( fontSize: 24.sp, color: AppColors.blackColor, @@ -123,7 +121,7 @@ class _PurchaseRecords extends StatelessWidget { ], ), SizedBox(height: 8.h), - Text(logic.getBuyRecordListTitle(itemData), + Text(logic.state.buyCountStr.value, style: TextStyle( fontSize: 22.sp, color: AppColors.darkGrayTextColor)), ], @@ -134,32 +132,33 @@ class _PurchaseRecords extends StatelessWidget { // 使用记录 class _UseRecordsTable extends StatelessWidget { - const _UseRecordsTable({required this.useRecordList}); - final List useRecordList; + const _UseRecordsTable({required this.useRecordList, required this.logic}); + final List useRecordList; + final ValueAddedServicesRecordLogic logic; @override Widget build(BuildContext context) { - return GetBuilder( - builder: (ValueAddedServicesRecordLogic logic) { - return EasyRefresh( + return EasyRefresh( onRefresh: () async { logic.loadUseRecordList(false); }, onLoad: () async { logic.loadUseRecordList(true); }, - child: useRecordList.isNotEmpty - ? ListView.builder( - itemCount: useRecordList.length, - itemBuilder: (BuildContext context, int index) { - return _recordKeyItem(useRecordList[index]); - }) - : NoData(), - ); - }); + child: Obx( + () => useRecordList.isNotEmpty + ? ListView.builder( + itemCount: useRecordList.length, + itemBuilder: (BuildContext context, int index) { + logic.getBuyAndUserInfoStr(useRecordList[index]); + return _recordKeyItem(useRecordList[index], logic); + }) + : NoData(), + )); } - Widget _recordKeyItem(UseItemData itemData) { + Widget _recordKeyItem( + UseItemData itemData, ValueAddedServicesRecordLogic logic) { return Container( color: Colors.white, margin: EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h), @@ -170,7 +169,7 @@ class _UseRecordsTable extends StatelessWidget { Row( children: [ Text( - '${itemData.lockName ?? ""} ${itemData.realName ?? ""}', + logic.state.useCountStr.value, style: TextStyle( fontSize: 24.sp, color: AppColors.blackColor, diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart index 30b6f477..1dbb4612 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart @@ -1,7 +1,12 @@ import 'package:get/get.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; class ValueAddedServicesRecordState { int index = 0; - var buyRecordList = [].obs; //购买记录列表 - var useRecordList = [].obs; //使用记录列表 + RxList buyRecordList = [].obs; //购买记录列表 + RxList useRecordList = [].obs; //使用记录列表 + RxString buyCountStr = ''.obs; + RxString useCountStr = ''.obs; + RxString receiverUserStr = ''.obs; + RxString buyAmountStr = ''.obs; } diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index 3065627b..6e31f07e 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -36,10 +36,8 @@ import 'package:star_lock/mine/mineSet/lockUserManage/lockUserManageList/keyList import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart'; import 'package:star_lock/mine/mineSet/mineSet/weChatQRCodeEntity.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_entity.dart'; -import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRealName/face_authentication_entity.dart'; -import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/buy_record_list_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/newSMSTemplate_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/customSMSTemplateList_entity.dart'; @@ -1001,8 +999,7 @@ class ApiRepository { required int endTime, required int remoteUnlockSwitch, required int keyRight, - required bool isShowNetworkErrorMsg - }) async { + required bool isShowNetworkErrorMsg}) async { final res = await apiProvider.batchSendKey( lockIds, createUser, @@ -1017,8 +1014,7 @@ class ApiRepository { endTime, remoteUnlockSwitch, keyRight, - isShowNetworkErrorMsg - ); + isShowNetworkErrorMsg); return KeyDetailEntity.fromJson(res.body); } @@ -2114,7 +2110,7 @@ class ApiRepository { } // 获取购买记录 - Future getBuyRecordList({ + Future getBuyRecordList({ required String type, required int pageNo, required int recordType, @@ -2122,7 +2118,7 @@ class ApiRepository { }) async { final res = await apiProvider.getBuyRecordList(type, recordType, pageNo, pageSize); - return AdvancedFunctionRecordEntity.fromJson(res.body); + return UseRecordListEntity.fromJson(res.body); } // 获取使用记录 @@ -2148,11 +2144,11 @@ class ApiRepository { } // 检测实名认证是否支持开启 - Future keyCheckFace({ + Future keyCheckFace({ required int lockId, }) async { final res = await apiProvider.keyCheckFace(lockId); - return AdvancedFunctionRecordEntity.fromJson(res.body); + return ValueAddedServicesHighFunctionEntity.fromJson(res.body); } // 获取人脸认证certifyId