xt / Flutter-ReserveApp · Commits

Go to a project

Commit aaf2c8f9826784a2672ed78fe62062ff5610647f

Authored by wdn127929
1 parent 9586e905
build: skipped

一、【提测变更项内容说明】v4.8.0

Inline Side-by-side
Showing 23 changed files with 879 additions and 321 deletions
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -510,7 +510,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 466;
CURRENT_PROJECT_VERSION = 476;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -525,7 +525,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.6.6;
MARKETING_VERSION = 4.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -656,7 +656,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 466;
CURRENT_PROJECT_VERSION = 476;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -671,7 +671,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.6.6;
MARKETING_VERSION = 4.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -692,7 +692,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 466;
CURRENT_PROJECT_VERSION = 476;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -707,7 +707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.6.6;
MARKETING_VERSION = 4.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -74,7 +74,7 @@ class GetDzSellerConfSunModel {
reserveMode = json['reserve_mode'];
isDisplayDish = json['is_display_dish'];
isNewTemplate = json['is_new_template'];
cookStyle = 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'];
}
... ...
... ... @@ -64,7 +64,9 @@ CookbookOneSunModel _$CookbookOneSunModelFromJson(Map<String, dynamic> json) {
?.toList(),
json['taste'] as String,
json['cooks'] as String,
DishCookStyle.fromJson(convert.json.decode(json['cook_style'])),
json['cook_style'] == null
? null
: DishCookStyle.fromJson(convert.json.decode(json['cook_style'])),
json['desc'] as String,
);
}
... ...
... ... @@ -51,6 +51,8 @@ class RechargeListSunModel {
String isExamine;
String cdate;
bool isCheck = false;
String stime;
String etime;
String get cdateStr {
if (cdate.toString() == '0') {
... ... @@ -61,6 +63,24 @@ class RechargeListSunModel {
return DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
}
String get stimeStr {
if (stime == null || stime.toString() == '0') {
return '';
}
DateTime dateTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(stime.toString()) * 1000);
return DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
}
String get etimeStr {
if (etime == null || etime.toString() == '0') {
return '';
}
DateTime dateTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(etime.toString()) * 1000);
return DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
}
RechargeListSunModel(
{this.id,
this.uid,
... ... @@ -74,7 +94,9 @@ class RechargeListSunModel {
this.status,
this.qrcode,
this.isExamine,
this.cdate});
this.cdate,
this.stime,
this.etime});
RechargeListSunModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -101,6 +123,8 @@ class RechargeListSunModel {
qrcode = json['qrcode'];
isExamine = json['is_examine'];
cdate = json['cdate'];
stime = json['stime'];
etime = json['etime'];
}
Map<String, dynamic> toJson() {
... ... @@ -118,6 +142,8 @@ class RechargeListSunModel {
data['qrcode'] = this.qrcode;
data['is_examine'] = this.isExamine;
data['cdate'] = this.cdate;
data['stime'] = this.stime;
data['etime'] = this.etime;
return data;
}
}
... ...
... ... @@ -75,7 +75,12 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
}
_getNewRechargeList() async {
await marketingCenterProvider.getNewRechargeList(context);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
};
await marketingCenterProvider.getNewRechargeList(context, params);
if (rechargeData == null &&
marketingCenterProvider.rechargeList != null &&
marketingCenterProvider.rechargeList.length > 0) {
... ...
... ... @@ -66,7 +66,12 @@ class _MarkingRechargeSelectPageState extends State<MarkingRechargeSelectPage> {
///获取优惠券列表数据
///
_getNewRechargeList() async {
await marketingCenterProvider.getNewRechargeList(context);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
};
await marketingCenterProvider.getNewRechargeList(context,params);
outerloop:
for (var i = 0; i < marketingCenterProvider.rechargeList.length; i++) {
if (marketingCenterProvider.rechargeList[i].id == widget.selectid) {
... ...
... ... @@ -104,7 +104,10 @@ class _RechargeDetailPageState extends State<RechargeDetailPage> {
Padding(
padding: EdgeInsets.only(left: w(20)),
child: Text(
marketingCenterProvider.rechargeDetail.explain,
marketingCenterProvider.rechargeDetail.explain == '' ||
marketingCenterProvider.rechargeDetail.explain == null
? '无'
: marketingCenterProvider.rechargeDetail.explain,
// maxLengthEnforced: true,
style: TextStyle(
... ... @@ -340,7 +343,7 @@ class _RechargeDetailPageState extends State<RechargeDetailPage> {
Row(
children: [
Text(
'充值日期限制：',
'使用限制：',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
... ... @@ -350,7 +353,7 @@ class _RechargeDetailPageState extends State<RechargeDetailPage> {
marketingCenterProvider
.rechargeDetail.expDate.isFix ==
'1'
? '${marketingCenterProvider.rechargeDetail.expDate.fixSdate}至${marketingCenterProvider.rechargeDetail.expDate.fixEdate}'
? '无'
: marketingCenterProvider.rechargeDetail
.expDate.isWeek ==
'1'
... ... @@ -389,6 +392,35 @@ class _RechargeDetailPageState extends State<RechargeDetailPage> {
color: MyColours.color_E7E7E7,
),
VEmptyView(48),
Row(
children: [
Text(
'有效期：',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
),
Spacer(),
Text(
marketingCenterProvider
.rechargeDetail.stimeStr +
'至' +
marketingCenterProvider
.rechargeDetail.etimeStr,
style: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(32)),
),
HEmptyView(32)
],
),
VEmptyView(24),
MyDivider(
double.infinity,
w(0.5),
color: MyColours.color_E7E7E7,
),
VEmptyView(48),
_explain(
'备注',
'请输入备注信息',
... ...
... ... @@ -179,12 +179,12 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
fixdate = marketingCenterProvider.rechargeDetail.expDate.isFix == '1'
? true
: false;
if (marketingCenterProvider.rechargeDetail.expDate.fixSdate != '') {
fromDate = marketingCenterProvider.rechargeDetail.expDate.fixSdate;
}
if (marketingCenterProvider.rechargeDetail.expDate.fixEdate != '') {
endDate = marketingCenterProvider.rechargeDetail.expDate.fixEdate;
}
// if (marketingCenterProvider.rechargeDetail.expDate.fixSdate != '') {
fromDate = marketingCenterProvider.rechargeDetail.stimeStr;
// }
// if (marketingCenterProvider.rechargeDetail.expDate.fixEdate != '') {
endDate = marketingCenterProvider.rechargeDetail.etimeStr;
// }
weekly = marketingCenterProvider.rechargeDetail.expDate.isWeek == '1'
? true
... ... @@ -284,6 +284,49 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
}
///时间选择
Widget _selectTime(String title, String hintText, GestureTapCallback onTap) {
return InkWell(
onTap: onTap,
child: Container(
// padding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(28)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
// height: ScreenUtil().setWidth(40),
// color: Colors.red,
child: Text(
title,
style: TextStyle(
color: title == '点击设置可用日期'
? MyColours.color_438E93
: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
),
),
HEmptyView(20),
Spacer(),
Text(hintText,
style: TextStyle(
color: hintText == '点击设置开始日期' || hintText == '点击设置结束日期'
? MyColours.color_438E93
: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32),
)),
HEmptyView(20),
Image.asset(
Utils.getImgPath('arrow_right_new'),
width: ScreenUtil().setWidth(20),
),
HEmptyView(32),
],
),
),
);
}
///时间选择
Widget _select(String title, String hintText, GestureTapCallback onTap) {
return InkWell(
onTap: onTap,
... ... @@ -776,7 +819,7 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
Container(
alignment: Alignment.centerLeft,
child: Text(
'有效期：',
'使用限制：',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
... ... @@ -786,7 +829,7 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
Row(
children: [
HEmptyView(30),
_itemRadioWidget(fixdate, '固定时间段', onTap: () {
_itemRadioWidget(fixdate, '无', onTap: () {
if (!fixdate) {
setState(() {
fixdate = true;
... ... @@ -819,67 +862,67 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
],
),
birthday ? SizedBox() : VEmptyView(24),
fixdate
? Column(
children: [
_select('有效期从', fromDate, () {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
//弹出时间选择器
// showPickerDateTime(context);
showDateSelWidget = true;
DialogUtil.showPickerDateTime24(
context,
scaffoldKey,
(value) {
// {'text': picker.adapter.text, 'select': selecteds}
if (value != null) {
setState(() {
print(value);
fromDate = DateUtil.formatDateStr(
value,
format: DateFormats.y_mo_d);
});
}
showDateSelWidget = false;
},
dateTime: DateUtil.getDateTime(fromDate),
pickerDateTimeType: PickerDateTimeType.kYMD,
onCancel: () {
showDateSelWidget = false;
});
}),
VEmptyView(24),
_select('有效期至', endDate, () {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
//弹出时间选择器
// showPickerDateTime(context);
showDateSelWidget = true;
DialogUtil.showPickerDateTime24(
context,
scaffoldKey,
(value) {
// {'text': picker.adapter.text, 'select': selecteds}
if (value != null) {
setState(() {
print(value);
endDate = DateUtil.formatDateStr(
value,
format: DateFormats.y_mo_d);
});
}
showDateSelWidget = false;
},
dateTime: DateUtil.getDateTime(endDate),
pickerDateTimeType: PickerDateTimeType.kYMD,
onCancel: () {
showDateSelWidget = false;
});
})
],
)
: SizedBox(),
// fixdate
// ? Column(
// children: [
// _select('有效期从', fromDate, () {
// FocusScope.of(context)
// .requestFocus(FocusNode()); //点击空白处隐藏键盘
// //弹出时间选择器
// // showPickerDateTime(context);
// showDateSelWidget = true;
// DialogUtil.showPickerDateTime24(
// context,
// scaffoldKey,
// (value) {
// // {'text': picker.adapter.text, 'select': selecteds}
// if (value != null) {
// setState(() {
// print(value);
// fromDate = DateUtil.formatDateStr(
// value,
// format: DateFormats.y_mo_d);
// });
// }
// showDateSelWidget = false;
// },
// dateTime: DateUtil.getDateTime(fromDate),
// pickerDateTimeType: PickerDateTimeType.kYMD,
// onCancel: () {
// showDateSelWidget = false;
// });
// }),
// VEmptyView(24),
// _select('有效期至', endDate, () {
// FocusScope.of(context)
// .requestFocus(FocusNode()); //点击空白处隐藏键盘
// //弹出时间选择器
// // showPickerDateTime(context);
// showDateSelWidget = true;
// DialogUtil.showPickerDateTime24(
// context,
// scaffoldKey,
// (value) {
// // {'text': picker.adapter.text, 'select': selecteds}
// if (value != null) {
// setState(() {
// print(value);
// endDate = DateUtil.formatDateStr(
// value,
// format: DateFormats.y_mo_d);
// });
// }
// showDateSelWidget = false;
// },
// dateTime: DateUtil.getDateTime(endDate),
// pickerDateTimeType: PickerDateTimeType.kYMD,
// onCancel: () {
// showDateSelWidget = false;
// });
// })
// ],
// )
// : SizedBox(),
weekly
? _select(weekShow, '', () async {
FocusScope.of(context)
... ... @@ -921,6 +964,80 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
color: MyColours.color_E7E7E7,
),
VEmptyView(48),
Container(
alignment: Alignment.centerLeft,
child: Text(
'有效期：',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)),
),
),
VEmptyView(24),
_selectTime('有效期从', fromDate, () {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
//弹出时间选择器
// showPickerDateTime(context);
showDateSelWidget = true;
DialogUtil.showPickerDateTime24(
context,
scaffoldKey,
(value) {
// {'text': picker.adapter.text, 'select': selecteds}
if (value != null) {
setState(() {
print(value);
fromDate = DateUtil.formatDateStr(value,
format: DateFormats.y_mo_d);
});
}
showDateSelWidget = false;
},
dateTime: DateUtil.getDateTime(fromDate),
pickerDateTimeType: PickerDateTimeType.kYMD,
onCancel: () {
showDateSelWidget = false;
});
}),
// Container(
// height: ScreenUtil().setWidth(2),
// color: MyColours.color_E7E7E7,
// ),
VEmptyView(24),
_selectTime('有效期至', endDate, () {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
//弹出时间选择器
// showPickerDateTime(context);
showDateSelWidget = true;
DialogUtil.showPickerDateTime24(
context,
scaffoldKey,
(value) {
// {'text': picker.adapter.text, 'select': selecteds}
if (value != null) {
setState(() {
print(value);
endDate = DateUtil.formatDateStr(value,
format: DateFormats.y_mo_d);
});
}
showDateSelWidget = false;
},
dateTime: DateUtil.getDateTime(endDate),
pickerDateTimeType: PickerDateTimeType.kYMD,
onCancel: () {
showDateSelWidget = false;
});
}),
VEmptyView(24),
MyDivider(
double.infinity,
w(1),
color: MyColours.color_E7E7E7,
),
VEmptyView(48),
_explain('备注', '请输入备注信息', remarkC, remarkF),
VEmptyView(72),
_canUse('立即启用', canUse, () {
... ... @@ -1000,31 +1117,40 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
return;
}
if (fixdate) {
//固定时间段
// if (fixdate) {
//固定时间段
if (fromDate == '点击设置开始日期') {
Utils.showToast('请设置开始日期!');
return;
}
if (fromDate == '点击设置开始日期') {
Utils.showToast('请设置有效期的开始日期!');
return;
}
if (endDate == '点击设置结束日期') {
Utils.showToast('请设置结束日期!');
return;
}
if (DateUtil.getDateTime(endDate)
.compareTo(DateUtil.getDateTime(fromDate)) <
0) {
Utils.showToast('有效期结束日期不能早于开始日期!');
return;
}
if (endDate == '点击设置结束日期') {
Utils.showToast('请设置有效期的结束日期!');
return;
}
if (DateUtil.getDateTime(endDate)
.compareTo(DateUtil.getDateTime(fromDate)) <
0) {
Utils.showToast('有效期结束日期不能早于开始日期!');
return;
}
// }
if (weekly && weekShow == '点击设置可用日期') {
Utils.showToast('请设置可用日期!');
return;
}
String from = fromDate + ' 00:00:00';
String end = endDate + ' 23:59:59';
String stime = fromDate == '点击设置开始日期'
? ""
: '${(DateUtil.getDateMsByTimeStr(from) / 1000).floor()}';
String etime = endDate == '点击设置结束日期'
? ''
: '${(DateUtil.getDateMsByTimeStr(end) / 1000).floor()}';
Map discounts = {
'is_price': givePriceSwich ? '1' : '0', //优惠活动,赠送金额
'is_score': giveScoreSwich ? '1' : '0', //赠送积分
... ... @@ -1043,8 +1169,8 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
'is_fix': fixdate ? '1' : '0',
'is_week': weekly ? '1' : '0',
'is_birthday': birthday ? '1' : '0',
'fix_sdate': fixdate ? fromDate : '', // 开始时间
'fix_edate': fixdate ? endDate : '', //结束时间
// 'fix_sdate': fixdate ? fromDate : '', // 开始时间
// 'fix_edate': fixdate ? endDate : '', //结束时间
'week_date_show': weekly ? weekShow : '',
'week_date_data': weekly ? weekData : ''
};
... ... @@ -1063,7 +1189,9 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
'recharge_list': discountsStr,
'exp_date': dateStr,
'explain': remarkC.text,
'is_open': canUse ? '1' : '0'
'is_open': canUse ? '1' : '0',
'stime': stime,
'etime': etime
};
if (widget.idstr != null && widget.idstr != 'null') {
pramas['id'] = widget.idstr;
... ...
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:one_key/constant/state.dart';
import 'package:one_key/pages/coupon/coupon_item.dart';
import 'package:one_key/pages/coupon/coupon_item_f.dart';
import 'package:one_key/pages/my/marketing_center/recharge/recharge_item.dart';
import 'package:one_key/provider/coupon_provider.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/widgets/page_exception.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../../models/recharge_list_model.dart';
import '../../../../provider/marketing_center_provider.dart';
/**
* 历史过期充值优惠
*/
class RechargeHistoryPage extends StatefulWidget {
RechargeHistoryPage({Key key}) : super(key: key);
@override
_RechargeHistoryPageState createState() => _RechargeHistoryPageState();
}
class _RechargeHistoryPageState extends State<RechargeHistoryPage> {
EasyRefreshController _controller = EasyRefreshController();
MarketingCenterProvider marketingCenterProvider;
///获取充值优惠历史列表数据
getNewRechargeListHistory() async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
'is_expire': '1'
};
await marketingCenterProvider.getNewRechargeListHistory(context, params);
}
@override
void initState() {
// TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
getNewRechargeListHistory();
});
}
@override
Widget build(BuildContext context) {
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_fefefe,
appBar: SystemAppBar(
'过期充值优惠',
onTap: () {
Navigator.of(context).pop();
},
),
body: Consumer<MarketingCenterProvider>(
builder: (context, model, _) {
if (model.pageStateHistory != PageState.Success) {
return ExceptionPage(
pageState: model.pageStateHistory,
callback: () {
// offset = 0;
// getMessage(showLoading: true);
getNewRechargeListHistory();
},
emptyMsg: "暂时没有列表信息哦",
emptyImg: "empty_search",
showMsg: "加载中，请稍后...",
);
} else {
return EasyRefresh.custom(
controller: _controller,
slivers: [
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
return VEmptyView(40);
}, childCount: 1),
),
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
// return CouponItem(
// from: 'history',
// couponSonModel: couponProvider.couponListHistory[index],
// onPressed: () {
// // couponProvider.couponListHistory[index] =
// // !couponProvider.couponListHistory[index];
// // couponProvider.notifyListeners();
// },
// );
// return CouponItemF(
// from: 'history',
// couponSonModel: couponProvider.couponListHistory[index],
// showBtn: true,
// onPressedSwich: () {
// // couponProvider.couponList[index].isOpenBool =
// // !couponProvider.couponList[index].isOpenBool;
// // _setCustomerActivity(index);
// },
// onPressed: () {
// // NavigatorUtil.goCouponDetailPage(
// // context, couponProvider.couponList[index]);
// },
// );
RechargeListSunModel rechargeListSunModel =
marketingCenterProvider.rechargeListHistory[index];
return RechargeItem(
from: 'history',
rechargeListSunModel: rechargeListSunModel,
showBtn: true,
onPressedDel: () {
//弹框确认是否删除
// DialogUtil.cupertinoAlertDialog(context,
// title: "",
// content: "确定要将该优惠删除吗？",
// rTitle: "确定", rCallback: () async {
// Map<String, String> pramas = {
// 'id': rechargeListSunModel.id,
// 'status': '1',
// };
// bool success = await marketingCenterProvider
// .createNewRecharge(context, pramas);
// if (success) {
// setState(() {
// marketingCenterProvider.rechargeList
// .removeAt(index);
// if (marketingCenterProvider
// .rechargeList.length ==
// 0) {
// model.pageStateRechargeHome =
// PageState.Empty;
// }
// });
// }
// });
},
onPressedUse: () async {
// if (rechargeListSunModel.isOpen == '1') {
// //开启的,去禁用
// _openOrClose(rechargeListSunModel, '0');
// } else {
// _openOrClose(rechargeListSunModel, '1');
// }
},
onPressed: () {
// if (showBtn ||
// rechargeListSunModel.uid ==
// Provider.of<UserModel>(context,
// listen: false)
// .user
// .openid) {
// //跳进编辑页,权限:管理员、店长、自己创建的券
// NavigatorUtil.goRechargeEditPage(context,
// idstr: rechargeListSunModel.id);
// } else {
// //查看页
// NavigatorUtil.goRechargeDetailPage(
// context, rechargeListSunModel.id);
// }
},
);
},
childCount:
marketingCenterProvider.rechargeListHistory.length),
)
],
// onRefresh: () async {
// // offset = 0;
// // getMessage(showLoading: false);
// },
// onLoad: () async {
// // offset++;
// // getMessage(showLoading: false);
// },
);
}
},
));
}
}
... ...
... ... @@ -55,7 +55,12 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
}
_getNewRechargeList() async {
await marketingCenterProvider.getNewRechargeList(context);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
};
await marketingCenterProvider.getNewRechargeList(context, params);
}
_openOrClose(RechargeListSunModel rechargeListSunModel, String isOpen) async {
... ... @@ -184,35 +189,37 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
childCount:
marketingCenterProvider.rechargeList.length),
),
// SliverList(
// delegate: SliverChildBuilderDelegate(
// (BuildContext context, int index) {
// return Column(
// children: [
// InkWell(
// onTap: () {
// // NavigatorUtil.goCouponHistoryPage(context);
// },
// child: RichText(
// text: TextSpan(
// style: TextStyle(
// fontSize: ScreenUtil().setSp(28),
// ),
// children: [
// TextSpan(
// text: '没有更多了，',
// style: TextStyle(
// color: MyColours.color_000000)),
// TextSpan(
// text: '查看过期优惠券',
// style: TextStyle(
// color: MyColours.color_438E93)),
// ]))),
// VEmptyView(80)
// ],
// );
// }, childCount: 1),
// )
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
return Column(
children: [
VEmptyView(40),
InkWell(
onTap: () {
NavigatorUtil.goRechargeHistoryPage(
context);
},
child: RichText(
text: TextSpan(
style: TextStyle(
fontSize: ScreenUtil().setSp(28),
),
children: [
TextSpan(
text: '没有更多了，',
style: TextStyle(
color: MyColours.color_000000)),
TextSpan(
text: '查看过期优惠活动',
style: TextStyle(
color: MyColours.color_438E93)),
]))),
VEmptyView(80)
],
);
}, childCount: 1),
)
],
// onRefresh: () async {
// // offset = 0;
... ...
... ... @@ -310,11 +310,11 @@ class _RechargeItemState extends State<RechargeItem> {
// : Container()
// :
),
if (widget.showBtn)
if (widget.showBtn && widget.from != 'history')
MySeparator(
width: w(4), color: MyColours.color_BFC4D4),
if (widget.showBtn) VEmptyView(15),
if (widget.showBtn)
if (widget.showBtn && widget.from != 'history')
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
... ... @@ -352,7 +352,8 @@ class _RechargeItemState extends State<RechargeItem> {
HEmptyView(38),
],
),
if (widget.showBtn) VEmptyView(15)
if (widget.showBtn && widget.from != 'history')
VEmptyView(15)
],
),
)),
... ... @@ -367,7 +368,26 @@ class _RechargeItemState extends State<RechargeItem> {
width: ScreenUtil().setWidth(50),
height: ScreenUtil().setWidth(50),
))
: SizedBox()
: SizedBox(),
if (widget.from == 'history')
Positioned(
right: ScreenUtil().setWidth(100),
top: ScreenUtil().setWidth(60 * 2),
child: widget.showBtn
? RoundButton(
width: widget.from == 'history'
? ScreenUtil().setWidth(44 * 2)
: ScreenUtil().setWidth(32 * 2),
height: ScreenUtil().setWidth(21 * 2),
radius: ScreenUtil().setWidth(10),
text: '已过期',
fontSize: 24,
textColor: MyColours.color_BFC4D4,
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
borderColor: MyColours.color_BFC4D4,
)
: Container())
]));
}
}
... ...
... ... @@ -59,7 +59,7 @@ class _MenuAddDishesPageState extends State<MenuAddDishesPage> {
List<String> specStrList = [];
String specStr = '请选择';
String mid = '';
List<MenuUnitModel> data; //价格
List<MenuUnitModel> data = []; //价格
String showPrice;
String selectPracticeShow;
String selectPracticeIds;
... ... @@ -90,8 +90,8 @@ class _MenuAddDishesPageState extends State<MenuAddDishesPage> {
selectPracticeIds = '';
selectPractice.forEach((element) {
// if (element.select) {
selectPracticeShow += '${element.name}、';
selectPracticeIds += '${element.id},';
selectPracticeShow += '${element.name}、';
selectPracticeIds += '${element.id},';
// }
});
if (selectPracticeShow.endsWith('、')) {
... ...
... ... @@ -112,8 +112,11 @@ class _MenuManagePageState extends State<MenuManagePage> {
_getDzSellerConf() async {
bool success = await menuManageProvider.getDzSellerConf(context);
if (success) {
themeColerModel1 = themeColorData[
int.parse(menuManageProvider.dzSellerConfModel.cookStyle.index)];
themeColerModel1 = themeColorData[menuManageProvider
.dzSellerConfModel.cookStyle ==
null
? 0
: int.parse(menuManageProvider.dzSellerConfModel.cookStyle.index)];
}
}
... ... @@ -265,20 +268,6 @@ class _MenuManagePageState extends State<MenuManagePage> {
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
Text(
model.taste != null &&
model.taste != '' &&
... ... @@ -303,7 +292,9 @@ class _MenuManagePageState extends State<MenuManagePage> {
])),
VEmptyView(20),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -415,7 +406,9 @@ class _MenuManagePageState extends State<MenuManagePage> {
])),
VEmptyView(20),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.member_price ?? ''}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -442,8 +435,9 @@ class _MenuManagePageState extends State<MenuManagePage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: w(134),
Expanded(
child: Container(
// width: w(134),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
... ... @@ -474,20 +468,6 @@ class _MenuManagePageState extends State<MenuManagePage> {
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
Text(
model.taste != null &&
model.taste != '' &&
... ... @@ -512,10 +492,12 @@ class _MenuManagePageState extends State<MenuManagePage> {
]))
],
),
),
)),
HEmptyView(10),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -601,7 +583,9 @@ class _MenuManagePageState extends State<MenuManagePage> {
Padding(
padding: EdgeInsets.symmetric(horizontal: w(10)),
child: model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.member_price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -630,6 +614,7 @@ class _MenuManagePageState extends State<MenuManagePage> {
padding: EdgeInsets.symmetric(horizontal: w(10), vertical: w(10)),
child: Text(
model.desc ?? "",
textAlign: TextAlign.left,
style: TextStyle(
color: themeColerModel.name == '珍珠白'
? MyColours.color_515151
... ... @@ -640,13 +625,16 @@ class _MenuManagePageState extends State<MenuManagePage> {
Align(
alignment: Alignment.centerRight,
child: Padding(
padding:
EdgeInsets.only(right: w(20), top: w(19), bottom: w(19)),
child: Image.asset(
Utils.getImgPath('add_store'),
width: w(22),
),
)),
padding:
EdgeInsets.only(right: w(20), top: w(19), bottom: w(19)),
child: Text(
'+',
style: TextStyle(
color: themeColerModel1.name == '珍珠白'
? MyColours.color_515151
: MyColours.color_FBF6F1,
fontSize: font(36)),
))),
],
),
);
... ... @@ -960,6 +948,8 @@ class _MenuManagePageState extends State<MenuManagePage> {
margin: EdgeInsets.only(
bottom: (w(2))),
child: Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
crossAxisAlignment: model
.cookStyle
.imageType !=
... ... @@ -1017,43 +1007,57 @@ class _MenuManagePageState extends State<MenuManagePage> {
),
if (model.desc != null &&
model.desc != '')
Padding(
padding: EdgeInsets
.symmetric(
horizontal:
w(16),
vertical:
w(10)),
child: Text(
model.desc,
style: TextStyle(
color: themeColerModel1
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize:
font(12)),
),
),
Align(
alignment: Alignment
.centerLeft,
child: Padding(
padding:
EdgeInsets.symmetric(
horizontal:
w(16),
vertical:
w(10)),
child: Text(
model.desc,
textAlign:
TextAlign
.left,
style: TextStyle(
color: themeColerModel1
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize:
font(12)),
),
)),
Align(
alignment: Alignment
.centerRight,
child: Padding(
padding:
EdgeInsets.only(
right: w(40),
top: w(19),
bottom:
w(19)),
child: Image.asset(
Utils.getImgPath(
'add_store'),
width: w(22),
),
))
padding:
EdgeInsets.only(
right:
w(40),
top: w(19),
bottom:
w(19)),
child: Text(
'+',
style: TextStyle(
color: themeColerModel1
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize:
font(36)),
)))
],
),
),
... ... @@ -1061,7 +1065,7 @@ class _MenuManagePageState extends State<MenuManagePage> {
bottom:
ScreenUtil().setWidth(14),
right:
ScreenUtil().setWidth(20),
ScreenUtil().setWidth(150),
child: model.status == '1'
? SizedBox()
: Image.asset(
... ...
... ... @@ -300,9 +300,18 @@ class _MenuSetPricePageState extends State<MenuSetPricePage> {
data[index].specid == null
? '请选择销售单位'
: data[index].specs, () async {
String specids = '';
data.forEach((element) {
specids += '${element.specid},';
});
if (specids.endsWith(',')) {
specids = specids.substring(
0, specids.length - 1);
}
Map object =
await NavigatorUtil.goMenuUnitPage(
context, data[index].specid);
context, data[index].specid,specids);
if (object != null) {
// 'specs': menuManageProvider
// .specSunModel[index].name,
... ...
import 'dart:convert';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_native_image/flutter_native_image.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:image_picker/image_picker.dart';
import 'package:one_key/provider/marketing_center_provider.dart';
... ... @@ -73,6 +71,7 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
WidgetsBinding.instance.addPostFrameCallback((_) {
// getSellerTemplateConf();
// _getCookbookByClass(showLoading: true);
_getDzSellerConf();
});
}
... ... @@ -81,6 +80,16 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
super.dispose();
}
_getDzSellerConf() async {
bool success = await menuManageProvider.getDzSellerConf(context);
if (success) {
themeColorIndex = menuManageProvider.dzSellerConfModel.cookStyle == null
? 0
: int.parse(menuManageProvider.dzSellerConfModel.cookStyle.index);
setState(() {});
}
}
// getSellerTemplateConf() async {
// bool success =
// await _marketingCenterProvider.getSellerTemplateConf(context);
... ... @@ -318,20 +327,6 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
Text(
model.taste != null &&
model.taste != '' &&
... ... @@ -356,7 +351,9 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
])),
VEmptyView(20),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -468,7 +465,9 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
])),
VEmptyView(20),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.member_price ?? ''}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -495,8 +494,9 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: w(134),
Expanded(
child: Container(
// width: w(134),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
... ... @@ -527,20 +527,6 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
VEmptyView(20),
if ((model.taste != null &&
model.taste != '' &&
model.cooks != null &&
model.cooks != '') ||
(model.taste != null && model.taste != '') ||
(model.cooks != null && model.cooks != ''))
Text(
model.taste != null &&
model.taste != '' &&
... ... @@ -565,10 +551,12 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
]))
],
),
),
)),
HEmptyView(10),
model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -654,7 +642,9 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
Padding(
padding: EdgeInsets.symmetric(horizontal: w(10)),
child: model.price == null
? Column(children: _priceWidget(model))
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _priceWidget(model))
: Text(
'￥${model.price}/${model.unit} 会员 ￥${model.member_price}/${model.unit} ',
textAlign: TextAlign.right,
... ... @@ -693,13 +683,16 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
Align(
alignment: Alignment.centerRight,
child: Padding(
padding:
EdgeInsets.only(right: w(20), top: w(19), bottom: w(19)),
child: Image.asset(
Utils.getImgPath('add_store'),
width: w(22),
),
)),
padding:
EdgeInsets.only(right: w(20), top: w(19), bottom: w(19)),
child: Text(
'+',
style: TextStyle(
color: themeColerModel.name == '珍珠白'
? MyColours.color_515151
: MyColours.color_FBF6F1,
fontSize: font(36)),
))),
],
),
);
... ... @@ -867,6 +860,8 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
margin:
EdgeInsets.only(bottom: (w(2))),
child: Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
crossAxisAlignment: model.cookStyle
.imageType !=
'2' &&
... ... @@ -919,43 +914,54 @@ class _MenuThemeColorSetPageState extends State<MenuThemeColorSetPage> {
),
if (model.desc != null &&
model.desc != '')
Padding(
padding: EdgeInsets.symmetric(
horizontal: w(16),
vertical: w(10)),
child: Text(
model.desc,
style: TextStyle(
color: themeColerModel
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize: font(12)),
),
),
Align(
alignment:
Alignment.centerLeft,
child: Padding(
padding:
EdgeInsets.symmetric(
horizontal: w(16),
vertical: w(10)),
child: Text(
model.desc,
style: TextStyle(
color: themeColerModel
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize: font(12)),
),
)),
Align(
alignment:
Alignment.centerRight,
child: Padding(
padding: EdgeInsets.only(
right: w(40),
top: w(19),
bottom: w(19)),
child: Image.asset(
Utils.getImgPath(
'add_store'),
width: w(22),
),
))
padding: EdgeInsets.only(
right: w(40),
top: w(19),
bottom: w(19)),
child: Text(
'+',
style: TextStyle(
color: themeColerModel
.name ==
'珍珠白'
? MyColours
.color_515151
: MyColours
.color_FBF6F1,
fontSize: font(36)),
)))
],
),
),
Positioned(
bottom: ScreenUtil().setWidth(14),
right: ScreenUtil().setWidth(20),
right:
ScreenUtil().setWidth(150),
child: model.status == '1'
? SizedBox()
: Image.asset(
... ...
... ... @@ -20,7 +20,9 @@ import '../../../widgets/page_exception.dart';
class MenuUnitPage extends StatefulWidget {
final String specid;
MenuUnitPage({Key key, this.specid}) : super(key: key);
final String specids;
MenuUnitPage({Key key, this.specid, this.specids}) : super(key: key);
@override
_MenuUnitPageState createState() => _MenuUnitPageState();
... ... @@ -178,9 +180,17 @@ class _MenuUnitPageState extends State<MenuUnitPage> {
DialogUtil.cupertinoAlertDialog(
context,
content:
'确定要删除销售规格“条”吗？删除后，您可以通过添加新规格增加。\n如果有菜品使用该销售单位定价，则无法删除。',
'确定要删除销售规格“${menuManageProvider.specSunModel[index].name}”吗？删除后，您可以通过添加新规格增加。\n如果有菜品使用该销售单位定价，则无法删除。',
textAlign: TextAlign.left,
rCallback: () async {
if (widget.specids
.split(',')
.contains(menuManageProvider
.specSunModel[index].id)) {
Utils.showToast(
'该菜品正在使用该销售单位,不可删除!');
return;
}
//确定删除
Map<String, String> pramas = {
'sellerid':
... ... @@ -198,15 +208,36 @@ class _MenuUnitPageState extends State<MenuUnitPage> {
context, pramas);
if (success) {
Utils.showToast('删除成功!');
if (App.sp
.containsKey('specid')) {
if (menuManageProvider
.specSunModel[index]
.name ==
App.sp.getString('specs')) {
//清空销售计价
App.sp.remove('specid');
App.sp.remove('specs');
}
}
getSpecBySellerid();
}
});
},
child: Image.asset(
Utils.getImgPath('close'),
width: w(15),
)),
HEmptyView(20)
child: Container(
height: w(48),
padding: EdgeInsets.symmetric(
horizontal: w(10)),
child: Image.asset(
Utils.getImgPath(
menuManageProvider
.specSunModel[index]
.select
? 'unit_del_white'
: 'unit_del_black'),
width: w(15),
))),
],
),
));
... ... @@ -248,9 +279,12 @@ class _MenuUnitPageState extends State<MenuUnitPage> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
Utils.getImgPath('f_add_image'),
width: w(15),
Text(
'+',
style: TextStyle(
fontWeight: FontWeight.w300,
color: MyColours.color_515151,
fontSize: font(26)),
),
HEmptyView(22),
Text(
... ...
... ... @@ -69,7 +69,12 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
}
_getNewRechargeList() async {
await marketingCenterProvider.getNewRechargeList(context);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
};
await marketingCenterProvider.getNewRechargeList(context, params);
if (marketingCenterProvider.rechargeList != null &&
marketingCenterProvider.rechargeList.length > 0) {
index = 0; //默认展示第一个
... ...
... ... @@ -5,6 +5,7 @@ import 'package:one_key/provider/user_model.dart';
import 'package:provider/provider.dart';
import '../constant/constant.dart';
import '../constant/error.dart';
import '../models/mark_data_model.dart';
import '../models/tableOuter.dart';
import '../net/base_resp.dart';
... ... @@ -22,9 +23,13 @@ class MarketingCenterProvider extends ChangeNotifier {
List<RechargeListSunModel> rechargeList = [];
List<RechargeListSunModel> rechargeListHistory = [];
RechargeListSunModel rechargeDetail; //充值优惠详情
PageState pageStateDetail = PageState.Loading;
PageState pageStateHistory = PageState.Loading;
//获取桌位列表
getTableList(context, {needLoading = true}) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
... ... @@ -90,7 +95,8 @@ class MarketingCenterProvider extends ChangeNotifier {
Map<String, String> params = {"sid": userModel.user.sellerid};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_seller_template_conf,
data: params, showLoading:pageState == PageState.Loading? false: showLoading)
data: params,
showLoading: pageState == PageState.Loading ? false : showLoading)
.catchError((error) {
pageState = PageState.ConnectivityError;
print(error.toString());
... ... @@ -152,17 +158,66 @@ class MarketingCenterProvider extends ChangeNotifier {
return false;
}
///客户经理获取所创建活动列表
Future<bool> getNewRechargeListHistory(
BuildContext context, Map<String, String> params,
{isShowLoading = true}) async {
if (isShowLoading) {
pageStateHistory = PageState.Loading;
notifyListeners();
}
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_new_recharge_list,
data: params,
showLoading:
pageStateHistory == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
switch (error.type) {
case 1:
pageStateHistory = PageState.ConnectivityError;
break;
case 2:
pageStateHistory = PageState.ConnectivityTimeOut;
break;
default:
pageStateHistory = PageState.ConnectivityError;
break;
}
}
notifyListeners();
return false;
});
if (baseResp.code == Constant.status_success) {
rechargeListHistory =
RechargeListModel.fromJson(baseResp.responseData).data;
if (rechargeListHistory.length == 0) {
pageStateHistory = PageState.Empty;
} else {
pageStateHistory = PageState.Success;
}
notifyListeners();
return true;
} else {
Utils.showToast(baseResp.msg);
pageStateHistory = PageState.ConnectivityError;
}
notifyListeners();
return false;
}
// 获取新充值活动列表
Future<bool> getNewRechargeList(BuildContext context,
Future<bool> getNewRechargeList(
BuildContext context, Map<String, String> params,
{bool showLoading = true}) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sellerid": userModel.user.sellerid,
// 'uid': userModel.user.openid
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_new_recharge_list,
data: params, showLoading:pageStateRechargeHome == PageState.Loading ? false: showLoading)
data: params,
showLoading: pageStateRechargeHome == PageState.Loading
? false
: showLoading)
.catchError((error) {
pageStateRechargeHome = PageState.ConnectivityError;
print(error.toString());
... ... @@ -195,7 +250,9 @@ class MarketingCenterProvider extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_new_recharge_detail,
data: params, showLoading:pageStateDetail == PageState.Loading?false: showLoading)
data: params,
showLoading:
pageStateDetail == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateDetail = PageState.ConnectivityError;
print(error.toString());
... ... @@ -215,7 +272,4 @@ class MarketingCenterProvider extends ChangeNotifier {
notifyListeners();
return false;
}
}
... ...
... ... @@ -1647,20 +1647,24 @@ class NavigatorUtil {
///菜单管理------规格和价格设置
static Future<dynamic> goMenuSetPricePage(
BuildContext context, Map object, {
BuildContext context,
Map object, {
replace = false,
}) {
return _navigateTo(context, "${Routes.menu_set_price_page}?object=${FluroConvertUtils.object2string(object)}",
return _navigateTo(context,
"${Routes.menu_set_price_page}?object=${FluroConvertUtils.object2string(object)}",
replace: replace);
}
///菜单管理-----配置销售单位
static Future<dynamic> goMenuUnitPage(
BuildContext context,
String specid, {
String specid,
String specids, {
replace = false,
}) {
return _navigateTo(context, "${Routes.menu_unit_page}?specid=$specid",
return _navigateTo(
context, "${Routes.menu_unit_page}?specid=$specid&specids=$specids",
replace: replace);
}
... ... @@ -1685,4 +1689,9 @@ class NavigatorUtil {
"${Routes.menu_theme_color_set_page}?object=${FluroConvertUtils.object2string(object)}",
replace: replace);
}
/// 充值优惠历史列表
static void goRechargeHistoryPage(BuildContext context, {replace = false}) {
_navigateTo(context, "${Routes.recharge_history_page}", replace: replace);
}
}
... ...
... ... @@ -196,6 +196,7 @@ import '../pages/my/marketing_center/book_notification/store_introduce_page.dart
import '../pages/my/marketing_center/marketing_center_home_page.dart';
import '../pages/my/marketing_center/recharge/recharge_detail_page.dart';
import '../pages/my/marketing_center/recharge/recharge_edit_page.dart';
import '../pages/my/marketing_center/recharge/recharge_history_page.dart';
import '../pages/my/marketing_center/recharge/recharge_home_page.dart';
import '../pages/my/marketing_center/recharge/recharge_select_store_coupon_page.dart';
import '../pages/my/menu_type/menu_add_dishes_page.dart';
... ... @@ -2703,11 +2704,15 @@ var menuSetPricePageHandle = new Handler(
var menuUnitPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
String specid = params["specid"].first;
String specids = params["specids"].first;
// NotebookDetail detailEntity = NotebookDetail.fromJson(json
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
return ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(), child: MenuUnitPage(specid: specid));
create: (_) => MenuManageProvider(), child: MenuUnitPage(specid: specid,specids:specids));
});
///菜单管理--做法
... ... @@ -2737,3 +2742,13 @@ var menuThemeColorSetPageHandle = new Handler(
create: (_) => MenuManageProvider(),
child: MenuThemeColorSetPage(menuModel: res));
});
///充值优惠过期历史
var rechargeHistoryPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
// String idstr = params["idstr"].first;
// NotebookDetail detailEntity = NotebookDetail.fromJson(json
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(), child: RechargeHistoryPage());
});
... ...
... ... @@ -237,6 +237,8 @@ class Routes {
"/marking_recharge_select_page"; //充值优惠单选择页面
static String order_share_page = "/order_share_page"; //排菜单微信分享截屏
static String recharge_history_page = "/recharge_history_page"; //充值优惠过期券
/** 菜单管理
*/
... ... @@ -472,7 +474,11 @@ class Routes {
router.define(menu_set_price_page, handler: menuSetPricePageHandle);
router.define(menu_unit_page, handler: menuUnitPageHandle);
router.define(menu_dish_method_page, handler: menuDishMethodPageHandle);
router.define(menu_theme_color_set_page, handler: menuThemeColorSetPageHandle);
router.define(menu_theme_color_set_page,
handler: menuThemeColorSetPageHandle);
router.define(recharge_history_page,
handler: rechargeHistoryPageHandle);
}
}
... ...