xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2409f1defa74dfb4e9da1cb88374cb86df93e099

Authored by wdn127929
1 parent 7cd067ad
build: skipped

去掉一个开关UI

Inline Side-by-side
Showing 5 changed files with 29 additions and 22 deletions
... ... @@ -20,19 +20,19 @@ if (flutterRoot == null) {
def flutterVersionCode = "552"
def flutterVersionCode = "553"
if (flutterVersionCode == null) {
flutterVersionCode = '552'
flutterVersionCode = '553'
}
def flutterVersionName = "5.5.2"
def flutterVersionName = "5.5.3"
if (flutterVersionName == null) {
flutterVersionName = '5.5.2'
flutterVersionName = '5.5.3'
}
... ...
... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 552;
CURRENT_PROJECT_VERSION = 5530;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -458,7 +458,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.2;
MARKETING_VERSION = 5.5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 552;
CURRENT_PROJECT_VERSION = 5530;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -641,7 +641,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.2;
MARKETING_VERSION = 5.5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 552;
CURRENT_PROJECT_VERSION = 5530;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -667,7 +667,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.2;
MARKETING_VERSION = 5.5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ...
... ... @@ -10,10 +10,10 @@ class Constant {
*
* 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
* */
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.release; //正式版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.preview; //体验版
// WXMiniProgramType.release; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.preview; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.test; //开发版
... ...
... ... @@ -673,10 +673,10 @@ class _CouponDetailPageState extends State<CouponDetailPage> {
),
child: Column(
children: [
_canUse(
'领取当日可用',
couponProvider.couponSunModel!
.arule!.isSameDay),
// _canUse(
// '领取当日可用',
// couponProvider.couponSunModel!
// .arule!.isSameDay),
_canUse(
'可以叠加使用其他优惠券',
couponProvider.couponSunModel!.arule!
... ...
... ... @@ -262,6 +262,10 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
widget.couponSunModel!.aexpiration!.validForever == '1'
? true
: false;
if (validForeverCus) {
fromToEndDateCus = false;
}
if (widget.couponSunModel!.aexpiration!.stime != null) {
fromToEndDateCus = true;
DateTime dateTimes = DateTime.fromMillisecondsSinceEpoch(
... ... @@ -280,16 +284,19 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
if (widget.couponSunModel!.aexpiration!.today != null &&
widget.couponSunModel!.aexpiration!.today != '') {
todayCus = true;
fromToEndDateCus = false;
todayC.text = widget.couponSunModel!.aexpiration!.today ?? '';
}
if (widget.couponSunModel!.aexpiration!.tomorrow != null &&
widget.couponSunModel!.aexpiration!.tomorrow != '') {
tomorrowCus = true;
fromToEndDateCus = false;
tomorrowC.text = widget.couponSunModel!.aexpiration!.tomorrow ?? '';
}
if (widget.couponSunModel!.aexpiration!.sday != null &&
widget.couponSunModel!.aexpiration!.sday != '') {
fromToEndDayCus = true;
fromToEndDateCus = false;
fromDayC.text = widget.couponSunModel!.aexpiration!.sday ?? '';
endDayC.text = widget.couponSunModel!.aexpiration!.eday ?? '';
}
... ... @@ -2395,11 +2402,11 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
),
child: Column(
children: [
_canUse('领取当日可用', isSameDay, () {
setState(() {
isSameDay = !isSameDay;
});
}, isBig: false),
// _canUse('领取当日可用', isSameDay, () {
// setState(() {
// isSameDay = !isSameDay;
// });
// }, isBig: false),
_canUse('可以叠加使用其他优惠券', isAccumulation, () {
setState(() {
isAccumulation = !isAccumulation;
... ...