Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pubspec.lock
null_safety
fmk 4 years ago
parent
commit
dba658d043
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 7
      lib/mine/mine_wallet_page.dart

12
ios/Runner.xcodeproj/project.pbxproj

@ -846,7 +846,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 18;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -880,7 +880,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
MARKETING_VERSION = 1.0.18;
MARKETING_VERSION = 1.0.19;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1045,7 +1045,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 18;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1079,7 +1079,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
MARKETING_VERSION = 1.0.18;
MARKETING_VERSION = 1.0.19;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1137,7 +1137,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 18;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1171,7 +1171,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
MARKETING_VERSION = 1.0.18;
MARKETING_VERSION = 1.0.19;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",

7
lib/mine/mine_wallet_page.dart

@ -368,13 +368,18 @@ class _MineWalletPage extends State<MineWalletPage> {
);
}
toRecharge() async {
await Navigator.of(context).pushNamed('/router/recharge_page');
loadBillInfo();
}
Widget rechargeWithdrawal() {
return Row(
children: [
Expanded(
child: InkWell(
onTap: () {
Navigator.of(context).pushNamed('/router/recharge_page');
toRecharge();
},
child: Container(
margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h),

Loading…
Cancel
Save