diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 3f3154da..271e8d7f 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 85;
+ CURRENT_PROJECT_VERSION = 86;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 1.0.85;
+ MARKETING_VERSION = 1.0.86;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -816,7 +816,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 85;
+ CURRENT_PROJECT_VERSION = 86;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 1.0.85;
+ MARKETING_VERSION = 1.0.86;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -907,7 +907,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 85;
+ CURRENT_PROJECT_VERSION = 86;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 1.0.85;
+ MARKETING_VERSION = 1.0.86;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index aa6e11cb..8e83a024 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -151,5 +151,7 @@
https://hx.lotus-wallet.com/app/
io.flutter.embedded_views_preview
YES
+ CADisableMinimumFrameDurationOnPhone
+
diff --git a/lib/integral/integral_page.dart b/lib/integral/integral_page.dart
index 82a858b1..2a81ffa6 100644
--- a/lib/integral/integral_page.dart
+++ b/lib/integral/integral_page.dart
@@ -120,6 +120,7 @@ class _IntegralPage extends State {
),
body: Container(
child: SingleChildScrollView(
+
physics: BouncingScrollPhysics(),
child: FutureBuilder(
future: querySignInfo(),
diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart
index 022e7de7..8da70c12 100644
--- a/lib/retrofit/min_api.dart
+++ b/lib/retrofit/min_api.dart
@@ -21,8 +21,8 @@ import 'data/shoppingCart.dart';
part 'min_api.g.dart';
-// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
@@ -32,8 +32,8 @@ part 'min_api.g.dart';
// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
-const base_url = "http://192.168.10.104:8765/app/";///詹云久
-const baseUrl = "http://192.168.10.104:8765/app/";///詹云久
+// const base_url = "http://192.168.10.104:8765/app/";///詹云久
+// const baseUrl = "http://192.168.10.104:8765/app/";///詹云久
// const base_url = "http://192.168.10.37:8766/app/";
diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart
index b88b200f..0d912c47 100644
--- a/lib/retrofit/min_api.g.dart
+++ b/lib/retrofit/min_api.g.dart
@@ -9,7 +9,7 @@ part of 'min_api.dart';
class _MinApiService implements MinApiService {
_MinApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
- baseUrl ??= 'http://192.168.10.104:8765/app/';
+ baseUrl ??= 'https://pos.api.lotus-wallet.com/app/';
}
final Dio _dio;
diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart
index 0b352fab..8c2f5692 100644
--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@@ -58,8 +58,8 @@ import 'data/vip_rule_details.dart';
part 'retrofit_api.g.dart';
-// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
@@ -71,8 +71,8 @@ part 'retrofit_api.g.dart';
// const baseUrl = "http://192.168.10.37:8766/app/";
-const base_url = "http://192.168.10.104:8766/app/";///詹云久
-const baseUrl = "http://192.168.10.104:8766/app/";///詹云久
+// const base_url = "http://192.168.10.104:8766/app/";///詹云久
+// const baseUrl = "http://192.168.10.104:8766/app/";///詹云久
@RestApi(baseUrl: baseUrl)
abstract class ApiService {
diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart
index 5cfa3725..35c2bbd6 100644
--- a/lib/retrofit/retrofit_api.g.dart
+++ b/lib/retrofit/retrofit_api.g.dart
@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
- baseUrl ??= 'http://192.168.10.104:8766/app/';
+ baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
}
final Dio _dio;
diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart
index 19dbd3a6..97fa5013 100644
--- a/lib/store/store_view/store_info.dart
+++ b/lib/store/store_view/store_info.dart
@@ -229,7 +229,7 @@ class _StoreInfoView extends State {
.map((e) => Container(
margin: EdgeInsets.only(right: 8.w),
child: RoundButton(
- height: 14.h * AppUtils.textScale(context),
+ height: 17.h * AppUtils.textScale(context),
text: "$e",
backgroup: Color(0xFFFF7A1A),
padding: EdgeInsets.only(