xt / Flutter-ReserveApp · Commits

Go to a project

Commit 734c99884b45f37985a2c0e6166ccfea2b9c026b

Authored by wdn127929
1 parent c548a539
build: skipped

已预订列表

Inline Side-by-side
Showing 6 changed files with 55 additions and 27 deletions
... ... @@ -47,6 +47,7 @@ class Notebook {
String operator_openid;
String channel;
String cdate;
String label;
String name;
OrderInfo orderInfo;
String nick_name;
... ...
... ... @@ -48,6 +48,7 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) {
..operator_openid = json['operator_openid'] as String
..channel = json['channel'] as String
..cdate = json['cdate'] as String
..label = json['label'] as String
..name = json['name'] as String
..orderInfo = json['order_info'] == null
? null
... ... @@ -68,7 +69,7 @@ Map<String, dynamic> _$NotebookToJson(Notebook instance) => <String, dynamic>{
'pnum_str': instance.pnum_str,
'rname': instance.rname,
'sex': instance.sex,
'aname':instance.aname,
'aname': instance.aname,
'phone': instance.phone,
'cusdem': instance.cusdem,
'cusman': instance.cusman,
... ... @@ -94,6 +95,7 @@ Map<String, dynamic> _$NotebookToJson(Notebook instance) => <String, dynamic>{
'operator_openid': instance.operator_openid,
'channel': instance.channel,
'cdate': instance.cdate,
'label': instance.label,
'name': instance.name,
'order_info': instance.orderInfo,
'nick_name': instance.nick_name,
... ...
... ... @@ -459,7 +459,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
color: MyColours.color_333333),
),
Text(
'${customerProvider.guestInfoSunModel.last.sellerUserNickName} ${customerProvider.guestInfoSunModel.last.sellerUserPhone}',
'${customerProvider.guestInfoSunModel.last.sellerUserNickName ?? ''} ${customerProvider.guestInfoSunModel.last.sellerUserPhone ?? ''}',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_199095),
... ...
... ... @@ -575,7 +575,9 @@ class NoteBookItemFState extends State<NoteBookItemF>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(28)),
),
... ... @@ -589,7 +591,9 @@ class NoteBookItemFState extends State<NoteBookItemF>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(28)),
)
... ... @@ -598,29 +602,36 @@ class NoteBookItemFState extends State<NoteBookItemF>
notebook.phoneStr.isEmpty
? SizedBox()
: HEmptyView(8),
notebook.rnameStr == '' &&
notebook.phoneStr.isEmpty
(notebook.rnameStr == '' &&
notebook.phoneStr.isEmpty) ||
notebook.label == null
? SizedBox()
: Expanded(
child: Container(
: Container(
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(12),
vertical: ScreenUtil().setWidth(4)),
constraints: BoxConstraints(
maxWidth:
ScreenUtil().setWidth(74 * 2)),
decoration: BoxDecoration(
border: Border.all(
width: ScreenUtil().setWidth(2),
color: MyColours.color_A78E44),
borderRadius:
BorderRadius.circular(6)),
color: canDo
? MyColours.color_A78E44
: MyColours.color_BFC4D4),
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(6))),
child: Text(
'biaoqianvipdsdsbiaoqianvipdsdsbiaoqianvipdsdsbiaoqianvipdsdsbiaoqianvipdsds',
notebook.label,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_A78E44,
color: canDo
? MyColours.color_A78E44
: MyColours.color_BFC4D4,
fontSize: ScreenUtil().setSp(18)),
),
))
)
],
),
VEmptyView(6),
... ... @@ -634,11 +645,15 @@ class NoteBookItemFState extends State<NoteBookItemF>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(28)),
),
detail == '' ? SizedBox() : VEmptyView(6),
notebook.nick_name == null
? SizedBox()
: VEmptyView(6),
notebook.nick_name == null
? SizedBox()
: Text(
... ... @@ -646,12 +661,12 @@ class NoteBookItemFState extends State<NoteBookItemF>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_999999,
color: canDo
? MyColours.color_999999
: MyColours.color_BFC4D4,
fontSize: ScreenUtil().setSp(24)),
),
notebook.nick_name == ''
? VEmptyView(6)
: SizedBox(),
detail == '' ? SizedBox() : VEmptyView(6),
detail == ''
? SizedBox()
: Text(
... ... @@ -659,7 +674,9 @@ class NoteBookItemFState extends State<NoteBookItemF>
maxLines: 100,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_999999,
color: canDo
? MyColours.color_999999
: MyColours.color_BFC4D4,
fontSize: ScreenUtil().setSp(24)),
),
],
... ...
... ... @@ -538,7 +538,9 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(24)),
),
... ... @@ -552,7 +554,9 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(24)),
)
... ... @@ -571,7 +575,9 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_260101,
color: canDo
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(24)),
),
... ... @@ -597,8 +603,10 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color:
MyColours.color_999999,
color: canDo
? MyColours.color_999999
: MyColours
.color_BFC4D4,
fontSize:
ScreenUtil().setSp(24)),
)),
... ...
... ... @@ -88,7 +88,6 @@ class Utils {
} else {
date = datestr;
}
return date;
// if (delta < 12 * 4 * ONE_WEEK) {
// num months = toMonths(delta);
... ... @@ -98,6 +97,7 @@ class Utils {
// return (years <= 0 ? 1 : years).toInt().toString() + ONE_YEAR_AGO;
// }
}
return date;
}
static String formatFromYmd(String datestr) {
... ...