xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0dd55734e5cf6ccb193515ea12acfab4a3af8c99

Authored by wdn127929
1 parent 68f45445
build: skipped

纪念日格式修改 初步未测试

Inline Side-by-side
Showing 10 changed files with 243 additions and 103 deletions
... ... @@ -109,7 +109,7 @@ class Guest extends Object {
}
String get sexStr {
if (sex == null || sex == '' ||sex == '0') return "先生";
if (sex == null || sex == '' || sex == '0') return "先生";
switch (sex.toString()) {
case "1": //先生
case "男":
... ... @@ -165,12 +165,17 @@ class Cday extends Object {
@JsonKey(name: 'cdate')
String cdate;
Cday(
this.id,
this.gid,
this.content,
this.cdate,
);
@JsonKey(name: 'desc')
String desc;
@JsonKey(name: 'type')
String type;
@JsonKey(name: 'dtime')
String dtime;
Cday(this.id, this.gid, this.content, this.cdate, this.desc, this.type,
this.dtime);
factory Cday.fromJson(Map<String, dynamic> srcJson) =>
_$CdayFromJson(srcJson);
... ... @@ -261,7 +266,7 @@ class Last extends Object {
@JsonSerializable()
class Count extends Object {
@JsonKey(name: 'leiji')
String leiji;
dynamic leiji;
@JsonKey(name: 'quxiao')
dynamic quxiao;
... ... @@ -288,10 +293,7 @@ class Store extends Object {
@JsonKey(name: 'id')
dynamic id;
Store(
this.storeDay,
this.id
);
Store(this.storeDay, this.id);
factory Store.fromJson(Map<String, dynamic> srcJson) =>
_$StoreFromJson(srcJson);
... ...
... ... @@ -106,6 +106,9 @@ Cday _$CdayFromJson(Map<String, dynamic> json) {
json['gid'] as String,
json['content'] as String,
json['cdate'] as String,
json['desc'] as String,
json['type'] as String,
json['dtime'] as String,
);
}
... ... @@ -114,6 +117,9 @@ Map<String, dynamic> _$CdayToJson(Cday instance) => <String, dynamic>{
'gid': instance.gid,
'content': instance.content,
'cdate': instance.cdate,
'desc': instance.cdate,
'type': instance.cdate,
'dtime': instance.cdate,
};
Last _$LastFromJson(Map<String, dynamic> json) {
... ... @@ -145,7 +151,7 @@ Map<String, dynamic> _$LastToJson(Last instance) => <String, dynamic>{
Count _$CountFromJson(Map<String, dynamic> json) {
return Count(
json['leiji'] as String,
json['leiji'] as dynamic,
json['quxiao'],
json['create_time'],
);
... ...
... ... @@ -94,6 +94,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
// _getUnMsgNum();
}
_cancelMessage() async {
String messageids = ''; //超过24小时
for (NewUnmessage item in messageModel.messagesUn) {
... ...
... ... @@ -879,13 +879,24 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
: 0,
controller: controller,
itemBuilder: (BuildContext context, int index) {
Cday cday = customerProvider
.guestInfoSunModel.guest.cDay[index];
String show = cday.content;
if (cday.desc != null && cday.desc != '') {
//新数据
// 组展示文本
show = cday.desc +
':' +
cday.dtime +
(cday.type == '1' ? '公历' : '农历');
}
return Center(
child: Padding(
padding: EdgeInsets.symmetric(
vertical: ScreenUtil().setWidth(10)),
child: Text(
customerProvider.guestInfoSunModel.guest
.cDay[index].content,
show,
style: TextStyle(
fontSize: ScreenUtil().setSp(26),
color: MyColours.color_333333),
... ...
... ... @@ -43,8 +43,13 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
// await customerProvider.searchData(customerProvider.controller.text);
}
_setGuestInfocDay(String id, String cday) async {
Map<String, String> params = {"gid": widget.guest.id, 'content': cday};
_setGuestInfocDay(String id, Map content) async {
Map<String, String> params = {
"gid": widget.guest.id,
'desc': content['desc'],
'type': content['type'],
'dtime': content['dtime'],
};
if (id != '') {
params["id"] = id;
}
... ... @@ -113,9 +118,25 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
shrinkWrap: true,
itemCount: model.cday.length,
itemBuilder: (BuildContext context, int index) {
Cday cday = model.cday[index];
String show = '';
if (cday.desc != null && cday.desc != '') {
//新数据
// 组展示文本
show = cday.desc +
':' +
cday.dtime +
(cday.type == '1' ? '(公历)' : '(农历)');
}
return InkWell(
onTap: () {
String str = model.cday[index].content;
String str = cday.content;
String yearStr = '选填';
String monthStr = '';
String dayStr = '';
bool gongli = true;
String content = '';
// str += '${name}:';
// if (yearStr != '' &&
// yearStr != null &&
... ... @@ -125,37 +146,68 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
// str += '${monthStr}月';
// str += '${dayStr}日';
// str += '（${gongli ? '公历' : '农历'}）';
String yearStr = '选填';
String monthStr = '';
String dayStr = '';
bool gongli = true;
String content = str.substring(0, str.indexOf(':'));
String tempStr = str.substring(str.indexOf(':'), str.length);
if (tempStr.contains('年')) {
yearStr = tempStr.substring(
tempStr.indexOf(':') + 1, tempStr.indexOf('年'));
}
if (tempStr.contains('月')) {
if (cday.desc != null && cday.desc != '') {
//新数据
content = cday.desc;
List<String> ymd = cday.dtime.split('-');
if (ymd.length == 3) {
//含有年
yearStr = ymd[0];
monthStr = ymd[1];
dayStr = ymd[2];
} else if (ymd.length == 2) {
//没有年
monthStr = ymd[0];
dayStr = ymd[1];
}
if (monthStr.startsWith('0')) {
monthStr =
monthStr.substring(1, monthStr.length);
}
if (dayStr.startsWith('0')) {
dayStr = dayStr.substring(1, dayStr.length);
}
print(monthStr);
print(dayStr);
gongli = cday.type == '1' ? true : false;
} else {
content = str.substring(0, str.indexOf(':'));
String tempStr =
str.substring(str.indexOf(':'), str.length);
if (tempStr.contains('年')) {
monthStr = tempStr.substring(
tempStr.indexOf('年') + 1, tempStr.indexOf('月'));
} else {
monthStr = tempStr.substring(
tempStr.indexOf(':') + 1, tempStr.indexOf('月'));
yearStr = tempStr.substring(
tempStr.indexOf(':') + 1,
tempStr.indexOf('年'));
}
if (tempStr.contains('月')) {
if (tempStr.contains('年')) {
monthStr = tempStr.substring(
tempStr.indexOf('年') + 1,
tempStr.indexOf('月'));
} else {
monthStr = tempStr.substring(
tempStr.indexOf(':') + 1,
tempStr.indexOf('月'));
}
}
if (tempStr.contains('日')) {
dayStr = tempStr.substring(
tempStr.indexOf('月') + 1,
tempStr.indexOf('日'));
}
if (tempStr.contains('农历')) {
gongli = false;
}
}
if (tempStr.contains('日')) {
dayStr = tempStr.substring(
tempStr.indexOf('月') + 1, tempStr.indexOf('日'));
}
if (tempStr.contains('农历')) {
gongli = false;
}
DialogUtil.festivalAlertDialog(
context, content, 520, rCallback: (name) {
print(name);
_setGuestInfocDay(model.cday[index].id, name);
context, content, 520, rCallback: (content) {
print(content);
_setGuestInfocDay(model.cday[index].id, content);
// _addCookbookClass(name, showLoading: true);
}, delCallback: () {
//弹框确认是否删除
... ... @@ -181,7 +233,7 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
children: [
Expanded(
child: Text(
model.cday[index].content,
cday.content == null ? show : cday.content,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: ScreenUtil().setSp(26),
... ... @@ -213,9 +265,9 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
context,
'',
520,
rCallback: (name) {
print(name);
_setGuestInfocDay('', name);
rCallback: (content) {
print(content);
_setGuestInfocDay('', content);
// _addCookbookClass(name, showLoading: true);
},
);
... ...
... ... @@ -890,13 +890,25 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
: 0,
controller: controller,
itemBuilder: (BuildContext context, int index) {
Cday cday = customerProvider
.guestInfoSunModel.guest.cDay[index];
String show = cday.content;
if (cday.content == null) {
//新数据
// 组展示文本
show =
cday.desc + ':' + cday.dtime +( cday.type ==
'1'
? '(公历)'
: '(农历)');
}
return Center(
child: Padding(
padding: EdgeInsets.symmetric(
vertical: ScreenUtil().setWidth(10)),
child: Text(
customerProvider.guestInfoSunModel.guest
.cDay[index].content,
show,
style: TextStyle(
fontSize: ScreenUtil().setSp(26),
color: MyColours.color_333333),
... ...
... ... @@ -43,8 +43,14 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
// await customerProvider.searchData(customerProvider.controller.text);
}
_setGuestInfocDay(String id, String cday) async {
Map<String, String> params = {"gid": widget.guest.id, 'content': cday};
_setGuestInfocDay(String id, Map content) async {
Map<String, String> params = {
"gid": widget.guest.id,
'desc': content['desc'],
'type': content['type'],
'dtime': content['dtime'],
};
if (id != '') {
params["id"] = id;
}
... ... @@ -113,9 +119,25 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
shrinkWrap: true,
itemCount: model.cday.length,
itemBuilder: (BuildContext context, int index) {
Cday cday = model.cday[index];
String show = '';
if (cday.desc != null && cday.desc != '') {
//新数据
// 组展示文本
show = cday.desc +
':' +
cday.dtime +
(cday.type == '1' ? '(公历)' : '(农历)');
}
return InkWell(
onTap: () {
String str = model.cday[index].content;
String str = cday.content;
String yearStr = '选填';
String monthStr = '';
String dayStr = '';
bool gongli = true;
String content = '';
// str += '${name}:';
// if (yearStr != '' &&
// yearStr != null &&
... ... @@ -125,43 +147,68 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
// str += '${monthStr}月';
// str += '${dayStr}日';
// str += '（${gongli ? '公历' : '农历'}）';
String yearStr = '选填';
String monthStr = '';
String dayStr = '';
bool gongli = true;
String content = str.substring(0, str.indexOf(':'));
String tempStr =
str.substring(str.indexOf(':'), str.length);
if (tempStr.contains('年')) {
yearStr = tempStr.substring(
tempStr.indexOf(':') + 1,
tempStr.indexOf('年'));
}
if (tempStr.contains('月')) {
if (cday.desc != null && cday.desc != '') {
//新数据
content = cday.desc;
List<String> ymd = cday.dtime.split('-');
if (ymd.length == 3) {
//含有年
yearStr = ymd[0];
monthStr = ymd[1];
dayStr = ymd[2];
} else if (ymd.length == 2) {
//没有年
monthStr = ymd[0];
dayStr = ymd[1];
}
if (monthStr.startsWith('0')) {
monthStr =
monthStr.substring(1, monthStr.length);
}
if (dayStr.startsWith('0')) {
dayStr = dayStr.substring(1, dayStr.length);
}
print(monthStr);
print(dayStr);
gongli = cday.type == '1' ? true : false;
} else {
content = str.substring(0, str.indexOf(':'));
String tempStr =
str.substring(str.indexOf(':'), str.length);
if (tempStr.contains('年')) {
monthStr = tempStr.substring(
tempStr.indexOf('年') + 1,
tempStr.indexOf('月'));
} else {
monthStr = tempStr.substring(
yearStr = tempStr.substring(
tempStr.indexOf(':') + 1,
tempStr.indexOf('月'));
tempStr.indexOf('年'));
}
if (tempStr.contains('月')) {
if (tempStr.contains('年')) {
monthStr = tempStr.substring(
tempStr.indexOf('年') + 1,
tempStr.indexOf('月'));
} else {
monthStr = tempStr.substring(
tempStr.indexOf(':') + 1,
tempStr.indexOf('月'));
}
}
if (tempStr.contains('日')) {
dayStr = tempStr.substring(
tempStr.indexOf('月') + 1,
tempStr.indexOf('日'));
}
if (tempStr.contains('农历')) {
gongli = false;
}
}
if (tempStr.contains('日')) {
dayStr = tempStr.substring(
tempStr.indexOf('月') + 1,
tempStr.indexOf('日'));
}
if (tempStr.contains('农历')) {
gongli = false;
}
DialogUtil.festivalAlertDialog(
context, content, 520, rCallback: (name) {
print(name);
_setGuestInfocDay(model.cday[index].id, name);
context, content, 520, rCallback: (content) {
print(content);
_setGuestInfocDay(model.cday[index].id, content);
// _addCookbookClass(name, showLoading: true);
}, delCallback: () {
//弹框确认是否删除
... ... @@ -187,7 +234,7 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
children: [
Expanded(
child: Text(
model.cday[index].content,
cday.content == null ? show : cday.content,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: ScreenUtil().setSp(26),
... ... @@ -216,9 +263,9 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
isBold: false,
onPressed: () {
DialogUtil.festivalAlertDialog(context, '', 520,
rCallback: (name) {
print(name);
_setGuestInfocDay('', name);
rCallback: (content) {
print(content);
_setGuestInfocDay('', content);
// _addCookbookClass(name, showLoading: true);
});
},
... ...
... ... @@ -218,6 +218,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
DateTime datenow = DateUtil.getDateTime(from);
//比较相差的天数
int day = edate.difference(datenow).inDays;
// difference < 0 || (difference == 0 && differenceSeconds <= 0
outDay = day < 0 ? '0' : day.toString();
// print(outDay);
} else {
... ...
... ... @@ -123,12 +123,14 @@ class CollectStoreProvider with ChangeNotifier {
element == '1' ||
element == '2' ||
element == '3' ||
element == '4');
element == '4' ||
element == '13');
sellerVersionList.forEach((element) {
if (element.vid == '1' ||
element.vid == '2' ||
element.vid == '3' ||
element.vid == '4') {
element.vid == '4' ||
element.vid == '13') {
sellerNormalEdate = element.edate;
}
});
... ... @@ -140,9 +142,9 @@ class CollectStoreProvider with ChangeNotifier {
App.sp.remove("sellerEdate");
}
}
}else{
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
} else {
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
}
return true;
... ...
... ... @@ -3838,10 +3838,7 @@ class DialogUtil {
// //跳转到被合并桌位展示页面
Map object =
await NavigatorUtil.goAreasSelectPage(
context,
table.rid,
table.name
);
context, table.rid, table.name);
if (object != null) {
state(() {
rid = object['rid'];
... ... @@ -8509,16 +8506,23 @@ class DialogUtil {
Navigator.of(context).pop();
String str = '';
str += '${name}:';
if (yearStr != '' &&
yearStr != null &&
yearStr != '选填') {
str += '${yearStr}年';
str += '${yearStr}-';
}
str += '${monthStr}月';
str += '${dayStr}日';
str += '（${gongli ? '公历' : '农历'}）';
rCallback(str);
str +=
'${Utils.addZeroNumber(int.parse(monthStr))}-';
str +=
'${Utils.addZeroNumber(int.parse(dayStr))}';
print('ggsgsg');
rCallback({
'desc': name,
'type': gongli ? '1' : '2',
'dtime': str
});
},
),
],
... ...