xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1809c4d03b0418af89245176819dd194ead67a43

Authored by weixin_45529955
1 parent a366ea84
build: skipped

纪念日OK

Inline Side-by-side
Showing 2 changed files with 51 additions and 36 deletions
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
... ... @@ -135,8 +134,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
.guestInfoSunModel!.guest!.attr ==
'沉睡'
? Color.fromRGBO(223, 33, 81, 1)
: customerProvider
.guestInfoSunModel!.guest!.attr ==
: customerProvider.guestInfoSunModel!.guest!
.attr ==
'活跃'
? Color.fromRGBO(81, 170, 94, 1)
: customerProvider.guestInfoSunModel!
... ... @@ -183,7 +182,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
EdgeInsets.only(bottom: ScreenUtil().setWidth(8)),
alignment: Alignment.bottomLeft,
child: Text(
customerProvider.guestInfoSunModel!.guest!.sexStr != '' &&
customerProvider.guestInfoSunModel!.guest!.sexStr !=
'' &&
customerProvider
.guestInfoSunModel!.guest!.sexStr !=
null
... ... @@ -283,7 +283,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
? MyColours.color_999999
: customerProvider.guestInfoSunModel!.guest!.attr == '活跃'
? MyColours.color_00715F
: customerProvider.guestInfoSunModel!.guest!.attr == '流失'
: customerProvider.guestInfoSunModel!.guest!.attr ==
'流失'
? MyColours.color_E34D59
: Color.fromRGBO(239, 143, 49, 1)
: Colors.transparent,
... ... @@ -406,21 +407,25 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(
children: [
if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '')
if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
'')
Container(
constraints: BoxConstraints(
maxWidth: ScreenUtil().setWidth(260)),
child: Text(
customerProvider.guestInfoSunModel!.guest!.rnameStr!,
customerProvider
.guestInfoSunModel!.guest!.rnameStr!,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '')
if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
'')
HEmptyView(10),
if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '')
if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
'')
Container(
child: Text(
customerProvider.guestInfoSunModel!.guest!.sexStr != ''
... ... @@ -432,7 +437,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
fontSize: ScreenUtil().setSp(20),
),
)),
if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '')
if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
'')
HEmptyView(6),
Text(
customerProvider.guestInfoSunModel!.guest!.phone!,
... ... @@ -590,8 +596,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
Text(
customerProvider.guestInfoSunModel!.last?.ddate == null
? ''
: Utils.formatFromMill(
(customerProvider.guestInfoSunModel!.last?.ddate)!),
: Utils.formatFromMill((customerProvider
.guestInfoSunModel!.last?.ddate)!),
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: ScreenUtil().setSp(20),
... ... @@ -624,9 +630,11 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
color: MyColours.color_515151),
),
Text(
customerProvider.guestInfoSunModel!.last!.actualPum == null
customerProvider.guestInfoSunModel!.last!.actualPum ==
null
? '未记录'
: customerProvider.guestInfoSunModel!.last!.actualPum!,
: customerProvider
.guestInfoSunModel!.last!.actualPum!,
style: TextStyle(
fontSize: ScreenUtil().setSp(20),
color: MyColours.color_438E93),
... ... @@ -742,8 +750,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
isBold: true,
height: w(22),
onPressed: () {
NavigatorUtil.goWineDetailPage(
context, customerProvider.guestInfoSunModel!.store!.id,
NavigatorUtil.goWineDetailPage(context,
customerProvider.guestInfoSunModel!.store!.id,
onlyShow: true);
},
)
... ... @@ -1066,12 +1074,12 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
),
ListView.builder(
shrinkWrap: true,
itemCount:
customerProvider.guestInfoSunModel!.guest!.cDay !=
null
? customerProvider
.guestInfoSunModel!.guest!.cDay!.length
: 0,
itemCount: customerProvider
.guestInfoSunModel!.guest!.cDay !=
null
? customerProvider
.guestInfoSunModel!.guest!.cDay!.length
: 0,
controller: controller,
itemBuilder: (BuildContext context, int index) {
Cday cday = customerProvider
... ... @@ -1105,17 +1113,26 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
(cday.type == '1' ? '(公历)' : '(农历)');
}
}
return Center(
child: Padding(
padding: EdgeInsets.symmetric(
vertical: ScreenUtil().setWidth(10)),
child: Text(
show!,
style: TextStyle(
fontSize: ScreenUtil().setSp(26),
color: MyColours.color_333333),
),
));
return Padding(
padding: EdgeInsets.only(top: w(12)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
cday.desc ?? '',
style: TextStyle(
fontSize: font(16),
color: MyColours.color_438E93),
),
Text(
show ?? '',
style: TextStyle(
fontSize: font(14),
color: MyColours.color_000000),
),
],
));
},
)
])),
... ...
... ... @@ -251,9 +251,7 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
title: "",
content: "是否删除该纪念日",
rTitle: "删除", rCallback: () {
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
_delGuestInfocDay(model.cday![index].id);
});
}, onTapEdit: () {
... ...