xt / Flutter-ReserveApp · Commits

Go to a project

Commit 4d4ef218aaa89a9c2842ae08b29d196e1b2d6a87

Authored by wdn127929
1 parent 410726bc
build: skipped

打包4.9.6

Inline Side-by-side
Showing 3 changed files with 327 additions and 327 deletions
... ... @@ -17,9 +17,9 @@ if (flutterRoot == null) {
def flutterVersionCode = "490"
def flutterVersionCode = "496"
if (flutterVersionCode == null) {
flutterVersionCode = '490'
flutterVersionCode = '496'
}
... ... @@ -28,9 +28,9 @@ if (flutterVersionCode == null) {
def flutterVersionName = "4.9.0"
def flutterVersionName = "4.9.6"
if (flutterVersionName == null) {
flutterVersionName = '4.9.0'
flutterVersionName = '4.9.6'
}
... ...
... ... @@ -1091,46 +1091,46 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
});
}),
VEmptyView(10),
ListView.builder(
shrinkWrap: true,
controller: _controller,
itemCount: 2,
itemBuilder: (context, index) {
return Container(
padding: EdgeInsets.symmetric(
vertical: w(12), horizontal: w(16)),
decoration: BoxDecoration(
color: MyColours.color_ffffff,
border: Border(
bottom: BorderSide(
color: index == 2 - 1
? MyColours.color_ffffff
: MyColours.color_E7E7E7,
width: w(1)))),
child: Row(
children: [
Expanded(
child: Text(
'7天内存酒超期：5位/7天内纪念日提醒：3位',
style: TextStyle(
fontSize: font(16),
color: MyColours.color_515151),
)),
Text(
'创建营销计划',
style: TextStyle(
fontSize: font(16),
color: MyColours.color_999999),
),
HEmptyView(20),
Image.asset(
Utils.getImgPath('arrow_right_new'),
width: w(12),
)
],
),
);
}),
// ListView.builder(
// shrinkWrap: true,
// controller: _controller,
// itemCount: 2,
// itemBuilder: (context, index) {
// return Container(
// padding: EdgeInsets.symmetric(
// vertical: w(12), horizontal: w(16)),
// decoration: BoxDecoration(
// color: MyColours.color_ffffff,
// border: Border(
// bottom: BorderSide(
// color: index == 2 - 1
// ? MyColours.color_ffffff
// : MyColours.color_E7E7E7,
// width: w(1)))),
// child: Row(
// children: [
// Expanded(
// child: Text(
// '7天内存酒超期：5位/7天内纪念日提醒：3位',
// style: TextStyle(
// fontSize: font(16),
// color: MyColours.color_515151),
// )),
// Text(
// '创建营销计划',
// style: TextStyle(
// fontSize: font(16),
// color: MyColours.color_999999),
// ),
// HEmptyView(20),
// Image.asset(
// Utils.getImgPath('arrow_right_new'),
// width: w(12),
// )
// ],
// ),
// );
// }),
_chart(),
// _monthWidget(),
... ...
... ... @@ -686,292 +686,292 @@ class _StoreCustomerHomeRightPageState
'${widget.customerProvider.guestSunmodel.drain.scale}'),
],
),
ListView.builder(
controller: _controller,
shrinkWrap: true,
cacheExtent: ScreenUtil().setWidth(0),
itemCount: widget.customerProvider.guestSunmodel
.tips.task ==
null ||
widget.customerProvider.guestSunmodel.tips
.task.length ==
0
? 0
: widget.customerProvider.guestSunmodel.tips
.task.length,
itemBuilder: (BuildContext context, int index) {
// locationState = state;
Task data = widget.customerProvider.guestSunmodel
.tips.task[index];
return Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_ffffff,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(20),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Image.asset(
Utils.getImgPath('warning'),
width: ScreenUtil().setWidth(42),
),
HEmptyView(15),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'店内任务：${data.content}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
data.aid != null &&
data.aidStr != null
? Padding(
padding: EdgeInsets.only(
top: ScreenUtil()
.setWidth(8)),
child: Text(
'优惠内容:${data.aidStr}',
maxLines: 1,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(24)),
),
)
: SizedBox(),
VEmptyView(8),
Text(
'创建人：${data.createUser}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_333333,
fontSize:
ScreenUtil().setSp(26)),
)
],
)),
HEmptyView(20),
Column(children: [
RoundButton(
text: '立即完成',
// ListView.builder(
// controller: _controller,
// shrinkWrap: true,
// cacheExtent: ScreenUtil().setWidth(0),
// itemCount: widget.customerProvider.guestSunmodel
// .tips.task ==
// null ||
// widget.customerProvider.guestSunmodel.tips
// .task.length ==
// 0
// ? 0
// : widget.customerProvider.guestSunmodel.tips
// .task.length,
// itemBuilder: (BuildContext context, int index) {
// // locationState = state;
// Task data = widget.customerProvider.guestSunmodel
// .tips.task[index];
// return Column(
// children: [
// VEmptyView(10),
// Container(
// color: MyColours.color_ffffff,
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(20),
// vertical: ScreenUtil().setWidth(30)),
// child: Row(
// children: [
// Image.asset(
// Utils.getImgPath('warning'),
// width: ScreenUtil().setWidth(42),
// ),
// HEmptyView(15),
// Expanded(
// child: Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// Text(
// '店内任务：${data.content}',
// maxLines: 1,
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours.color_333333,
// fontSize:
// ScreenUtil().setSp(32)),
// ),
// data.aid != null &&
// data.aidStr != null
// ? Padding(
// padding: EdgeInsets.only(
// top: ScreenUtil()
// .setWidth(8)),
// child: Text(
// '优惠内容:${data.aidStr}',
// maxLines: 1,
// overflow:
// TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours
// .color_333333,
// fontSize: ScreenUtil()
// .setSp(24)),
// ),
// )
// : SizedBox(),
// VEmptyView(8),
// Text(
// '创建人：${data.createUser}',
// maxLines: 1,
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours.color_333333,
// fontSize:
// ScreenUtil().setSp(26)),
// )
// ],
// )),
// HEmptyView(20),
// Column(children: [
// RoundButton(
// text: '立即完成',
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(26)),
gradientStart:
MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(64),
width: ScreenUtil().setWidth(180),
fontSize: 26,
isBold: false,
onPressed: () {
SellerList sellerList =
SellerList.fromJson(
json.decode(
json.encode(data)));
NavigatorUtil
.goMyMakeMarkingPageOnlyShow(
context, sellerList);
},
),
data.remainingTime != null
? Padding(
padding: EdgeInsets.only(
top: ScreenUtil()
.setWidth(6)),
child: Text(
'${data.remainingTime}天内',
maxLines: 1,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: Color.fromRGBO(
215, 30, 40, 1),
fontSize: ScreenUtil()
.setSp(26)),
))
: SizedBox()
])
],
),
),
],
);
}),
ListView.builder(
controller: _controller,
shrinkWrap: true,
cacheExtent: ScreenUtil().setWidth(0),
itemCount: widget.customerProvider.guestSunmodel
.tips.recover ==
null ||
widget.customerProvider.guestSunmodel.tips
.recover.length ==
0
? 0
: 1,
itemBuilder: (BuildContext context, int index) {
// locationState = state;
// padding: EdgeInsets.symmetric(
// horizontal:
// ScreenUtil().setWidth(26)),
// gradientStart:
// MyColours.color_199095,
// gradientEnd: MyColours.color_199095,
// // borderColor: MyColours.color_999999,
// radius: ScreenUtil().setWidth(40),
// height: ScreenUtil().setWidth(64),
// width: ScreenUtil().setWidth(180),
// fontSize: 26,
// isBold: false,
// onPressed: () {
// SellerList sellerList =
// SellerList.fromJson(
// json.decode(
// json.encode(data)));
// NavigatorUtil
// .goMyMakeMarkingPageOnlyShow(
// context, sellerList);
// },
// ),
// data.remainingTime != null
// ? Padding(
// padding: EdgeInsets.only(
// top: ScreenUtil()
// .setWidth(6)),
// child: Text(
// '${data.remainingTime}天内',
// maxLines: 1,
// overflow:
// TextOverflow.ellipsis,
// style: TextStyle(
// color: Color.fromRGBO(
// 215, 30, 40, 1),
// fontSize: ScreenUtil()
// .setSp(26)),
// ))
// : SizedBox()
// ])
// ],
// ),
// ),
// ],
// );
// }),
// ListView.builder(
// controller: _controller,
// shrinkWrap: true,
// cacheExtent: ScreenUtil().setWidth(0),
// itemCount: widget.customerProvider.guestSunmodel
// .tips.recover ==
// null ||
// widget.customerProvider.guestSunmodel.tips
// .recover.length ==
// 0
// ? 0
// : 1,
// itemBuilder: (BuildContext context, int index) {
// // locationState = state;
return Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_ffffff,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(20),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Image.asset(
Utils.getImgPath('warning'),
width: ScreenUtil().setWidth(42),
),
HEmptyView(15),
Expanded(
child: Text(
'${widget.customerProvider.guestSunmodel.tips.recover[0]}',
maxLines: 10,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(20),
RoundButton(
text: '一键追回',
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(26)),
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(64),
width: ScreenUtil().setWidth(180),
fontSize: 26,
isBold: false,
onPressed: () {
String uid = '';
menuTitle.forEach((element) {
if (element.select) {
uid = element.uid;
}
});
NavigatorUtil.goMyMakeMarkingPage(
context, uid,
fromPage: FromPage
.FromPageMyCustomer,
homeGid:
Utils.listToStringEnglish1(
widget
.customerProvider
.guestSunmodel
.tips
.recover[1]));
},
),
],
),
),
],
);
}),
ListView.builder(
controller: _controller,
shrinkWrap: true,
cacheExtent: ScreenUtil().setWidth(0),
itemCount: widget.customerProvider.guestSunmodel
.tips.awaken ==
null ||
widget.customerProvider.guestSunmodel.tips
.awaken.length ==
0
? 0
: 1,
itemBuilder: (BuildContext context, int index) {
// locationState = state;
// return Column(
// children: [
// VEmptyView(10),
// Container(
// color: MyColours.color_ffffff,
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(20),
// vertical: ScreenUtil().setWidth(30)),
// child: Row(
// children: [
// Image.asset(
// Utils.getImgPath('warning'),
// width: ScreenUtil().setWidth(42),
// ),
// HEmptyView(15),
// Expanded(
// child: Text(
// '${widget.customerProvider.guestSunmodel.tips.recover[0]}',
// maxLines: 10,
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours.color_333333,
// fontSize: ScreenUtil().setSp(32)),
// )),
// HEmptyView(20),
// RoundButton(
// text: '一键追回',
// padding: EdgeInsets.symmetric(
// horizontal:
// ScreenUtil().setWidth(26)),
// gradientStart: MyColours.color_199095,
// gradientEnd: MyColours.color_199095,
// // borderColor: MyColours.color_999999,
// radius: ScreenUtil().setWidth(40),
// height: ScreenUtil().setWidth(64),
// width: ScreenUtil().setWidth(180),
// fontSize: 26,
// isBold: false,
// onPressed: () {
// String uid = '';
// menuTitle.forEach((element) {
// if (element.select) {
// uid = element.uid;
// }
// });
// NavigatorUtil.goMyMakeMarkingPage(
// context, uid,
// fromPage: FromPage
// .FromPageMyCustomer,
// homeGid:
// Utils.listToStringEnglish1(
// widget
// .customerProvider
// .guestSunmodel
// .tips
// .recover[1]));
// },
// ),
// ],
// ),
// ),
// ],
// );
// }),
// ListView.builder(
// controller: _controller,
// shrinkWrap: true,
// cacheExtent: ScreenUtil().setWidth(0),
// itemCount: widget.customerProvider.guestSunmodel
// .tips.awaken ==
// null ||
// widget.customerProvider.guestSunmodel.tips
// .awaken.length ==
// 0
// ? 0
// : 1,
// itemBuilder: (BuildContext context, int index) {
// // locationState = state;
return Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_ffffff,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(20),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Image.asset(
Utils.getImgPath('warning'),
width: ScreenUtil().setWidth(42),
),
HEmptyView(15),
Expanded(
child: Text(
'${widget.customerProvider.guestSunmodel.tips.awaken[0]}',
maxLines: 10,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(20),
RoundButton(
text: '一键唤醒',
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(26)),
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(64),
width: ScreenUtil().setWidth(180),
fontSize: 26,
isBold: false,
onPressed: () {
String uid = '';
menuTitle.forEach((element) {
if (element.select) {
uid = element.uid;
}
});
NavigatorUtil.goMyMakeMarkingPage(
context, uid,
fromPage: FromPage
.FromPageMyCustomer,
homeGid:
Utils.listToStringEnglish1(
widget
.customerProvider
.guestSunmodel
.tips
.awaken[1]));
},
),
],
),
),
],
);
}),
// return Column(
// children: [
// VEmptyView(10),
// Container(
// color: MyColours.color_ffffff,
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(20),
// vertical: ScreenUtil().setWidth(30)),
// child: Row(
// children: [
// Image.asset(
// Utils.getImgPath('warning'),
// width: ScreenUtil().setWidth(42),
// ),
// HEmptyView(15),
// Expanded(
// child: Text(
// '${widget.customerProvider.guestSunmodel.tips.awaken[0]}',
// maxLines: 10,
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours.color_333333,
// fontSize: ScreenUtil().setSp(32)),
// )),
// HEmptyView(20),
// RoundButton(
// text: '一键唤醒',
// padding: EdgeInsets.symmetric(
// horizontal:
// ScreenUtil().setWidth(26)),
// gradientStart: MyColours.color_199095,
// gradientEnd: MyColours.color_199095,
// // borderColor: MyColours.color_999999,
// radius: ScreenUtil().setWidth(40),
// height: ScreenUtil().setWidth(64),
// width: ScreenUtil().setWidth(180),
// fontSize: 26,
// isBold: false,
// onPressed: () {
// String uid = '';
// menuTitle.forEach((element) {
// if (element.select) {
// uid = element.uid;
// }
// });
// NavigatorUtil.goMyMakeMarkingPage(
// context, uid,
// fromPage: FromPage
// .FromPageMyCustomer,
// homeGid:
// Utils.listToStringEnglish1(
// widget
// .customerProvider
// .guestSunmodel
// .tips
// .awaken[1]));
// },
// ),
// ],
// ),
// ),
// ],
// );
// }),
_chart(),
ListView.builder(
itemCount: widget
... ...