xt / Flutter-ReserveApp · Commits

Go to a project

Commit ee80f0229cbd693f61334de5153732c141c01878

Authored by wdn127929
1 parent 9539ecbe
build: skipped

十.【提测变更项内容说明】v4.9.9.1

Inline Side-by-side
Showing 11 changed files with 303 additions and 199 deletions
... ... @@ -17,9 +17,9 @@ if (flutterRoot == null) {
def flutterVersionCode = "498"
def flutterVersionCode = "499"
if (flutterVersionCode == null) {
flutterVersionCode = '498'
flutterVersionCode = '499'
}
... ... @@ -28,9 +28,9 @@ if (flutterVersionCode == null) {
def flutterVersionName = "4.9.8"
def flutterVersionName = "4.9.9"
if (flutterVersionName == null) {
flutterVersionName = '4.9.8'
flutterVersionName = '4.9.9'
}
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -525,7 +525,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.8;
MARKETING_VERSION = 4.9.9;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -659,7 +659,7 @@
CURRENT_PROJECT_VERSION = 490;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -671,7 +671,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.8;
MARKETING_VERSION = 4.9.9;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -707,7 +707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.8;
MARKETING_VERSION = 4.9.9;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -29,7 +29,7 @@ class UserHistoryEntity extends Object with ISuspensionBean {
String tagIndex; //abcdefg
String get rnameStr {
if (rname == null || rname == '' || rname == ' ') return "";
return rname;
return rname + sexStr;
}
String get sexStr {
... ...
... ... @@ -12,7 +12,7 @@ UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) {
json['sid'] as String,
json['rname'] as String,
json['sex'] as String,
json['phone'] as String,
json['phone'] as String ?? '0',
json['cusdem'] as String);
}
... ...
import 'package:easy_contact_picker/easy_contact_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/provider/coupon_provider.dart';
import 'package:one_key/provider/notebook_detail_model.dart';
... ... @@ -335,6 +336,10 @@ class _EditReserverPageState extends State<EditReserverPage> {
controller: detailModel.phoneController,
focusNode: _phoneNode,
// textAlignVertical: TextAlignVertical.top,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(
11) //限制长度
],
decoration: InputDecoration(
hintText: "电话",
hintStyle: TextStyle(
... ... @@ -626,6 +631,17 @@ class _EditReserverPageState extends State<EditReserverPage> {
.userHistorys[index]
.phone
: '';
for (var item in detailModel
.sexList) {
item['select'] = false;
if (item['title'] ==
detailModel
.userHistorys[
index]
.sexStr) {
item['select'] = true;
}
}
// _homeEnterModel.nameController.text =
// _homeEnterModel
// .userHistorys[index].rname +
... ... @@ -700,7 +716,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
: detailModel
.userHistorys[
index]
.rname,
.rnameStr,
style: TextStyle(
color: MyColours
.color_333333,
... ...
... ... @@ -1658,6 +1658,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
_notebookDetailChangeModel
.phoneController,
focusNode: _phoneNode,
inputFormatters: <
TextInputFormatter>[
LengthLimitingTextInputFormatter(
11) //限制长度
],
// textAlignVertical: TextAlignVertical.top,
decoration: InputDecoration(
hintText: "电话",
... ... @@ -1896,6 +1901,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
// _homeEnterModel
// .userHistorys[index].rname +
// _nameSuffix();
for (var item
in _notebookDetailChangeModel
.sexList) {
item['select'] = false;
if (item['title'] ==
_notebookDetailChangeModel
.userHistorys[index]
.sexStr) {
item['select'] = true;
}
}
_addNameSuffix(
_notebookDetailChangeModel
.userHistorys[index]
... ... @@ -1953,7 +1969,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
child: Text(
_notebookDetailChangeModel
.userHistorys[index]
.rname,
.rnameStr,
style: TextStyle(
color: MyColours
.color_333333,
... ...
... ... @@ -1949,6 +1949,9 @@ class InvicationPageState extends State<InvicationPage>
color: MyColours.color_353535),
controller: _baseIndoProvider.phoneController,
focusNode: _phoneNode,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(11) //限制长度
],
// textAlignVertical: TextAlignVertical.top,
decoration: InputDecoration(
hintText: "预留电话",
... ... @@ -2389,6 +2392,12 @@ class InvicationPageState extends State<InvicationPage>
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {
sexStr = _baseIndoProvider
.userHistorys[index].sexStr;
sexSelectIndex =
sexList.indexOf(sexStr);
_getIsMemberByPhone(_baseIndoProvider
.userHistorys[index].phone);
needHistory = true;
... ... @@ -2443,7 +2452,7 @@ class InvicationPageState extends State<InvicationPage>
? ''
: _baseIndoProvider
.userHistorys[index]
.rname,
.rnameStr,
style: TextStyle(
color:
MyColours.color_333333,
... ...
... ... @@ -480,37 +480,57 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
children: [
Text(
myModel.reserveTotal,
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(40)),
),
Text(
'个',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(22)),
)
],
),
VEmptyView(8),
Text(
'月订单量',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_BFC4D4,
fontSize: ScreenUtil().setSp(20)),
),
],
),
InkWell(
onTap: () {
NavigatorUtil.goMonthOrderPage(
context,
DateTime.now().year.toString(),
DateTime.now().month.toString(),
uid: Provider.of<UserModel>(context,
listen: false)
.user
.openid);
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: r(20)),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Row(
children: [
Text(
myModel.reserveTotal,
style: TextStyle(
fontWeight: FontWeight.bold,
color:
MyColours.color_515151,
fontSize:
ScreenUtil().setSp(40)),
),
Text(
'个',
style: TextStyle(
fontWeight: FontWeight.bold,
color:
MyColours.color_999999,
fontSize:
ScreenUtil().setSp(22)),
)
],
),
VEmptyView(8),
Text(
'月订单量',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_BFC4D4,
fontSize:
ScreenUtil().setSp(20)),
),
],
))),
MyDivider(
ScreenUtil().setWidth(2),
ScreenUtil().setWidth(32 * 2),
... ... @@ -523,62 +543,71 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
smsInfoData: smsInfoData);
}
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
child: Container(
padding: EdgeInsets.symmetric(
horizontal: r(20)),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
myModel.smsInfo.isNotEmpty
? '${myModel.smsInfo}'
: '0',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_515151,
fontSize:
ScreenUtil().setSp(40)),
Row(
children: [
Text(
myModel.smsInfo.isNotEmpty
? '${myModel.smsInfo}'
: '0',
style: TextStyle(
fontWeight: FontWeight.bold,
color:
MyColours.color_515151,
fontSize:
ScreenUtil().setSp(40)),
),
Text(
'条',
style: TextStyle(
fontWeight: FontWeight.bold,
color:
MyColours.color_999999,
fontSize:
ScreenUtil().setSp(22)),
)
],
),
Text(
'条',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_999999,
fontSize:
ScreenUtil().setSp(22)),
)
VEmptyView(8),
RoundButton(
text: '充值短信',
gradientStart:
!Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
gradientEnd: !Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
borderColor: !Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
width:
ScreenUtil().setWidth(48 * 2),
height:
ScreenUtil().setWidth(18 * 2),
fontSize: 20,
isBold: true,
textColor: MyColours.color_ffffff,
radius: ScreenUtil().setWidth(8),
onPressed: () {
if (Utils.getAuthority(
context, '充值短信')) {
NavigatorUtil.goSmsManagePage(
context,
smsInfoData: smsInfoData);
}
})
],
),
VEmptyView(8),
RoundButton(
text: '充值短信',
gradientStart: !Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
gradientEnd: !Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
borderColor: !Utils.getAuthority(
context, '充值短信')
? MyColours.color_999999
: MyColours.color_438E93,
width: ScreenUtil().setWidth(48 * 2),
height: ScreenUtil().setWidth(18 * 2),
fontSize: 20,
isBold: true,
textColor: MyColours.color_ffffff,
radius: ScreenUtil().setWidth(8),
onPressed: () {
if (Utils.getAuthority(
context, '充值短信')) {
NavigatorUtil.goSmsManagePage(
context,
smsInfoData: smsInfoData);
}
})
],
)),
))),
MyDivider(
ScreenUtil().setWidth(2),
ScreenUtil().setWidth(32 * 2),
... ... @@ -589,8 +618,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
onTap: () {
// NavigatorUtil.goMyIntegralPage(context,
// sunModel: myModel.integralSunModel);
print('fffff');
if (outDay != '' &&
!Utils.getAuthority(context, '有效期')) {
Utils.getAuthority(context, '有效期')) {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
... ... @@ -598,8 +628,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil.goHomePage(context,
initialIndex: 4);
// NavigatorUtil.goHomePage(context,
// initialIndex: 4);
},
rCallback: () {
//立即续费
... ... @@ -622,91 +652,104 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
}
}
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
child: Container(
padding: EdgeInsets.symmetric(
horizontal: r(20)),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
outDay,
style: TextStyle(
fontWeight: FontWeight.bold,
color: outDay != '' &&
int.parse(outDay) <= 7
? MyColours.color_E34D59
: MyColours.color_515151,
fontSize:
ScreenUtil().setSp(40)),
Row(
children: [
Text(
outDay,
style: TextStyle(
fontWeight: FontWeight.bold,
color: outDay != '' &&
int.parse(outDay) <=
7
? MyColours.color_E34D59
: MyColours
.color_515151,
fontSize:
ScreenUtil().setSp(40)),
),
Text(
'天',
style: TextStyle(
fontWeight: FontWeight.bold,
color:
MyColours.color_999999,
fontSize:
ScreenUtil().setSp(22)),
)
],
),
Text(
'天',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_999999,
fontSize:
ScreenUtil().setSp(22)),
)
VEmptyView(8),
RoundButton(
text: '有效期',
gradientStart:
!Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
gradientEnd: !Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
borderColor: !Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
width:
ScreenUtil().setWidth(48 * 2),
height:
ScreenUtil().setWidth(18 * 2),
fontSize: 20,
isBold: true,
textColor: MyColours.color_ffffff,
radius: ScreenUtil().setWidth(8),
onPressed: () {
if (outDay != '' &&
Utils.getAuthority(
context, '有效期')) {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
context,
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil
.goHomePage(context,
initialIndex:
4);
},
rCallback: () {
//立即续费
},
);
} else {
DialogUtil
.cupertinoAlertSellerEdateDialog(
context,
title: '温馨提示',
isBold: true,
content:
DateUtil.formatDate(
edate,
format:
DateFormats.full,
),
rCallback: () {
//立即续费
},
);
}
}
})
],
),
VEmptyView(8),
RoundButton(
text: '有效期',
gradientStart: !Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
gradientEnd: !Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
borderColor: !Utils.getAuthority(
context, '有效期')
? MyColours.color_999999
: MyColours.color_438E93,
width: ScreenUtil().setWidth(48 * 2),
height: ScreenUtil().setWidth(18 * 2),
fontSize: 20,
isBold: true,
textColor: MyColours.color_ffffff,
radius: ScreenUtil().setWidth(8),
onPressed: () {
if (outDay != '' &&
Utils.getAuthority(
context, '有效期')) {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
context,
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil.goHomePage(
context,
initialIndex: 4);
},
rCallback: () {
//立即续费
},
);
} else {
DialogUtil
.cupertinoAlertSellerEdateDialog(
context,
title: '温馨提示',
isBold: true,
content: DateUtil.formatDate(
edate,
format: DateFormats.full,
),
rCallback: () {
//立即续费
},
);
}
}
})
],
))
)))
],
),
))
... ...
... ... @@ -83,8 +83,10 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
pinned: false,
floating: false,
leading: Container(),
backgroundColor: MyColours.color_F8F9FD,
expandedHeight: ScreenUtil().setWidth(320 + 40),
flexibleSpace: FlexibleSpaceBar(
title: null,
collapseMode: CollapseMode.pin,
background: Consumer<MyModel>(builder:
(BuildContext context, MyModel model, Widget child) {
... ... @@ -116,20 +118,20 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
Container(
// height: ScreenUtil().setWidth(40),
child: Text(
widget.infoData.lastNum,
style: TextStyle(
color: MyColours.color_ffffff,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
widget.infoData.lastNum,
style: TextStyle(
color: MyColours.color_ffffff,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
Container(
// height: ScreenUtil().setWidth(40),
child: Text(
' 条',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
))
' 条',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
))
],
),
VEmptyView(80),
... ...
... ... @@ -819,6 +819,9 @@ class TableManagerPageState extends State<TableManagerPage> {
controller: _baseIndoProvider.phoneController,
focusNode: _phoneNode,
enableInteractiveSelection: true,
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(11) //限制长度
],
// textAlignVertical: TextAlignVertical.top,
decoration: InputDecoration(
hintText: "预留电话",
... ... @@ -1258,6 +1261,23 @@ class TableManagerPageState extends State<TableManagerPage> {
// _homeEnterModel
// .userHistorys[index].rname +
// _nameSuffix();
for (var item in _baseIndoProvider
.sexList) {
item['select'] = false;
if (item['title'] ==
_baseIndoProvider
.userHistorys[index]
.sexStr) {
item['select'] = true;
sexSelectIndex =
int.parse(item['code']) -
1;
sexStr = _baseIndoProvider
.userHistorys[index]
.sexStr;
}
}
_addNameSuffix(
_baseIndoProvider
.userHistorys[index]
... ... @@ -1321,7 +1341,7 @@ class TableManagerPageState extends State<TableManagerPage> {
? ''
: _baseIndoProvider
.userHistorys[index]
.rname,
.rnameStr,
style: TextStyle(
color: MyColours
.color_333333,
... ...
... ... @@ -6427,8 +6427,7 @@ class DialogUtil {
RoundButton(
text: lTitle,
width: (ScreenUtil().screenWidth -
ScreenUtil().setWidth(62) * 2) /
2,
ScreenUtil().setWidth(62) * 2),
height: ScreenUtil().setWidth(112),
// radius: ScreenUtil().setWidth(10),
gradientStart: Colors.transparent,
... ... @@ -6570,8 +6569,7 @@ class DialogUtil {
RoundButton(
text: lTitle,
width: (ScreenUtil().screenWidth -
ScreenUtil().setWidth(62) * 2) /
2,
ScreenUtil().setWidth(62) * 2),
height: ScreenUtil().setWidth(112),
// radius: ScreenUtil().setWidth(10),
gradientStart: Colors.transparent,
... ...