1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决ios打包问题

Browse Source 
重构组件名称
pull/1/head
张萌 3 years ago
parent 1f2854181c
commit 93ed8edca2
35 changed files with 195 additions and 140 deletions
Show Stats Download Patch File Download Diff File

2
.fvm/fvm_config.json
Unescape View File

@ -1,4 +1,4 @@
{ {
"flutterSdkVersion": "2.8.0", "flutterSdkVersion": "2.10.2",
"flavors": {} "flavors": {}
} }

108
ios/Podfile.lock
Unescape View File

@ -1,36 +1,43 @@
PODS: PODS:
- advance_pdf_viewer (1.0.5): - advance_pdf_viewer (1.0.5):
- Flutter - Flutter
- AlipaySDK-iOS (15.7.9) - AMap3DMap (9.2.1):
- AMap3DMap (8.0.0): - AMapFoundation (~> 1.6.9)
- AMapFoundation (~> 1.6.8)
- amap_flutter_location (0.0.1): - amap_flutter_location (0.0.1):
- AMapLocation (~> 2.6.7) - AMapLocation
- Flutter - Flutter
- amap_flutter_map (0.0.1): - amap_flutter_map (0.0.1):
- AMap3DMap - AMap3DMap
- Flutter - Flutter
- AMapFoundation (1.6.8) - AMapFoundation (1.6.9)
- AMapLocation (2.6.9): - AMapLocation (2.8.0):
- AMapFoundation (~> 1.6.8) - AMapFoundation (~> 1.6.9)
- audio_session (0.0.1):
- Flutter
- device_info_plus (0.0.1): - device_info_plus (0.0.1):
- Flutter - Flutter
- Flutter (1.0.0) - Flutter (1.0.0)
- flutter_sound (9.2.2):
- Flutter
- flutter_sound_core (= 9.2.2)
- flutter_sound_core (9.2.2)
- fluwx (0.0.1): - fluwx (0.0.1):
- Flutter - Flutter
- WechatOpenSDK (= 1.8.7.1) - WechatOpenSDK_Fuck (~> 1.9.2)
- FMDB (2.7.5): - FMDB (2.7.5):
- FMDB/standard (= 2.7.5) - FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5) - FMDB/standard (2.7.5)
- image_picker (0.0.1): - image_picker (0.0.1):
- Flutter - Flutter
- JCore (2.7.1) - JCore (3.1.0)
- JPush (3.7.0): - JPush (4.4.0):
- JCore (< 3.0.0, >= 2.0.0) - JCore (>= 2.0.0)
- jpush_flutter (0.0.2): - jpush_flutter (0.0.2):
- Flutter - Flutter
- JCore (= 2.7.1) - JCore (= 3.1.0)
- JPush (= 3.7.0) - JPush (= 4.4.0)
- just_audio (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11) - MTBBarcodeScanner (5.0.11)
- open_file (0.0.1): - open_file (0.0.1):
- Flutter - Flutter
@ -38,7 +45,7 @@ PODS:
- Flutter - Flutter
- package_info_plus (0.4.5): - package_info_plus (0.4.5):
- Flutter - Flutter
- path_provider (0.0.1): - path_provider_ios (0.0.1):
- Flutter - Flutter
- "permission_handler (5.1.0+2)": - "permission_handler (5.1.0+2)":
- Flutter - Flutter
@ -47,50 +54,52 @@ PODS:
- MTBBarcodeScanner - MTBBarcodeScanner
- share (0.0.1): - share (0.0.1):
- Flutter - Flutter
- shared_preferences (0.0.1): - sms_autofill (0.0.1):
- Flutter - Flutter
- sqflite (0.0.2): - sqflite (0.0.2):
- Flutter - Flutter
- FMDB (>= 2.7.5) - FMDB (>= 2.7.5)
- tobias (0.0.1): - tobias (0.0.1):
- AlipaySDK-iOS (~> 15.7.9)
- Flutter - Flutter
- url_launcher (0.0.1): - url_launcher_ios (0.0.1):
- Flutter - Flutter
- WechatOpenSDK (1.8.7.1) - WechatOpenSDK_Fuck (1.9.2)
DEPENDENCIES: DEPENDENCIES:
- advance_pdf_viewer (from `.symlinks/plugins/advance_pdf_viewer/ios`) - advance_pdf_viewer (from `.symlinks/plugins/advance_pdf_viewer/ios`)
- amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`) - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
- amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`) - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
- audio_session (from `.symlinks/plugins/audio_session/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- Flutter (from `Flutter`) - Flutter (from `Flutter`)
- flutter_sound (from `.symlinks/plugins/flutter_sound/ios`)
- fluwx (from `.symlinks/plugins/fluwx/ios`) - fluwx (from `.symlinks/plugins/fluwx/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`)
- jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
- just_audio (from `.symlinks/plugins/just_audio/ios`)
- open_file (from `.symlinks/plugins/open_file/ios`) - open_file (from `.symlinks/plugins/open_file/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`) - package_info (from `.symlinks/plugins/package_info/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
- share (from `.symlinks/plugins/share/ios`) - share (from `.symlinks/plugins/share/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - sms_autofill (from `.symlinks/plugins/sms_autofill/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`)
- tobias (from `.symlinks/plugins/tobias/ios`) - tobias (from `.symlinks/plugins/tobias/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
SPEC REPOS: SPEC REPOS:
trunk: trunk:
- AlipaySDK-iOS
- AMap3DMap - AMap3DMap
- AMapFoundation - AMapFoundation
- AMapLocation - AMapLocation
- flutter_sound_core
- FMDB - FMDB
- JCore - JCore
- JPush - JPush
- MTBBarcodeScanner - MTBBarcodeScanner
- WechatOpenSDK - WechatOpenSDK_Fuck
EXTERNAL SOURCES: EXTERNAL SOURCES:
advance_pdf_viewer: advance_pdf_viewer:
@ -99,69 +108,78 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/amap_flutter_location/ios" :path: ".symlinks/plugins/amap_flutter_location/ios"
amap_flutter_map: amap_flutter_map:
:path: ".symlinks/plugins/amap_flutter_map/ios" :path: ".symlinks/plugins/amap_flutter_map/ios"
audio_session:
:path: ".symlinks/plugins/audio_session/ios"
device_info_plus: device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios" :path: ".symlinks/plugins/device_info_plus/ios"
Flutter: Flutter:
:path: Flutter :path: Flutter
flutter_sound:
:path: ".symlinks/plugins/flutter_sound/ios"
fluwx: fluwx:
:path: ".symlinks/plugins/fluwx/ios" :path: ".symlinks/plugins/fluwx/ios"
image_picker: image_picker:
:path: ".symlinks/plugins/image_picker/ios" :path: ".symlinks/plugins/image_picker/ios"
jpush_flutter: jpush_flutter:
:path: ".symlinks/plugins/jpush_flutter/ios" :path: ".symlinks/plugins/jpush_flutter/ios"
just_audio:
:path: ".symlinks/plugins/just_audio/ios"
open_file: open_file:
:path: ".symlinks/plugins/open_file/ios" :path: ".symlinks/plugins/open_file/ios"
package_info: package_info:
:path: ".symlinks/plugins/package_info/ios" :path: ".symlinks/plugins/package_info/ios"
package_info_plus: package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios" :path: ".symlinks/plugins/package_info_plus/ios"
path_provider: path_provider_ios:
:path: ".symlinks/plugins/path_provider/ios" :path: ".symlinks/plugins/path_provider_ios/ios"
permission_handler: permission_handler:
:path: ".symlinks/plugins/permission_handler/ios" :path: ".symlinks/plugins/permission_handler/ios"
qr_code_scanner: qr_code_scanner:
:path: ".symlinks/plugins/qr_code_scanner/ios" :path: ".symlinks/plugins/qr_code_scanner/ios"
share: share:
:path: ".symlinks/plugins/share/ios" :path: ".symlinks/plugins/share/ios"
shared_preferences: sms_autofill:
:path: ".symlinks/plugins/shared_preferences/ios" :path: ".symlinks/plugins/sms_autofill/ios"
sqflite: sqflite:
:path: ".symlinks/plugins/sqflite/ios" :path: ".symlinks/plugins/sqflite/ios"
tobias: tobias:
:path: ".symlinks/plugins/tobias/ios" :path: ".symlinks/plugins/tobias/ios"
url_launcher: url_launcher_ios:
:path: ".symlinks/plugins/url_launcher/ios" :path: ".symlinks/plugins/url_launcher_ios/ios"
SPEC CHECKSUMS: SPEC CHECKSUMS:
advance_pdf_viewer: 5c832f382b4ca84fe735f893b7e91aa830c27d7b advance_pdf_viewer: 5c832f382b4ca84fe735f893b7e91aa830c27d7b
AlipaySDK-iOS: 94ff4c0e17c5e7d126b8207596d5033006534c25 AMap3DMap: 0de590972bfbe2852fe63109bc11b485d7d848fa
AMap3DMap: 89b82eaad00f9246f59d2a6103eff18be5b9dd4f amap_flutter_location: 44ff5beb64f42e0bf5feb402fe299dac0013af6f
amap_flutter_location: 3e33b57f1aad80b0dfb4b399de857a1a9f071e62
amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
AMapFoundation: 32e9a0264ee62f5aa2aaf82bdafdda7985ce09c7 AMapFoundation: 8d8ecbb0b2e9ce5487995360d26c885d94642bfd
AMapLocation: 3ec0e9bf53800b40cceb313cbd047743f75e2483 AMapLocation: 5ef44a1117be7dc541cb7a7d43d03c5ee91e4387
audio_session: 4f3e461722055d21515cf3261b64c973c062f345
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902 flutter_sound: b4eccdf53c922ad12146ac94fb2a18ceb5855c12
flutter_sound_core: 0e902ec587e9854b4f852f4bad2d625057d9958b
fluwx: 02670633ce7509206f62b366e9734e7dda81e100
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
JCore: 9d5bda3a172c65bbe14f2806ab0f6246f8a06065 JCore: 4029befb2497adc36b2496e2cfd6b24d9f671784
JPush: 1fd7a326e7e6588eba517659ce1b79a144e54938 JPush: b7d00f2cc78766e76c8abb30a5741fe94d21e5bc
jpush_flutter: d5fd523a73277ed66d453fc7ac1c981d1fa525e2 jpush_flutter: bc88cfa9a4ff4481031564b641c3fe24024bb2cb
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
share: 0b2c3e82132f5888bccca3351c504d0003b3b410 share: 0b2c3e82132f5888bccca3351c504d0003b3b410
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sms_autofill: c461043483362c3f1709ee76eaae6eb570b31686
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
tobias: 6872e2198dc30e17c10513b9ee114e28d099bc70 tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44 WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
COCOAPODS: 1.11.0 COCOAPODS: 1.11.3

6
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -382,7 +382,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = 89Z9B4EZ45; DEVELOPMENT_TEAM = R45ZDS6S92;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -526,7 +526,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = 89Z9B4EZ45; DEVELOPMENT_TEAM = R45ZDS6S92;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -564,7 +564,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = 89Z9B4EZ45; DEVELOPMENT_TEAM = R45ZDS6S92;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

8
ios/Runner/AppDelegate.swift
Unescape View File

@ -7,10 +7,10 @@ import Flutter
_ application: UIApplication, _ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool { ) -> Bool {
// if #available(iOS 10.0, *) { // if #available(iOS 10.0, *) {
// UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate // UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
// } // }
AMapServices.shared().apiKey ="84041703f7ecb242685325796897eff4" AMapServices.shared().apiKey = "84041703f7ecb242685325796897eff4"
GeneratedPluginRegistrant.register(with: self) GeneratedPluginRegistrant.register(with: self)
return super.application(application, didFinishLaunchingWithOptions: launchOptions) return super.application(application, didFinishLaunchingWithOptions: launchOptions)
} }

2
ios/Runner/Runner-Bridging-Header.h
Unescape View File

@ -1 +1,3 @@
#import "GeneratedPluginRegistrant.h" #import "GeneratedPluginRegistrant.h"
#import <AMapFoundationKit/AMapFoundationKit.h>
#import <AMapLocationKit/AMapLocationKit.h>

2
lib/pages/home/home_page.dart
Unescape View File

@ -20,7 +20,7 @@ import 'package:aku_new_community/ui/home/public_infomation/public_information_d
import 'package:aku_new_community/ui/market/search/good_detail_page.dart'; import 'package:aku_new_community/ui/market/search/good_detail_page.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/login_util.dart'; import 'package:aku_new_community/utils/login_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart';
import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';

2
lib/pages/message_center_page/announce/announce_card.dart
Unescape View File

@ -3,7 +3,7 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart';
import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart'; import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

2
lib/pages/message_center_page/reply/reply_card.dart
Unescape View File

@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/models/message/reply_list_model.dart';
import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart';
import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart'; import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';

2
lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart
Unescape View File

@ -3,7 +3,7 @@ import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/models/message/reply_list_model.dart';
import 'package:aku_new_community/models/message/thumbs_up_list_model.dart'; import 'package:aku_new_community/models/message/thumbs_up_list_model.dart';
import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:velocity_x/velocity_x.dart'; import 'package:velocity_x/velocity_x.dart';

2
lib/pages/opening_code_page/opening_code_page.dart
Unescape View File

@ -5,7 +5,7 @@ import 'package:aku_new_community/ui/profile/new_house/certification/certificati
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';

2
lib/pages/personal/user_profile_page.dart
Unescape View File

@ -8,7 +8,7 @@ import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:aku_new_community/widget/picker/bee_custom_picker.dart'; import 'package:aku_new_community/widget/picker/bee_custom_picker.dart';

12
lib/pages/personal/wallet/balance_record_view.dart
Unescape View File

@ -35,6 +35,7 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
4: '收入', 4: '收入',
5: '提现', 5: '提现',
6: '抵扣', 6: '抵扣',
7: '购买'
}; };
@override @override
@ -79,6 +80,7 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
MaterialButton( MaterialButton(
color: Colors.black.withOpacity(0.06), color: Colors.black.withOpacity(0.06),
onPressed: () async { onPressed: () async {
_pickType = _types.keys.toList()[0];
await showModalBottomSheet( await showModalBottomSheet(
context: context, context: context,
builder: (context) { builder: (context) {
@ -139,8 +141,9 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
'pageNum': _pageNum, 'pageNum': _pageNum,
'size': _size, 'size': _size,
'modelType': 0, 'modelType': 0,
'type': _pickType, 'type': _pickType == 0 ? null : _pickType,
'createDate': _pickTime, 'createDate':
DateUtil.formatDate(_pickTime, format: DateFormats.full),
}); });
_models = baseList.rows _models = baseList.rows
@ -156,8 +159,9 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
'pageNum': _pageNum, 'pageNum': _pageNum,
'size': _size, 'size': _size,
'modelType': 0, 'modelType': 0,
'type': _pickType, 'type': _pickType == 0 ? null : _pickType,
'createDate': _pickTime, 'createDate':
DateUtil.formatDate(_pickTime, format: DateFormats.full),
}); });
if (baseList.total > _models.length) { if (baseList.total > _models.length) {
_models.addAll(baseList.rows _models.addAll(baseList.rows

69
lib/pages/personal/wallet/pay_way_dialog.dart
Unescape View File

@ -61,46 +61,37 @@ class _PayWayDialogState extends State<PayWayDialog> {
_payType.add(0); _payType.add(0);
setState(() {}); setState(() {});
}, },
child: ClipRect( child: Opacity(
child: Stack( opacity: widget.insufficientBalance?0.4:1,
children: [ child: Material(
Material( color: Colors.transparent,
color: Colors.transparent, child: Row(
child: Row( children: [
children: [ Assets.newIcon.walletBalance.image(width: 48.w, height: 48.w),
Assets.newIcon.walletBalance.image(width: 48.w, height: 48.w), 8.wb,
8.wb, '钱包余额'
'钱包余额' .text
.text .size(28.sp)
.size(28.sp) .color(Colors.black.withOpacity(0.85))
.color(Colors.black.withOpacity(0.85)) .make(),
.make(), 16.wb,
16.wb, Visibility(
Visibility( visible: widget.insufficientBalance,
visible: widget.insufficientBalance, child:
child: '钱包余额不足'.text.size(24.sp).color(Colors.red).make()),
'钱包余额不足'.text.size(24.sp).color(Colors.red).make()), Spacer(),
Spacer(), BeeCheckRadio(
BeeCheckRadio( groupValue: _payType,
groupValue: _payType, value: 0,
value: 0, size: 36.w,
size: 36.w, indent: Icon(
indent: Icon( CupertinoIcons.checkmark_alt,
CupertinoIcons.checkmark_alt, color: Colors.black,
color: Colors.black, size: 28.w,
size: 28.w, ),
),
),
],
), ),
), ],
BackdropFilter( ),
filter: ImageFilter.blur(
sigmaX: widget.insufficientBalance ? 1 : 0,
sigmaY: widget.insufficientBalance ? 1 : 0),
child: Container(),
),
],
), ),
), ),
); );

12
lib/pages/personal/wallet/point_record_view.dart
Unescape View File

@ -35,6 +35,7 @@ class _PointRecordViewState extends State<PointRecordView> {
4: '收入', 4: '收入',
5: '提现', 5: '提现',
6: '抵扣', 6: '抵扣',
7: '购买'
}; };
@override @override
@ -79,6 +80,7 @@ class _PointRecordViewState extends State<PointRecordView> {
MaterialButton( MaterialButton(
color: Colors.black.withOpacity(0.06), color: Colors.black.withOpacity(0.06),
onPressed: () async { onPressed: () async {
_pickType = _types.keys.toList()[0];
await showModalBottomSheet( await showModalBottomSheet(
context: context, context: context,
builder: (context) { builder: (context) {
@ -139,8 +141,9 @@ class _PointRecordViewState extends State<PointRecordView> {
'pageNum': _pageNum, 'pageNum': _pageNum,
'size': _size, 'size': _size,
'modelType': 1, 'modelType': 1,
'type': _pickType, 'type': _pickType == 0 ? null : _pickType,
'createDate': _pickTime, 'createDate':
DateUtil.formatDate(_pickTime, format: DateFormats.full),
}); });
_models = baseList.rows _models = baseList.rows
@ -155,8 +158,9 @@ class _PointRecordViewState extends State<PointRecordView> {
'pageNum': _pageNum, 'pageNum': _pageNum,
'size': _size, 'size': _size,
'modelType': 0, 'modelType': 0,
'type': _pickType, 'type': _pickType == 0 ? null : _pickType,
'createDate': _pickTime, 'createDate':
DateUtil.formatDate(_pickTime, format: DateFormats.full),
}); });
if (baseList.total > _models.length) { if (baseList.total > _models.length) {
_models.addAll(baseList.rows _models.addAll(baseList.rows

9
lib/pages/personal/wallet/wallet_recharge_page.dart
Unescape View File

@ -2,6 +2,7 @@ import 'package:aku_new_community/extensions/num_ext.dart';
import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/pages/personal/wallet/pay_way_dialog.dart'; import 'package:aku_new_community/pages/personal/wallet/pay_way_dialog.dart';
import 'package:aku_new_community/pages/personal/wallet/wallet_trade_record_page.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';
@ -41,7 +42,7 @@ class _WalletRechargePageState extends State<WalletRechargePage>
_tabController = _tabController =
TabController(length: 2, vsync: this, initialIndex: widget.initIndex); TabController(length: 2, vsync: this, initialIndex: widget.initIndex);
_currentIndex = widget.initIndex; _currentIndex = widget.initIndex;
_rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : _pointValue[0]; _rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : (_pointValue[0]~/10);
super.initState(); super.initState();
} }
@ -51,8 +52,10 @@ class _WalletRechargePageState extends State<WalletRechargePage>
title: '钱包充值', title: '钱包充值',
actions: [ actions: [
TextButton( TextButton(
onPressed: () {}, onPressed: () {
child: '账单' Get.to(()=>WalletTradeRecordPage());
},
child: '交易记录'
.text .text
.size(28.sp) .size(28.sp)
.color(Colors.black.withOpacity(0.85)) .color(Colors.black.withOpacity(0.85))

2
lib/ui/community/activity/activity_card.dart
Unescape View File

@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/models/home/home_activity_model.dart';
import 'package:aku_new_community/ui/community/activity/activity_func.dart'; import 'package:aku_new_community/ui/community/activity/activity_func.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';

2
lib/ui/community/activity/activity_detail_page.dart
Unescape View File

@ -6,7 +6,7 @@ import 'package:aku_new_community/models/home/home_activity_model.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/buttons/bottom_button.dart'; import 'package:aku_new_community/widget/buttons/bottom_button.dart';

2
lib/ui/community/community_views/topic/topic_community_view.dart
Unescape View File

@ -6,7 +6,7 @@ import 'package:aku_new_community/models/community/topic_list_model.dart';
import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
import 'package:aku_new_community/ui/community/community_views/topic/topic_detail_page.dart'; import 'package:aku_new_community/ui/community/community_views/topic/topic_detail_page.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';

2
lib/ui/community/notice/notice_card.dart
Unescape View File

@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart';
import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

2
lib/ui/community/notice/notice_detail_page.dart
Unescape View File

@ -3,7 +3,7 @@ import 'package:aku_new_community/models/home/announce_detail_model.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
import 'package:aku_new_community/widget/views/bee_download_view.dart'; import 'package:aku_new_community/widget/views/bee_download_view.dart';

4
lib/ui/function_and_service/task/hall/hall_card.dart
Unescape View File

@ -59,7 +59,9 @@ class HallCard extends StatelessWidget {
), ),
), ),
Spacer(), Spacer(),
Assets.icons.intergral.image(width: 24.w, height: 24.w), model.rewardType == 2
? Assets.icons.intergral.image(width: 24.w, height: 24.w)
: '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
8.w.widthBox, 8.w.widthBox,
'${model.reward}'.text.size(32.sp).color(Colors.red).make() '${model.reward}'.text.size(32.sp).color(Colors.red).make()
], ],

2
lib/ui/function_and_service/task/publish_task_page.dart
Unescape View File

@ -128,9 +128,11 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
if (balance > if (balance >
(UserTool.userProvider.userInfoModel!.balance ?? 0)) { (UserTool.userProvider.userInfoModel!.balance ?? 0)) {
BotToast.showText(text: '余额不足，请前往充值'); BotToast.showText(text: '余额不足，请前往充值');
return;
} else { } else {
if (!UserTool.userProvider.userInfoModel!.isBalancePayPwd) { if (!UserTool.userProvider.userInfoModel!.isBalancePayPwd) {
Get.dialog(SetPayPasswordDialog()); Get.dialog(SetPayPasswordDialog());
return;
} else { } else {
psdCode = await Get.dialog(InputPayPasswordDialog()); psdCode = await Get.dialog(InputPayPasswordDialog());
} }

2
lib/ui/function_and_service/work_order/publish_work_order_page.dart
Unescape View File

@ -8,7 +8,7 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_
import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart'; import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart';
import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart';

2
lib/ui/home/public_infomation/public_infomation_card.dart
Unescape View File

@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/models/community/information_list_model.dart'; import 'package:aku_new_community/models/community/information_list_model.dart';
import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';

2
lib/ui/home/public_infomation/public_information_detail_page.dart
Unescape View File

@ -6,7 +6,7 @@ import 'package:aku_new_community/utils/bee_date_util.dart';
import 'package:aku_new_community/utils/link_text_parase.dart'; import 'package:aku_new_community/utils/link_text_parase.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';

2
lib/ui/market/category/new_category_sub_card.dart
Unescape View File

@ -1,7 +1,7 @@
import 'package:aku_new_community/models/market/market_all_category_model.dart'; import 'package:aku_new_community/models/market/market_all_category_model.dart';
import 'package:aku_new_community/ui/market/search/search_goods_page.dart'; import 'package:aku_new_community/ui/market/search/search_goods_page.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';

2
lib/ui/market/market_page.dart
Unescape View File

@ -22,7 +22,7 @@ import 'package:aku_new_community/ui/market/widget/animated_home_background.dart
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_list_model.dart'; import 'package:aku_new_community/utils/network/base_list_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/home/home_sliver_app_bar.dart'; import 'package:aku_new_community/widget/home/home_sliver_app_bar.dart';
import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart';
import 'package:card_swiper/card_swiper.dart'; import 'package:card_swiper/card_swiper.dart';

25
lib/ui/market/order/order_card.dart
Unescape View File

@ -1,5 +1,6 @@
import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/model/order/order_list_model.dart'; import 'package:aku_new_community/model/order/order_list_model.dart';
import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart';
import 'package:aku_new_community/pages/life_pay/pay_util.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart';
@ -668,8 +669,15 @@ class _OrderCardState extends State<OrderCard> {
Row( Row(
children: [ children: [
Spacer(), Spacer(),
'商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(), '${widget.model.payType == 10 ? '商品积分' : '商品金额'}：'
'¥${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(2)}' .text
.size(28.sp)
.color(Color(0xFF666666))
.make(),
widget.model.payType == 10
? Assets.icons.intergral.image(width: 24.w, height: 24.w)
: '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
' ${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFF666666)) .color(Color(0xFF666666))
@ -680,7 +688,7 @@ class _OrderCardState extends State<OrderCard> {
children: [ children: [
Spacer(), Spacer(),
'运费：'.text.size(28.sp).color(Color(0xFF666666)).make(), '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(),
'¥${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}' '¥ ${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFF666666)) .color(Color(0xFF666666))
@ -690,8 +698,15 @@ class _OrderCardState extends State<OrderCard> {
Row( Row(
children: [ children: [
Spacer(), Spacer(),
'实付款：'.text.size(32.sp).color(Color(0xFF333333)).make(), '${widget.model.payType == 10 ? '实付积分' : '实付款'}: '
'¥${((widget.model.payPrice ?? 0)).toStringAsFixed(2)}' .text
.size(32.sp)
.color(Color(0xFF333333))
.make(),
widget.model.payType == 10
? Assets.icons.intergral.image(width: 24.w, height: 24.w)
: '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
' ${((widget.model.payPrice ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFFE52E2E)) .color(Color(0xFFE52E2E))

17
lib/ui/market/order/order_detail_page.dart
Unescape View File

@ -4,6 +4,7 @@ import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/model/order/logistics_model.dart'; import 'package:aku_new_community/model/order/logistics_model.dart';
import 'package:aku_new_community/model/order/order_list_model.dart'; import 'package:aku_new_community/model/order/order_list_model.dart';
import 'package:aku_new_community/pages/life_pay/pay_util.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart';
@ -308,8 +309,11 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
Row( Row(
children: [ children: [
Spacer(), Spacer(),
'商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(), '${widget.orderModel.payType==10?'商品积分':'商品金额'}：'.text.size(28.sp).color(Color(0xFF666666)).make(),
'¥${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}' widget.orderModel.payType == 10
? Assets.icons.intergral.image(width: 24.w, height: 24.w)
: '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
' ${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFF333333)) .color(Color(0xFF333333))
@ -321,7 +325,7 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
children: [ children: [
Spacer(), Spacer(),
'运费：'.text.size(28.sp).color(Color(0xFF666666)).make(), '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(),
'¥${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}' '¥ ${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFF666666)) .color(Color(0xFF666666))
@ -332,8 +336,11 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
Row( Row(
children: [ children: [
Spacer(), Spacer(),
'实付款：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(), '${widget.orderModel.payType==10?'实付积分':'实付款'}：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(),
'¥${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(2)}' widget.orderModel.payType == 10
? Assets.icons.intergral.image(width: 24.w, height: 24.w)
: '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
' ${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}'
.text .text
.size(28.sp) .size(28.sp)
.color(Color(0xFFE52E2E)) .color(Color(0xFFE52E2E))

12
lib/ui/market/search/submit_order_page_normal.dart
Unescape View File

@ -61,7 +61,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
if (appProvider.defaultAddressModel != null) { if (appProvider.defaultAddressModel != null) {
_addressModel = appProvider.defaultAddressModel!; _addressModel = appProvider.defaultAddressModel!;
createOrder(_addressModel!.id!, _goodsList); // createOrder(_addressModel!.id!, _goodsList);
} else { } else {
_addressModel = null; _addressModel = null;
} }
@ -159,7 +159,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
_goodsList.map((v) => v.toJson()).toList(), _goodsList.map((v) => v.toJson()).toList(),
"payType": 10, //暂时写死 等待后续补充 "payType": 10, //暂时写死 等待后续补充
'points': widget.integral, 'points': widget.integral,
}); },showMessage: true);
if (baseModel.success) { if (baseModel.success) {
Get.off(() => OrderPage(initIndex: 2)); Get.off(() => OrderPage(initIndex: 2));
} }
@ -234,7 +234,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
'当前积分'.text.size(28.sp).color(Color(0xFF4F4F4F)).make(), '当前积分'.text.size(28.sp).color(Color(0xFF4F4F4F)).make(),
Spacer(), Spacer(),
// (UserTool.userProvider.userInfoModel!.points ?? 0) // (UserTool.userProvider.userInfoModel!.points ?? 0)
(0).text.size(28.sp).color(Colors.red).make(), (widget.integral??0).text.size(28.sp).color(Colors.red).make(),
], ],
), ),
); );
@ -258,7 +258,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
)); ));
if (result != null) { if (result != null) {
_addressModel = result; _addressModel = result;
createOrder(_addressModel!.id!, _goodsList); // createOrder(_addressModel!.id!, _goodsList);
} else { } else {
_addressModel = null; _addressModel = null;
} }
@ -690,7 +690,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
if (num > 1) { if (num > 1) {
_controllers.text = (num - 1).toString(); _controllers.text = (num - 1).toString();
_goodsList[0].num = num - 1; _goodsList[0].num = num - 1;
createOrder(_addressModel!.id!, _goodsList); // createOrder(_addressModel!.id!, _goodsList);
} }
setState(() {}); setState(() {});
@ -736,7 +736,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
_controllers.text = _controllers.text =
(int.parse(_controllers.text) + 1).toString(); (int.parse(_controllers.text) + 1).toString();
_goodsList[0].num = num + 1; _goodsList[0].num = num + 1;
createOrder(_addressModel!.id!, _goodsList); // createOrder(_addressModel!.id!, _goodsList);
setState(() {}); setState(() {});
} }

2
lib/utils/network/net_util.dart
Unescape View File

@ -215,7 +215,7 @@ class NetUtil {
//暂时隐去一键登录页 //暂时隐去一键登录页
Get.offAll(() => OtherLoginPage()); Get.offAll(() => OtherLoginPage());
} }
if (model.code==10100) { if (model.msg=='该用户未实名认证') {
BotToast.showText(text: '请先实名认证'); BotToast.showText(text: '请先实名认证');
Get.dialog(CertificationDialog()); Get.dialog(CertificationDialog());
} }

0
lib/widget/beeImageNetwork.dart → lib/widget/bee_image_network.dart
Unescape View File

2
lib/widget/others/stack_avatar.dart
Unescape View File

@ -1,5 +1,5 @@
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class StackAvatar extends StatelessWidget { class StackAvatar extends StatelessWidget {

2
lib/widget/views/bee_hor_image_view.dart
Unescape View File

@ -1,7 +1,7 @@
import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/num_ext.dart';
import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/bee_image_network.dart';
import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

9
pubspec.lock
Unescape View File

@ -760,6 +760,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -1207,7 +1214,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.3" version: "0.4.8"
time: time:
dependency: transitive dependency: transitive
description: description:

Write Preview
Loading…
Cancel
Save