xt / Flutter-ReserveApp · Commits

Go to a project

Commit a7734a574adba81e0f864826278db4d77a775b76

Authored by wdn127929
1 parent bee31144
build: skipped

菜单文本颜色

Inline Side-by-side
Showing 28 changed files with 1104 additions and 251 deletions
No preview for this file type
... ... @@ -42,6 +42,8 @@ class GetDzSellerConfSunModel {
String isNewTemplate;
AllCookStyle cookStyle;
String cdate;
String isStoreSms;
String storeDate;
GetDzSellerConfSunModel(
{this.id,
... ... @@ -58,7 +60,9 @@ class GetDzSellerConfSunModel {
this.isDisplayDish,
this.isNewTemplate,
this.cookStyle,
this.cdate});
this.cdate,
this.isStoreSms,
this.storeDate});
GetDzSellerConfSunModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -74,8 +78,12 @@ class GetDzSellerConfSunModel {
reserveMode = json['reserve_mode'];
isDisplayDish = json['is_display_dish'];
isNewTemplate = json['is_new_template'];
cookStyle = json['cook_style'] == null ? null: AllCookStyle.fromJson(convert.json.decode(json['cook_style']));
cookStyle = json['cook_style'] == null
? null
: AllCookStyle.fromJson(convert.json.decode(json['cook_style']));
cdate = json['cdate'];
isStoreSms = json['is_store_sms'];
storeDate = json['store_date'];
}
Map<String, dynamic> toJson() {
... ... @@ -95,6 +103,8 @@ class GetDzSellerConfSunModel {
data['is_new_template'] = this.isNewTemplate;
data['cook_style'] = this.cookStyle;
data['cdate'] = this.cdate;
data['is_store_sms'] = this.isStoreSms;
data['store_date'] = this.storeDate;
return data;
}
}
... ...
import 'package:one_key/models/recharge_list_model.dart';
import 'dart:convert' as convert;
class RechargeNoticeModel {
int ret;
RechargeNoticeSunModel data;
String msg;
RechargeNoticeModel({this.ret, this.data, this.msg});
RechargeNoticeModel.fromJson(Map<String, dynamic> json) {
ret = json['ret'];
data = json['data'] != null
? new RechargeNoticeSunModel.fromJson(json['data'])
: null;
msg = json['msg'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ret'] = this.ret;
if (this.data != null) {
data['data'] = this.data.toJson();
}
data['msg'] = this.msg;
return data;
}
}
class RechargeNoticeSunModel {
Recharge recharge;
Guest guest;
RechargeNoticeSunModel({this.recharge, this.guest});
RechargeNoticeSunModel.fromJson(Map<String, dynamic> json) {
recharge = json['recharge'] != null
? new Recharge.fromJson(json['recharge'])
: null;
guest = json['guest'] != null ? new Guest.fromJson(json['guest']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.recharge != null) {
data['recharge'] = this.recharge.toJson();
}
if (this.guest != null) {
data['guest'] = this.guest.toJson();
}
return data;
}
}
class Recharge {
String id;
String uid;
String sellerid;
String rname;
String rechargeMoney;
RechargeListDataModel rechargeList;
RechargeDateModel expDate;
String explain;
String isOpen;
String status;
String isExamine;
String stime;
String etime;
String qrcode;
String cdate;
Recharge(
{this.id,
this.uid,
this.sellerid,
this.rname,
this.rechargeMoney,
this.rechargeList,
this.expDate,
this.explain,
this.isOpen,
this.status,
this.isExamine,
this.stime,
this.etime,
this.qrcode,
this.cdate});
Recharge.fromJson(Map<String, dynamic> json) {
id = json['id'];
uid = json['uid'];
sellerid = json['sellerid'];
rname = json['rname'];
rechargeMoney = json['recharge_money'];
rechargeList = json['recharge_list'] == null
? null
: json['recharge_list'] is Map
? RechargeListDataModel.fromJson(json['recharge_list'])
: RechargeListDataModel.fromJson(convert
.jsonDecode(json['recharge_list']) as Map<String, dynamic>);
expDate = json['exp_date'] == null
? null
: json['exp_date'] is Map
? RechargeDateModel.fromJson(json['exp_date'])
: RechargeDateModel.fromJson(
convert.jsonDecode(json['exp_date']) as Map<String, dynamic>);
explain = json['explain'];
isOpen = json['is_open'];
status = json['status'];
isExamine = json['is_examine'];
stime = json['stime'];
etime = json['etime'];
qrcode = json['qrcode'];
cdate = json['cdate'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['uid'] = this.uid;
data['sellerid'] = this.sellerid;
data['rname'] = this.rname;
data['recharge_money'] = this.rechargeMoney;
data['recharge_list'] = this.rechargeList;
data['exp_date'] = this.expDate;
data['explain'] = this.explain;
data['is_open'] = this.isOpen;
data['status'] = this.status;
data['is_examine'] = this.isExamine;
data['stime'] = this.stime;
data['etime'] = this.etime;
data['qrcode'] = this.qrcode;
data['cdate'] = this.cdate;
return data;
}
}
class Guest {
String id;
String sellerid;
String uid;
String rname;
String sex;
String phone;
Null company;
Null section;
String label;
Null position;
Null taboos;
Null like;
Null serve;
String cDay;
String isMember;
Null cdate;
Null udate;
Guest(
{this.id,
this.sellerid,
this.uid,
this.rname,
this.sex,
this.phone,
this.company,
this.section,
this.label,
this.position,
this.taboos,
this.like,
this.serve,
this.cDay,
this.isMember,
this.cdate,
this.udate});
Guest.fromJson(Map<String, dynamic> json) {
id = json['id'];
sellerid = json['sellerid'];
uid = json['uid'];
rname = json['rname'];
sex = json['sex'];
phone = json['phone'];
company = json['company'];
section = json['section'];
label = json['label'];
position = json['position'];
taboos = json['taboos'];
like = json['like'];
serve = json['serve'];
cDay = json['c_day'];
isMember = json['is_member'];
cdate = json['cdate'];
udate = json['udate'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['sellerid'] = this.sellerid;
data['uid'] = this.uid;
data['rname'] = this.rname;
data['sex'] = this.sex;
data['phone'] = this.phone;
data['company'] = this.company;
data['section'] = this.section;
data['label'] = this.label;
data['position'] = this.position;
data['taboos'] = this.taboos;
data['like'] = this.like;
data['serve'] = this.serve;
data['c_day'] = this.cDay;
data['is_member'] = this.isMember;
data['cdate'] = this.cdate;
data['udate'] = this.udate;
return data;
}
}
... ...
... ... @@ -436,4 +436,8 @@ class HttpUrl {
static const String get_is_examine_list =
"?service=App.Activity.GetIsExamineList"; // 商家券核销列表
static const String get_pay_message_by_id =
"?service=App.Activity.GetPayMessageByID"; // 充值成功通知消息获取详情
}
... ...
... ... @@ -338,6 +338,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
context, notifyParam['rid'], notifyParam["uid"],
mid: notifyParam['mid'], fromNotify: true);
break;
case "17":
//充值优惠活动充值成功
print('fff');
NavigatorUtil.goMessageRechargeInfoPage(context, notifyParam['id']);
break;
case "1":
NavigatorUtil.goHasOrderFoodPage(context,
rid: notifyParam["rid"], fromNotify: true);
... ... @@ -552,6 +557,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
context, custom['rid'].toString(), custom["uid"].toString(),
mid: custom['mid'].toString(), fromNotify: true);
break;
case "17":
//充值优惠活动充值成功
print('fff');
NavigatorUtil.goMessageRechargeInfoPage(context, custom['id']);
break;
case "1":
//提前点餐消息
NavigatorUtil.goHasOrderFoodPage(context,
... ...
... ... @@ -24,8 +24,8 @@ import '../../../../widgets/v_empty_view.dart';
*/
class MessageRechargeInfoPage extends StatefulWidget {
final String idstr;
MessageRechargeInfoPage({Key key, this.idstr}) : super(key: key);
final String idStr;
MessageRechargeInfoPage({Key key, this.idStr}) : super(key: key);
@override
_MessageRechargeInfoPageState createState() =>
... ... @@ -43,12 +43,13 @@ class _MessageRechargeInfoPageState extends State<MessageRechargeInfoPage> {
// if (widget.idstr != null && widget.idstr != 'null') {
// _getNewRechargeDetail();
// }
_getPayMessageByID();
});
}
_getNewRechargeDetail() async {
bool success = await marketingCenterProvider.getNewRechargeDetail(
context, widget.idstr);
_getPayMessageByID() async {
bool success =
await marketingCenterProvider.getPayMessageByID(context, widget.idStr);
}
///输入框
... ...
... ... @@ -79,12 +79,16 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
MessageMenuModel model5 = MessageMenuModel();
model5.title = '在线买单';
model5.select = false;
// MessageMenuModel model6 = MessageMenuModel();
// model6.title = '会员充值';
// model6.select = false;
MessageMenuModel model6 = MessageMenuModel();
model6.title = '会员充值';
model6.select = false;
// menuTitle = [model1, model2, model3, model4, model5, model6];
menuTitle = [model1, model2, model3, model4, model5];
MessageMenuModel model7 = MessageMenuModel();
model7.title = '存酒超期';
model7.select = false;
menuTitle = [model1, model2, model3, model4, model5, model6, model7];
// menuTitle = [model1, model2, model3, model4, model5];
}
@override
... ... @@ -167,11 +171,13 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
} else if (index == 4) {
//在线买单
typeid = '12';
} else if (index == 5) {
//会员充值
typeid = '17';
} else if (index == 6) {
//存酒超期
// typeid = '17';
}
// else if (index == 5) {
// //会员充值
// typeid = '12';
// }
getMessage(typeid, showLoading: true);
},
child: Container(
... ...
... ... @@ -318,7 +318,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
fontSize: ScreenUtil().setSp(20),
),
)),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '') HEmptyView(6),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '')
HEmptyView(6),
Text(
customerProvider.guestInfoSunModel.guest.phone,
overflow: TextOverflow.ellipsis,
... ... @@ -599,7 +600,30 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
customerProvider.guestInfoSunModel.guest.id,
customerProvider.guestInfoSunModel.guest.phone);
},
)
),
if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
'0')
VEmptyView(20),
if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
'0')
RoundButton(
text: '存酒详情',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_438E93,
borderColor: MyColours.color_438E93,
width: w(72),
radius: r(11),
fontSize: 24,
isBold: true,
height: w(22),
onPressed: () {
// NavigatorUtil.goMyCustomerOrderPage(
// context,
// customerProvider.guestInfoSunModel.guest.id,
// customerProvider.guestInfoSunModel.guest.phone);
},
)
],
))
],
... ...
... ... @@ -611,7 +611,30 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
customerProvider.guestInfoSunModel.guest.id,
customerProvider.guestInfoSunModel.guest.phone);
},
)
),
if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
'0')
VEmptyView(20),
if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
'0')
RoundButton(
text: '存酒详情',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_438E93,
borderColor: MyColours.color_438E93,
width: w(72),
radius: r(11),
fontSize: 24,
isBold: true,
height: w(22),
onPressed: () {
// NavigatorUtil.goMyCustomerOrderPage(
// context,
// customerProvider.guestInfoSunModel.guest.id,
// customerProvider.guestInfoSunModel.guest.phone);
},
)
],
))
],
... ...
... ... @@ -246,14 +246,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -282,14 +283,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
])),
color: themeColerModel1.name == '珍珠白' ? MyColours.color_515151 :MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
)),
VEmptyView(20),
model.spec != null
? Column(
... ... @@ -301,14 +303,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
),
... ... @@ -335,14 +338,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
);
});
... ... @@ -360,14 +364,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -396,14 +401,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
])),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 :MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
)),
VEmptyView(20),
model.spec != null
? Column(
... ... @@ -415,14 +421,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
),
... ... @@ -446,14 +453,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -482,14 +490,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]))
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
))
],
),
)),
... ... @@ -504,14 +513,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColerModel1.name == '珍珠白' ? MyColours.color_515151 :MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
);
... ... @@ -532,14 +542,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -570,14 +581,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
VEmptyView(20),
Padding(
... ... @@ -592,14 +604,15 @@ class _MenuManagePageState extends State<MenuManagePage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color:themeColerModel1.name == '珍珠白' ? MyColours.color_515151 : MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
VEmptyView(30),
if (model.image != null)
... ...
... ... @@ -303,16 +303,19 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
Text(
model.name,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
fontWeight: FontWeight.bold,
fontSize: font(20),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD,
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -341,14 +344,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
])),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
)),
VEmptyView(20),
model.spec != null
? Column(
... ... @@ -360,14 +366,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
),
... ... @@ -394,14 +403,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
);
});
... ... @@ -419,14 +431,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -455,14 +470,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
])),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
)),
VEmptyView(20),
model.spec != null
? Column(
... ... @@ -474,14 +492,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
),
... ... @@ -505,14 +526,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -541,19 +565,22 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]))
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
))
],
),
)),
HEmptyView(10),
model.spec != null
model.spec != null
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
... ... @@ -563,14 +590,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
),
],
);
... ... @@ -591,14 +621,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(20),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
if ((model.taste != null &&
model.taste != '' &&
... ... @@ -629,14 +662,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(12),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
VEmptyView(20),
Padding(
... ... @@ -651,14 +687,17 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: font(14),
color: MyColours.color_515151,
shadows: [
BoxShadow(
color: MyColours.color_FBF6F1,
offset: Offset(0, 1),
blurRadius: w(2),
spreadRadius: w(20))
]),
color: themeColorData[themeColorIndex].name == '珍珠白'
? MyColours.color_515151
: MyColours.color_F8F9FD
// shadows: [
// BoxShadow(
// color: MyColours.color_FBF6F1,
// offset: Offset(0, 1),
// blurRadius: w(2),
// spreadRadius: w(20))
// ]
),
)),
VEmptyView(30),
if (model.image != null)
... ... @@ -960,8 +999,7 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
),
Positioned(
bottom: ScreenUtil().setWidth(14),
right:
ScreenUtil().setWidth(150),
right: ScreenUtil().setWidth(150),
child: model.status == '1'
? SizedBox()
: Image.asset(
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:provider/provider.dart';
import '../../../models/wine_manage_model.dart';
import '../../../provider/customer_provider.dart';
import '../../../provider/menu_provider.dart';
import '../../../provider/store_wine_provider.dart';
import '../../../provider/user_model.dart';
import '../../../res/colors.dart';
import '../../../route/navigator_util.dart';
import '../../../utils/event_bus.dart';
import '../../../utils/screen_util.dart';
import '../../../utils/utils.dart';
import '../../../widgets/MyDivider.dart';
... ... @@ -35,6 +41,8 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
ScrollController _controller = ScrollController();
String isMember = '';
MenuManageProvider menuManageProvider;
bool needSms = true;
@override
void initState() {
... ... @@ -45,7 +53,20 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
element.wineNumC.text = element.wineStock; //出库数量初始化剩余库存量
element.checkAmount = element.wineStock; //出库数量初始化剩余库存量
});
_getIsMemberByPhone();
WidgetsBinding.instance.addPostFrameCallback((_) async {
_getIsMemberByPhone();
_getDzSellerConf();
});
}
_getDzSellerConf() async {
bool success =
await menuManageProvider.getDzSellerConf(context, showLoading: false);
if (success) {
needSms =
menuManageProvider.dzSellerConfModel.isStoreSms == '0' ? false : true;
}
}
///获取手机号是否为商家会员
... ... @@ -70,6 +91,102 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
setState(() {});
}
//出库
_outWine(WineManageModel detail) async {
//出库申请提交接口
List<WineCheckModel> outWineData = [];
for (int i = 0; i < detail.wineDataMove.length; i++) {
WineManageSunMoveModel element = detail.wineDataMove[i];
// if (element.wineNameC.text.trim().length == 0) {
// Utils.showToast('请输入酒品名称!');
// // return false;
// can = false;
// break outerloop;
// }
if (element.checkAmount != null &&
element.checkAmount != '' &&
double.parse(element.checkAmount) > 0) {
//有输入数量
WineCheckModel sunMoveModel = WineCheckModel();
sunMoveModel.wineName = element.wineName;
sunMoveModel.checkAmount = element.checkAmount;
sunMoveModel.wineNumber = element.wineNumber;
sunMoveModel.unit = element.unit;
sunMoveModel.img = element.img;
outWineData.add(sunMoveModel);
}
}
Map<String, String> pramas = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'uid': Provider.of<UserModel>(context, listen: false).user.openid,
'wid': detail.id,
'wine_check': jsonEncode(outWineData)
};
bool success = await storeWineProvider
.setStoreWineBySellerCheck(context, pramas, showLoading: true);
if (success) {
List<Map<String, String>> data = [];
widget.wineManageDetail.wineDataMove.forEach((element) {
double wineStock =
double.parse(element.wineStock) - double.parse(element.checkAmount);
String winestockStr =
(NumUtil.getNumByValueDouble(wineStock, 2)).toStringAsFixed(2);
Map<String, String> map = {
'wine_name': element.wineName, //酒名称
'wine_amount': element.wineAmount, //初始存酒量
'unit': element.unit, //单位
'wine_number': element.wineNumber, //存酒编号
'wine_stock': '${winestockStr}', //剩余库存,
'cdate': element.cdate,
'img': element.img == null || element.img.length == 0
? null
: json.encode(element.img),
};
data.add(map);
});
Map<String, String> pramasreresh = {
'id': detail.id,
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'uid': Provider.of<UserModel>(context, listen: false).user.openid,
'rname': detail.rname,
'sex': detail.sex, //性别 1 男 2 女 3 公司
'is_member': detail.isMember, //会员状态
'phone': detail.phone,
'wine': json.encode(data)
};
// if (widget.id != null) {
//修改存酒信息
// pramas['id'] = widget.id;
// }
bool succesReresh = await storeWineProvider
.setStoreWineBySeller(context, pramasreresh, showLoading: true);
if (succesReresh) {
//刷新库存数量成功
//
Navigator.pop(context);
Navigator.pop(context);
// Navigator.pop(context);
//刷新首页数据
bus.emit('refresh_wine_home_list', {'index': 1});
DialogUtil.cupertinoAlertDialogOnly(context,
content:
'客户${detail.rname + detail.sexStr}的酒品已经出库。\n您可以在存酒管理-出库记录中查看详细信息。',
rTitle: '我知道了');
}
}
}
Widget _textItemWidget(
String title,
String subTitle,
... ... @@ -106,6 +223,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
@override
Widget build(BuildContext context) {
storeWineProvider = Provider.of<StoreWineProvider>(context, listen: true);
menuManageProvider = Provider.of<MenuManageProvider>(context, listen: false);
return KeyboardDismissOnTap(
child: Scaffold(
appBar: SystemAppBar(
... ... @@ -276,9 +394,17 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
widget.wineManageDetail.toJson());
modelTemp.wineData = [];
NavigatorUtil.goSmsCodeInputPage(
context, modelTemp);
if (needSms) {
NavigatorUtil.goSmsCodeInputPage(
context, modelTemp);
} else {
//直接出库
DialogUtil.cupertinoAlertDialog(context,title: '',
content: '确定要取出当前酒品么?', rCallback: () {
//确定
_outWine(modelTemp);
});
}
} else {
Utils.showToast('请输入出库数量!');
}
... ...
... ... @@ -380,12 +380,26 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
return KeyboardDismissOnTap(
child: Scaffold(
resizeToAvoidBottomInset: false,
appBar: SystemAppBar(
'存酒管理',
onTap: () {
EventBus().emit('changeStatusColor');
Navigator.pop(context);
},
rightImgName: 'set_g.png',
onTapRight: () {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
bool isRole = userModel.user.role_name == '管理员' ||
userModel.user.role_name == '店长'
? true
: false;
if (isRole) {
NavigatorUtil.goWineSettingPage(context);
} else {
Utils.showToast('您不是店铺的管理员或者店长，无权进行相关操作。');
}
},
),
body: WillPopScope(
onWillPop: () async {
... ...
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/provider/menu_provider.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:provider/provider.dart';
import '../../../provider/user_model.dart';
import '../../../utils/screen_util.dart';
import '../../../widgets/h_empty_view.dart';
/**
* 存酒配置
*/
class WineSettingPage extends StatefulWidget {
WineSettingPage({Key key}) : super(key: key);
@override
_WineSettingPageState createState() => _WineSettingPageState();
}
class _WineSettingPageState extends State<WineSettingPage> {
TextEditingController dayC = TextEditingController();
FocusNode dayF = FocusNode();
bool swich = true;
MenuManageProvider menuManageProvider;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) async {
_getDzSellerConf();
});
}
_getDzSellerConf() async {
bool success =
await menuManageProvider.getDzSellerConf(context, showLoading: false);
if (success) {
swich =
menuManageProvider.dzSellerConfModel.isStoreSms == '0' ? false : true;
dayC.text = menuManageProvider.dzSellerConfModel.storeDate ?? '';
setState(() {});
}
}
Widget _divider() {
return Padding(
padding: EdgeInsets.only(left: w(16)),
child: MyDivider(
double.infinity,
w(1),
color: MyColours.color_E7E7E7,
),
);
}
///请输入
///输入框
Widget _textfield(
BuildContext context,
String title,
String hintText,
TextEditingController editingController,
FocusNode focusNode,
String subTitle,
{TextInputType inputType = TextInputType.number}) {
return Container(
height: w(48),
margin: EdgeInsets.only(top: w(12)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
// width: w(81),
// height: w(48),
// alignment: Alignment.center,
child: Text(
title,
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_515151),
),
),
HEmptyView(32),
Expanded(
child: Container(
// height: ScreenUtil().setHeight(120),
height: w(48),
padding: EdgeInsets.only(top: w(4)),
child: TextField(
controller: editingController,
textAlign: TextAlign.right,
// textAlignVertical: TextAlignVertical.bottom,
maxLines: 1,
// inputFormatters: [],
// //光标颜色
// cursorColor:
// widget.isSelect ? Colors.white : MyColours.color_199095,
//输入文本的样式
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_515151),
focusNode: focusNode,
decoration: InputDecoration(
border: OutlineInputBorder(borderSide: BorderSide.none),
hintText: hintText,
hintStyle: TextStyle(
color: hintText == '请输入'
? MyColours.color_999999
: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32),
),
contentPadding: EdgeInsets.zero,
),
onChanged: (value) {},
onEditingComplete: () {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
},
keyboardType: inputType,
)),
),
Container(
padding: EdgeInsets.only(left: w(4)),
child: Text(
subTitle,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
),
),
],
),
);
}
///获取经理数据
Future<bool> _setIsStoreSms() async {
Map<String, String> params = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'key': 'is_store_sms',
'value': swich ? '1' : '0'
};
bool success =
await menuManageProvider.setConfing(context, params, needToast: false);
if (success) {
return true;
} else {
return false;
}
}
///
Future<bool> _setStoreDate() async {
Map<String, String> params = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'key': 'store_date',
'value': dayC.text.trim()
};
bool success =
await menuManageProvider.setConfing(context, params, needToast: false);
if (success) {
return true;
} else {
return false;
}
}
_setData() async {
await Future.wait<bool>([_setIsStoreSms(), _setStoreDate()])
.then((results) async {
print(results[0]);
if (results[0] && results[1]) {
//都成功
Utils.showToast('设置成功');
} else {
if (results[0]) {
//取酒是否需要短信验证码成功
Utils.showToast('取酒需要提供短信验证码设置成功');
} else {
//取酒是否需要短信验证码成功失败
Utils.showToast('取酒需要提供短信验证码设置失败');
}
if (results[1]) {
//超期提醒天数成功
Utils.showToast('超期提醒天数设置成功');
} else {
//超期提醒天数失败
Utils.showToast('超期提醒天数设置失败');
}
}
}).catchError((e) {
print(e);
});
}
@override
Widget build(BuildContext context) {
menuManageProvider =
Provider.of<MenuManageProvider>(context, listen: false);
return KeyboardDismissOnTap(
child: Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar(
'存酒配置',
),
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
InkWell(
onTap: () {
setState(() {
swich = !swich;
});
},
child: Container(
height: w(48),
padding: EdgeInsets.symmetric(horizontal: w(16)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'取酒需要提供短信验证码',
style: TextStyle(
fontSize: font(16),
color: MyColours.color_515151),
),
Image.asset(
Utils.getImgPath(swich ? 'swich_on' : 'swich_off'),
width: w(44),
)
],
),
)),
_divider(),
Container(
height: w(48),
padding: EdgeInsets.symmetric(horizontal: w(16)),
child:
_textfield(context, '存酒超期提醒', '请输入', dayC, dayF, '天')),
_divider(),
],
)),
),
RoundButton(
text: '保存',
height: w(40),
margin: EdgeInsets.only(
left: w(45), right: w(45), top: w(13), bottom: w(26)),
bgColor: MyColours.color_438E93,
textColor: MyColours.color_F9F9F9,
isBold: true,
fontSize: 32,
radius: r(8),
onPressed: () async {
if (dayC.text.trim().length == 0) {
Utils.showToast('请输入存酒超期提醒天数!');
return;
}
if (!Utils.isInteger(dayC.text.trim())) {
Utils.showToast('请输入数字!');
return;
}
//接口保存
//
//调用接口
_setData();
},
)
],
),
));
}
}
... ...
... ... @@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
import '../constant/constant.dart';
import '../constant/error.dart';
import '../models/mark_data_model.dart';
import '../models/recharge_notice_model.dart';
import '../models/tableOuter.dart';
import '../net/base_resp.dart';
import '../net/dio_util.dart';
... ... @@ -30,7 +31,10 @@ class MarketingCenterProvider extends ChangeNotifier {
PageState pageStateHistory = PageState.Loading;
PageState pageStateMessageDetail = PageState.Success;
PageState pageStateMessageDetail = PageState.Loading;
RechargeNoticeSunModel rechargeNoticeSunModel;
//获取桌位列表
getTableList(context, {needLoading = true}) async {
... ... @@ -274,4 +278,36 @@ class MarketingCenterProvider extends ChangeNotifier {
notifyListeners();
return false;
}
// 充值成功通知消息获取详情
Future<bool> getPayMessageByID(BuildContext context, String id,
{bool showLoading = true}) async {
Map<String, String> params = {
"id": id,
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_pay_message_by_id,
data: params,
showLoading:
pageStateDetail == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateMessageDetail = PageState.ConnectivityError;
print(error.toString());
Utils.showToast('获取新充值活动详情失败,请重试');
notifyListeners();
return false;
});
if (baseResp.code == Constant.status_success) {
rechargeNoticeSunModel =
RechargeNoticeModel.fromJson(baseResp.data).data;
pageStateMessageDetail = PageState.Success;
notifyListeners();
return true;
} else {
Utils.showToast(baseResp.msg);
pageStateMessageDetail = PageState.ConnectivityError;
}
notifyListeners();
return false;
}
}
... ...
... ... @@ -171,24 +171,34 @@ class MenuManageProvider extends ChangeNotifier {
// 设置订座商家配置信息
Future<bool> setConfing(BuildContext context, Map<String, String> params,
{bool showLoading = true}) async {
{bool showLoading = true, bool needToast = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.set_confing,
data: params, showLoading: showLoading)
.catchError((error) {
print(error.toString());
Utils.showToast('设置失败,请重试');
if (needToast) {
Utils.showToast('设置失败,请重试');
}
return false;
});
if (baseResp.code == Constant.status_success) {
if (baseResp.data == 0 || baseResp.data == 1) {
Utils.showToast('设置成功');
if (needToast) {
Utils.showToast('设置成功');
}
return true;
} else {
Utils.showToast('设置失败,请重试');
if (needToast) {
Utils.showToast('设置失败,请重试');
}
}
} else {
Utils.showToast(baseResp.msg ?? '设置失败,请重试');
if (needToast) {
Utils.showToast(baseResp.msg ?? '设置失败,请重试');
}
}
return false;
}
... ...
... ... @@ -1699,9 +1699,9 @@ class NavigatorUtil {
}
/// 消息中心---会员充值
static void goMessageRechargeInfoPage(BuildContext context,
static void goMessageRechargeInfoPage(BuildContext context,String idStr,
{replace = false}) {
_navigateTo(context, "${Routes.message_recharge_info_page}",
_navigateTo(context, "${Routes.message_recharge_info_page}?idStr=$idStr",
replace: replace);
}
... ... @@ -1724,4 +1724,12 @@ class NavigatorUtil {
"${Routes.coupon_verification_detail_page}?isExamineSunModel=${FluroConvertUtils.object2string(isExamineSunModel)}&idStr=$idStr",
replace: replace);
}
/// 存酒设置页
static Future<dynamic> goWineSettingPage(
BuildContext context,
{replace = false, }) {
return _navigateTo(context, "${Routes.wine_setting_page}",
replace: replace);
}
}
... ...
... ... @@ -223,6 +223,7 @@ import '../pages/my/store_wine_manage/out_store_record_page.dart';
import '../pages/my/store_wine_manage/sms_code_input_page.dart';
import '../pages/my/store_wine_manage/store_wine_manage_home_page.dart';
import '../pages/my/store_wine_manage/wine_detail_page.dart';
import '../pages/my/store_wine_manage/wine_setting_page.dart';
import '../pages/my/table_manage/merge_table_select_page.dart';
import '../pages/order_advance/customer_detail_page.dart';
import '../pages/order_advance/order_advance_home_page.dart';
... ... @@ -2505,7 +2506,9 @@ var applyOutStorePageHandle = new Handler(
create: (_) => StoreWineProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: ApplyOutStorePage(wineManageDetail: wineManageDetail)));
child: ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(),
child: ApplyOutStorePage(wineManageDetail: wineManageDetail))));
});
///我的----申请出库短信验证输入
... ... @@ -2762,12 +2765,12 @@ var rechargeHistoryPageHandle = new Handler(
//消息中心---会员充值
var messageRechargeInfoPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
// String idstr = params["idstr"].first;
String idStr = params["idStr"].first;
// NotebookDetail detailEntity = NotebookDetail.fromJson(json
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: MessageRechargeInfoPage());
child: MessageRechargeInfoPage(idStr: idStr));
});
//宴会套餐---分享预览
... ... @@ -2794,3 +2797,16 @@ var couponVerificationDetailPageHandle = new Handler(
return CouponVerificationDetailPage(isExamineSunModel: isExamineSunModel);
});
//存酒配置
var wineSettingPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
// String idStr = params["idStr"].first;
// IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode(
// FluroConvertUtils.fluroCnParamsDecode(
// params["isExamineSunModel"].first)));
// }
return ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(), child: WineSettingPage());
});
... ...
... ... @@ -266,8 +266,13 @@ class Routes {
/**
* 优惠券
*/
static String coupon_verification_detail_page = "/coupon_verification_detail_page"; //优惠券核销详情
static String coupon_verification_detail_page =
"/coupon_verification_detail_page"; //优惠券核销详情
/**
* 存酒设置
*/
static String wine_setting_page = "/wine_setting_page"; // 存酒设置
static void configureRoutes(FluroRouter router) {
router.notFoundHandler = new Handler(
... ... @@ -499,7 +504,9 @@ class Routes {
handler: messageRechargeInfoPageHandle);
router.define(feast_dish_share_page, handler: feastDishSharePageHandle);
router.define(coupon_verification_detail_page,handler: couponVerificationDetailPageHandle);
router.define(coupon_verification_detail_page,
handler: couponVerificationDetailPageHandle);
router.define(wine_setting_page, handler: wineSettingPageHandle);
}
}
... ...