xt / Flutter-ReserveApp · Commits

Go to a project

Commit 166dc67bb55fc53bd095a8ac512094e6f1646102

Authored by wdn127929
1 parent 0bc2e3c9
build: skipped

充值优惠

Inline Side-by-side
Showing 13 changed files with 404 additions and 127 deletions
... ... @@ -317,7 +317,7 @@ class MarkMarketingModel {
String isRecharge;
RechargeListSunModel rechargeData;
CouponSunModel couponData;
List<CouponSunModel> couponDataList;
MarkMarketingModel(
{this.isArrival,
... ... @@ -343,10 +343,28 @@ class MarkMarketingModel {
rechargeData = json['recharge_data'] != null
? new RechargeListSunModel.fromJson(json['recharge_data'])
: null;
couponData = json['coupon_data'] != null
? new CouponSunModel.fromJson(json['coupon_data'])
: null;
if (json['coupon_data'] != null) {
couponDataList = <CouponSunModel>[];
if (json['coupon_data'] is Map) {
//旧数据map
couponDataList.add(CouponSunModel.fromJson(json['coupon_data']));
} else {
var couponData = convert.jsonDecode(json['coupon_data']);
if (couponData is List) {
couponData.forEach((v) {
couponDataList.add(CouponSunModel.fromJson(v));
});
} else if (couponData is Map) {
// json['coupon_data'].forEach((v) {
couponDataList.add(CouponSunModel.fromJson(couponData));
// });
} else {
couponData.forEach((v) {
couponDataList.add(v);
});
}
}
}
}
Map<String, dynamic> toJson() {
... ... @@ -361,7 +379,7 @@ class MarkMarketingModel {
data['is_coupon'] = this.isCoupon;
data['is_recharge'] = this.isRecharge;
data['recharge_data'] = this.rechargeData;
data['coupon_data'] = this.couponData;
data['coupon_data'] = this.couponDataList;
return data;
}
... ...
... ... @@ -255,6 +255,7 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
// bus.emit('refresh_coupon_list');
EventBus().emit('refresh_coupon_invitation');
bus.emit('refresh_coupon_list_f');
bus.emit('refresh_marketting_page');
bus.emit('refresh_table_m_coupon');
Navigator.pop(context, true);
... ... @@ -711,7 +712,8 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
_textfield('销售价', '默认0元，可以免费发放',
_priceControl, _priceFocusNode,
textInputType:
TextInputType.numberWithOptions(decimal: true)),
TextInputType.numberWithOptions(
decimal: true)),
Container(
height: ScreenUtil().setWidth(2),
... ...
... ... @@ -52,7 +52,6 @@ class _CouponSunPageState extends State<CouponSunPage> {
@override
void dispose() {
super.dispose();
}
... ... @@ -77,6 +76,7 @@ class _CouponSunPageState extends State<CouponSunPage> {
bool isSuccess = await couponProvider.setCustomerActivity(context, params,
isShowLoading: false);
print(isSuccess);
bus.emit('refresh_marketting_page');
_couponNetworkData(widget.index, isShowLoading: false);
// if (isSuccess) {
// couponProvider.notifyListeners();
... ...
... ... @@ -30,8 +30,8 @@ import '../../../../models/coupon_model.dart';
* 优惠券单选页面
*/
class MarkingCouponSelectPage extends StatefulWidget {
final String selectid;
MarkingCouponSelectPage({Key key, this.selectid}) : super(key: key);
final List<CouponSunModel> couponList;
MarkingCouponSelectPage({Key key, this.couponList}) : super(key: key);
@override
_MarkingCouponSelectPageState createState() =>
... ... @@ -42,7 +42,7 @@ class _MarkingCouponSelectPageState extends State<MarkingCouponSelectPage> {
EasyRefreshController _controller = EasyRefreshController();
CouponProvider couponProvider;
CouponSunModel selectData;
List<CouponSunModel> selectDataList = [];
///获取优惠券列表数据(status == 1)
... ... @@ -55,14 +55,24 @@ class _MarkingCouponSelectPageState extends State<MarkingCouponSelectPage> {
await couponProvider.getCustomerSelectActivityMarking(context, params,
isShowLoading: isShowLoading);
outerloop:
for (var i = 0; i < couponProvider.couponListSelect.length; i++) {
if (couponProvider.couponListSelect[i].id == widget.selectid) {
couponProvider.couponListSelect[i].isCheck = true;
selectData = couponProvider.couponListSelect[i];
break outerloop;
// outerloop:
// for (var i = 0; i < couponProvider.couponListSelect.length; i++) {
// if (couponProvider.couponListSelect[i].id == widget.couponList) {
// couponProvider.couponListSelect[i].isCheck = true;
// selectDataList.add(couponProvider.couponListSelect[i]);
// // break outerloop;
// }
// }
for (var item in couponProvider.couponListSelect) {
for (var itemselect in widget.couponList) {
if (itemselect.id == item.id) {
item.isCheck = true;
selectDataList.add(item);
// break outerloop;
}
}
}
setState(() {});
}
... ... @@ -130,16 +140,26 @@ class _MarkingCouponSelectPageState extends State<MarkingCouponSelectPage> {
return InkWell(
onTap: () {
//改这里 ******8
couponProvider.couponListSelect
.forEach((element) {
element.isCheck = false;
});
// couponProvider.couponListSelect
// .forEach((element) {
// element.isCheck = false;
// });
// couponProvider.couponListSelect[index].isCheck =
// true;
couponProvider.couponListSelect[index].isCheck =
true;
selectData =
couponProvider.couponListSelect[index];
!couponProvider
.couponListSelect[index].isCheck;
if (couponProvider
.couponListSelect[index].isCheck) {
selectDataList.add(
couponProvider.couponListSelect[index]);
} else {
selectDataList.remove(
couponProvider.couponListSelect[index]);
}
setState(() {});
},
// child: Row(
// children: [
... ... @@ -168,16 +188,18 @@ class _MarkingCouponSelectPageState extends State<MarkingCouponSelectPage> {
// bool old = couponProvider
// .couponListSelect[index].isCheck;
//改这里 ******8
couponProvider.couponListSelect
.forEach((element) {
element.isCheck = false;
});
couponProvider
.couponListSelect[index].isCheck = true;
selectData =
couponProvider.couponListSelect[index];
.couponListSelect[index].isCheck =
!couponProvider
.couponListSelect[index].isCheck;
if (couponProvider
.couponListSelect[index].isCheck) {
selectDataList.add(couponProvider
.couponListSelect[index]);
} else {
selectDataList.remove(couponProvider
.couponListSelect[index]);
}
// couponProvider
// .couponListSelect[index].isCheck = !old;
... ... @@ -205,8 +227,8 @@ class _MarkingCouponSelectPageState extends State<MarkingCouponSelectPage> {
ScreenUtil().setWidth(40), ScreenUtil().setWidth(40)),
child: RoundButton(
onPressed: () async {
Map temp = {
'coupon': selectData,
Map temp = {
'coupon': selectDataList,
};
Navigator.pop(context, temp);
},
... ...
... ... @@ -20,6 +20,7 @@ import '../../../../provider/upload_img_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/upload_image_util.dart';
import '../../../../widgets/MyDivider.dart';
... ... @@ -56,7 +57,9 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
RechargeListSunModel rechargeData;
String rechargeContent = '';
CouponSunModel couponData;
List<CouponSunModel> couponDataList = [];
List<RechargeListSunModel> rechargeListCanUse = [];
ScrollController controller = ScrollController();
@override
void initState() {
... ... @@ -65,12 +68,21 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
_couponNetworkData();
_getNewRechargeList();
getSellerTemplateConf();
bus.on('refresh_marketting_page', (arg) {
_couponNetworkData();
});
bus.on('refresh_marketting_page_recharge', (arg) {
_getNewRechargeList();
});
});
}
@override
void dispose() {
_uploadImageProvider.firstImage = UploadImgModel();
bus.off('refresh_marketting_page');
bus.off('refresh_marketting_page_recharge');
super.dispose();
}
... ... @@ -81,7 +93,7 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
// 'uid': userModel.user.openid
};
await marketingCenterProvider.getNewRechargeList(context, params);
List<RechargeListSunModel> rechargeListCanUse = [];
rechargeListCanUse = [];
if (marketingCenterProvider.rechargeList.length > 0) {
marketingCenterProvider.rechargeList.forEach((element) {
if (element.isOpen == '1') {
... ... @@ -148,7 +160,8 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
rechargeData =
marketingCenterProvider.markDataModel.marketing.rechargeData;
couponData = marketingCenterProvider.markDataModel.marketing.couponData;
couponDataList =
marketingCenterProvider.markDataModel.marketing.couponDataList;
_uploadImageProvider.firstImage.qiniuUrl =
marketingCenterProvider.markDataModel.marketing.logo ?? null;
... ... @@ -175,10 +188,10 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
await couponProvider.getCustomerSelectActivityMarking(context, params,
isShowLoading: isShowLoading);
if (couponData == null) {
if (couponDataList == null || couponDataList.length == 0) {
if (couponProvider.couponListSelect != null &&
couponProvider.couponListSelect.length > 0) {
couponData = couponProvider.couponListSelect[0];
couponDataList.add(couponProvider.couponListSelect[0]);
setState(() {});
}
... ... @@ -393,13 +406,164 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
);
}
///优惠券
Widget _markingCupon({
VoidCallback onPressed,
bool select = false,
VoidCallback onPressedSelect,
}) {
return Container(
margin: EdgeInsets.only(left: w(21), top: w(12), right: w(21)),
child: Column(
children: [
InkWell(
onTap: onPressedSelect,
child: Row(
children: [
Image.asset(
Utils.getImgPath(select ? 'f_select' : 'f_select_not'),
width: w(20),
),
HEmptyView(20),
Text(
'推荐店内代金券优惠',
style: TextStyle(
fontSize: font(14), color: MyColours.color_515151),
),
Spacer(),
RoundButton(
text: '选择活动',
width: w(72),
height: w(22),
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
borderColor: MyColours.color_438E93,
textColor: MyColours.color_438E93,
radius: r(11),
fontSize: 24,
isBold: true,
onPressed: onPressed,
)
],
)),
VEmptyView(20),
ListView.builder(
shrinkWrap: true,
controller: controller,
itemCount: couponDataList.length,
itemBuilder: (BuildContext context, int index) {
CouponSunModel couponData = couponDataList[index];
return _markingCuponItem(
couponData.aname,
_getCouponsDesc(couponData),
couponData.price ?? '',
couponData.use != null && couponData.use.isCash
? '${(double.parse(couponData.price) / double.parse(couponData.use.cash)) * 10}折'
: '',
'切换活动',
select: isCoupon, onPressedSelect: () {
setState(() {
isCoupon = !isCoupon;
});
});
})
],
),
);
}
///优惠券
Widget _markingCuponItem(
String title,
String content,
String subtile,
String discount,
String btnTitle, {
VoidCallback onPressed,
bool select = false,
VoidCallback onPressedSelect,
}) {
return Container(
margin: EdgeInsets.only(left: w(21), top: w(12), right: w(21)),
child: Container(
padding: EdgeInsets.all(w(12)),
decoration: BoxDecoration(
borderRadius: BorderRadiusDirectional.circular(r(8)),
border: Border.all(width: w(1), color: MyColours.color_DBDBDB)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
constraints: BoxConstraints(maxWidth: w(150)),
child: Text(
title,
style: TextStyle(
fontSize: font(14),
fontWeight: FontWeight.bold,
color: MyColours.color_515151),
)),
HEmptyView(20),
subtile != ''
? Text(
'￥${subtile}',
style: TextStyle(
fontSize: font(7),
fontWeight: FontWeight.bold,
color: MyColours.color_E34D59),
)
: SizedBox(),
HEmptyView(10),
discount != ''
? Container(
padding: EdgeInsets.symmetric(
horizontal: w(3), vertical: w(2)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(r(3)),
border: Border.all(
width: w(0.5),
color: MyColours.color_E34D59)),
child: Text(
discount,
style: TextStyle(
color: MyColours.color_E34D59,
fontSize: font(7)),
),
)
: SizedBox(),
],
),
if (content != '') VEmptyView(20),
if (content != '')
Text(
content,
style: TextStyle(
height: 1.2,
fontSize: font(10),
fontWeight: FontWeight.bold,
color: MyColours.color_515151),
)
],
)),
],
),
),
);
}
///营销推广
Widget _markingItem(
String selectTitle,
String title,
String content,
String subtile,
String discount, {
String discount,
String btnTitle, {
VoidCallback onPressed,
bool select = false,
VoidCallback onPressedSelect,
... ... @@ -490,8 +654,9 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
)
],
)),
HEmptyView(20),
RoundButton(
text: '切换活动',
text: btnTitle,
width: w(72),
height: w(22),
gradientStart: MyColours.color_ffffff,
... ... @@ -767,14 +932,7 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
]));
}
@override
Widget build(BuildContext context) {
couponProvider = Provider.of<CouponProvider>(context, listen: true);
_uploadImageProvider =
Provider.of<UploadImageProvider>(context, listen: true);
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
String _getCouponsDesc(couponData) {
String couponsDesc = '';
if (couponData != null) {
if (couponData.expDate == null) {
... ... @@ -790,6 +948,16 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
}
}
}
return couponsDesc;
}
@override
Widget build(BuildContext context) {
couponProvider = Provider.of<CouponProvider>(context, listen: true);
_uploadImageProvider =
Provider.of<UploadImageProvider>(context, listen: true);
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_ffffff,
... ... @@ -803,6 +971,7 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
children: [
Expanded(
child: SingleChildScrollView(
controller: controller,
child: Column(
children: [
_headItem('客户互动及店铺推广'),
... ... @@ -837,34 +1006,45 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
VEmptyView(24),
_headItem('预订安排中附带的营销推广'),
VEmptyView(24),
couponData != null
? _markingItem(
'推荐店内代金券优惠',
couponData.aname,
couponsDesc,
couponData.price ?? '',
couponData.use != null && couponData.use.isCash
? '${(double.parse(couponData.price) / double.parse(couponData.use.cash)) * 10}折'
: '',
select: isCoupon, onPressedSelect: () {
setState(() {
isCoupon = !isCoupon;
});
}, onPressed: () async {
//切换活动
Map temp =
await NavigatorUtil.goMarkingCouponSelectPage(
context, couponData.id);
if (temp['coupon'] != null) {
couponData = temp['coupon'];
couponProvider.couponListSelect != null &&
couponProvider.couponListSelect.length > 0
? _markingCupon(
select: isCoupon,
onPressedSelect: () {
setState(() {
isCoupon = !isCoupon;
});
},
onPressed: () async {
//切换活动
Map temp =
await NavigatorUtil.goMarkingCouponSelectPage(
context, {'object': couponDataList});
if (temp['coupon'] != null) {
couponDataList = temp['coupon'];
setState(() {});
}
})
: SizedBox(),
setState(() {});
}
})
: (couponProvider.couponListSelect == null ||
couponProvider.couponListSelect.length ==
0) &&
Utils.getAuthority(context, '创建新的优惠券')
? _markingItem(
'推荐店内代金券优惠',
'当前没有代金券',
'注:代金券附加在预订安排中，可以随着预订人给被请客客人发送邀请函自动传播，吸引顾客到店。',
'',
'',
'创建优惠',
select: false, onPressed: () {
//创建优惠
NavigatorUtil.goCouponPage(context);
})
: SizedBox(),
rechargeData != null
? _markingItem('推荐店内充值单一优惠活动', rechargeData.rname,
rechargeContent, '', '', select: isRecharge,
rechargeContent, '', '', '切换活动', select: isRecharge,
onPressedSelect: () {
setState(() {
isRecharge = !isRecharge;
... ... @@ -880,7 +1060,21 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
setState(() {});
}
})
: SizedBox(),
: (rechargeListCanUse == null ||
rechargeListCanUse.length == 0) &&
Utils.getAuthority(context, '新建优惠')
? _markingItem(
'推荐店内充值单一优惠活动',
'当前没有创建充值优惠活动',
'注：充值优惠活动附加在预订安排中，可以随着预订人给被请客客人发送邀请函自动传播。',
'',
'',
'创建优惠',
select: false, onPressed: () {
//创建新优惠
NavigatorUtil.goRechargeHomePage(context);
})
: SizedBox(),
_markingOtherItem()
],
),
... ... @@ -928,7 +1122,7 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
'wecomle': welcomeTextC.text ?? '',
'logo': _uploadImageProvider.firstImage.qiniuUrl,
'recharge_data': rechargeData,
'coupon_data': couponData
'coupon_data': json.encode(couponDataList)
};
Map<String, String> params = {
'sid': Provider.of<UserModel>(context, listen: false)
... ...
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/models/coupon_model.dart';
import 'package:one_key/models/mark_data_model.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/system_app_bar.dart';
... ... @@ -1269,36 +1270,55 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> {
);
}
_rechargeWiddget() {
String _getCouponsDesc(couponData) {
String couponsDesc = '';
if (_marketingCenterProvider.markDataModel.marketing.couponData != null) {
if (_marketingCenterProvider.markDataModel.marketing.couponData.expDate ==
null) {
couponsDesc =
_marketingCenterProvider.markDataModel.marketing.couponData.desc;
if (couponData != null) {
if (couponData.expDate == null) {
couponsDesc = couponData.desc;
} else {
if (_marketingCenterProvider
.markDataModel.marketing.couponData.expDate.isNone) {
couponsDesc = '无限制,' +
_marketingCenterProvider
.markDataModel.marketing.couponData.desc ??
'';
} else if (_marketingCenterProvider
.markDataModel.marketing.couponData.expDate.isBirthday) {
couponsDesc = '会员生日当天可用,' +
_marketingCenterProvider
.markDataModel.marketing.couponData.desc ??
'';
} else if (_marketingCenterProvider
.markDataModel.marketing.couponData.expDate.isWeek) {
if (couponData.expDate.isNone) {
couponsDesc = '无限制,' + couponData.desc ?? '';
} else if (couponData.expDate.isBirthday) {
couponsDesc = '会员生日当天可用,' + couponData.desc ?? '';
} else if (couponData.expDate.isWeek) {
couponsDesc =
'${_marketingCenterProvider.markDataModel.marketing.couponData.expDate.weekShow},' +
_marketingCenterProvider
.markDataModel.marketing.couponData.desc ??
'';
'${couponData.expDate.weekShow},' + couponData.desc ?? '';
}
}
}
return couponsDesc;
}
_rechargeWiddget() {
// String couponsDesc = '';
// if (_marketingCenterProvider.markDataModel.marketing.couponData != null) {
// if (_marketingCenterProvider.markDataModel.marketing.couponData.expDate ==
// null) {
// couponsDesc =
// _marketingCenterProvider.markDataModel.marketing.couponData.desc;
// } else {
// if (_marketingCenterProvider
// .markDataModel.marketing.couponData.expDate.isNone) {
// couponsDesc = '无限制,' +
// _marketingCenterProvider
// .markDataModel.marketing.couponData.desc ??
// '';
// } else if (_marketingCenterProvider
// .markDataModel.marketing.couponData.expDate.isBirthday) {
// couponsDesc = '会员生日当天可用,' +
// _marketingCenterProvider
// .markDataModel.marketing.couponData.desc ??
// '';
// } else if (_marketingCenterProvider
// .markDataModel.marketing.couponData.expDate.isWeek) {
// couponsDesc =
// '${_marketingCenterProvider.markDataModel.marketing.couponData.expDate.weekShow},' +
// _marketingCenterProvider
// .markDataModel.marketing.couponData.desc ??
// '';
// }
// }
// }
return Container(
padding: EdgeInsets.symmetric(horizontal: w(20), vertical: w(8)),
child: Column(
... ... @@ -1313,22 +1333,24 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> {
),
VEmptyView(20),
_marketingCenterProvider.markDataModel.marketing.isCoupon == '1'
? _markingItem(
'推荐店内代金券优惠',
_marketingCenterProvider
.markDataModel.marketing.couponData.aname,
couponsDesc,
_marketingCenterProvider
.markDataModel.marketing.couponData.price ??
"",
_marketingCenterProvider
.markDataModel.marketing.couponData.use !=
null &&
_marketingCenterProvider
.markDataModel.marketing.couponData.use.isCash
? '${(double.parse(_marketingCenterProvider.markDataModel.marketing.couponData.price) / double.parse(_marketingCenterProvider.markDataModel.marketing.couponData.use.cash)) * 10}折'
: '',
'去抢购')
? ListView.builder(
controller: controller,
shrinkWrap: true,
itemCount: _marketingCenterProvider
.markDataModel.marketing.couponDataList.length,
itemBuilder: (context, index) {
CouponSunModel couponSunModel = _marketingCenterProvider
.markDataModel.marketing.couponDataList[index];
return _markingItem(
'推荐店内代金券优惠',
couponSunModel.aname,
_getCouponsDesc(couponSunModel),
couponSunModel.price ?? "",
couponSunModel.use != null && couponSunModel.use.isCash
? '${(double.parse(couponSunModel.price) / double.parse(couponSunModel.use.cash)) * 10}折'
: '',
'去抢购');
})
: SizedBox(),
_marketingCenterProvider.markDataModel.marketing.isRecharge == '1'
? _markingItem(
... ...
... ... @@ -546,7 +546,8 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
),
VEmptyView(24),
_textfield('充值满', '点击输入充值金额门槛', priceminC, priceminF,
textInputStyle: TextInputType.numberWithOptions(decimal: true)),
textInputStyle:
TextInputType.numberWithOptions(decimal: true)),
MyDivider(
double.infinity,
w(1),
... ... @@ -641,7 +642,8 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
},
keyboardType: TextInputType.numberWithOptions(decimal: true),
keyboardType: TextInputType.numberWithOptions(
decimal: true),
),
),
HEmptyView(16),
... ... @@ -729,7 +731,8 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
},
keyboardType: TextInputType.numberWithOptions(decimal: true),
keyboardType: TextInputType.numberWithOptions(
decimal: true),
),
),
HEmptyView(16),
... ... @@ -1222,6 +1225,7 @@ class _RechargeEditPageState extends State<RechargeEditPage> {
//成功后返回前面列表
Navigator.pop(context);
//刷新列表
bus.emit('refresh_marketting_page_recharge');
bus.emit('refresh_recharge_home');
}
... ...
... ... @@ -73,6 +73,7 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
bool success =
await marketingCenterProvider.createNewRecharge(context, pramas);
if (success) {
bus.emit('refresh_marketting_page_recharge');
setState(() {
rechargeListSunModel.isOpen = isOpen;
});
... ... @@ -151,6 +152,7 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
bool success = await marketingCenterProvider
.createNewRecharge(context, pramas);
if (success) {
bus.emit('refresh_marketting_page_recharge');
setState(() {
marketingCenterProvider.rechargeList
.removeAt(index);
... ...
... ... @@ -131,6 +131,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
};
params["cause"] = json.encode(causeMap);
}
params['note_name'] = userModel.user.account;
NotebookDetailModel detailModel =
Provider.of<NotebookDetailModel>(context, listen: false);
bool success =
... ...
... ... @@ -143,6 +143,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
};
params["cause"] = json.encode(causeMap);
}
params['note_name'] = userModel.user.account;
NotebookDetailModel detailModel =
Provider.of<NotebookDetailModel>(context, listen: false);
bool success =
... ...
... ... @@ -153,6 +153,7 @@ class NotebookDetailModel extends ChangeNotifier {
Future<bool> setReserveStatus(
BuildContext context, Map<String, String> params,
{ifPush = true, showLoading = false}) async {
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
.request<Map<String, dynamic>>(
context, Method.get, HttpUrl.set_reserve_status,
... ...
... ... @@ -1460,11 +1460,11 @@ class NavigatorUtil {
///预订安排通知定制------优惠券选择
static Future<dynamic> goMarkingCouponSelectPage(
BuildContext context,
String idstr, {
Map object, {
replace = false,
}) {
return _navigateTo(
context, "${Routes.marking_coupon_select_page}?idstr=$idstr",
return _navigateTo(context,
"${Routes.marking_coupon_select_page}?object=${FluroConvertUtils.object2string(object)}",
replace: replace);
}
... ...
... ... @@ -2483,12 +2483,21 @@ var markingInteractionPageHandle = new Handler(
//我的----营销中心-优惠券选择
var markingCouponSelectPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
String idstr = params["idstr"].first;
// String idstr = params["idstr"].first;dfdf
List<CouponSunModel> res = [];
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
List temp = object['object'];
for (var item in temp) {
res.add(CouponSunModel.fromJson(item));
}
}
// NotebookDetail detailEntity = NotebookDetail.fromJson(json
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: MarkingCouponSelectPage(selectid: idstr));
child: MarkingCouponSelectPage(couponList: res));
});
//我的----营销中心-预订安排预览页
... ... @@ -2929,5 +2938,6 @@ var customerNoticeSettingPageHandle = new Handler(
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["daylist"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(), child: CustomerNoticeSettingPage());
create: (_) => MarketingCenterProvider(),
child: CustomerNoticeSettingPage());
});
... ...