xt / Flutter-ReserveApp · Commits

Go to a project

Commit f2f8c5ba119b93cdcf7210920e9174fa993fa869

Authored by wdn127929
1 parent 91359c26
build: skipped

优惠券

Inline Side-by-side
Showing 7 changed files with 224 additions and 71 deletions
... ... @@ -6,7 +6,7 @@ class Constant {
/**
*
* 打包注意事项 ！！！！！！！！
* 打包注意事项 ！！！！！！！！ ****************苹果 看看导出预订数据****************
*
*
* */
... ...
... ... @@ -16,7 +16,7 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) {
});
}
List<dynamic> tabletemp = convert.jsonDecode(json['tableinfo'] as String);
List<dynamic> tabletemp = json['tableinfo'] == null ? [] : convert.jsonDecode(json['tableinfo'] as String);
List<t.TableList> temp = [];
tabletemp.forEach((element) {
... ...
... ... @@ -704,6 +704,34 @@ class _CouponDetailPageState extends State<CouponDetailPage> {
),
if (couponProvider.couponSunModel.liteQrcode != null)
HEmptyView(30),
RoundButton(
text: '复用',
width: w(100),
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
borderColor: MyColours.color_438E93,
textColor: MyColours.color_438E93,
height: ScreenUtil().setWidth(80),
radius: ScreenUtil().setWidth(14),
isBold: true,
fontSize: 28,
onPressed: () async {
//复用，跳转至编辑页面
bool needRefresh =
await NavigatorUtil.goCouponEditPage(context,
isMine:
couponProvider.couponSunModel.isType ==
'1'
? false
: true,
couponSunModel: couponProvider.couponSunModel);
if(needRefresh != null &&needRefresh){
Navigator.pop(context);
}
},
),
HEmptyView(30),
Expanded(
child: RoundButton(
text: '分享给客户',
... ...
... ... @@ -19,6 +19,7 @@ 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/coupon_model.dart';
import '../../models/filter_btn_model.dart';
import '../../models/upload_img_model.dart';
import '../../provider/upload_img_provider.dart';
... ... @@ -32,7 +33,9 @@ import '../online_check/img_picker_widget.dart';
class CouponEidtPage extends StatefulWidget {
final bool isMine;
CouponEidtPage({Key key, this.isMine = true}) : super(key: key);
final CouponSunModel couponSunModel;
CouponEidtPage({Key key, this.isMine = true, this.couponSunModel})
: super(key: key);
@override
_CouponEidtPageState createState() => _CouponEidtPageState();
... ... @@ -162,9 +165,60 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
}
});
if (widget.couponSunModel != null) {
_couponNameEditControl.text = widget.couponSunModel.aname;
_couponRequireEditControl.text = widget.couponSunModel.desc;
_couponExplainEditControl.text = widget.couponSunModel.explain;
DateTime dateTimes = DateTime.fromMillisecondsSinceEpoch(
int.parse(widget.couponSunModel.stime.toString()) * 1000);
fromDate = DateUtil.formatDate(dateTimes, format: DateFormats.y_mo_d);
DateTime dateTimee = DateTime.fromMillisecondsSinceEpoch(
int.parse(widget.couponSunModel.etime.toString()) * 1000);
endDate = DateUtil.formatDate(dateTimee, format: DateFormats.y_mo_d);
swichState = widget.couponSunModel.status == '1' ? true : false;
if (widget.isMine) {
//我的优惠券
} else {
//店铺
swichHexiao = widget.couponSunModel.isExamine == '1' ? true : false;
_priceControl.text = widget.couponSunModel.price;
money = widget.couponSunModel.use.isCash;
dish = widget.couponSunModel.use.isDish;
discount = widget.couponSunModel.use.isDiscount;
moneyControl.text = widget.couponSunModel.use.cash;
discountControl.text = widget.couponSunModel.use.discount;
dishControl.text = widget.couponSunModel.use.dish;
if (widget.couponSunModel.use.images.length > 0) {
widget.couponSunModel.use.images.forEach((element) {
UploadImgModel uploadImgModel = UploadImgModel();
uploadImgModel.qiniuUrl = element;
uploadImgModel.process = 1;
img.add(uploadImgModel);
});
}
limitNone = widget.couponSunModel.expDate.isNone ? true : false;
limitBirthday = widget.couponSunModel.expDate.isBirthday ? true : false;
limitWeek = widget.couponSunModel.expDate.isWeek ? true : false;
weekShow = widget.couponSunModel.expDate.weekShow ?? '点击设置可用日期';
weekData = widget.couponSunModel.expDate.weekData ?? [];
uids = widget.couponSunModel.uidList;
_limitNumControl.text = widget.couponSunModel.grantNum;
}
}
WidgetsBinding.instance.addPostFrameCallback((_) {
// _couponNetworkData(0);
_initWeekData();
if (weekData.length == 0) {
_initWeekData();
}
_getQiniuInfo();
});
}
... ... @@ -818,15 +872,105 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
.numberWithOptions()),
if (dish)
_textfieldSelect('菜品：', '点击输入赠送菜品名称',
dishControl, dishFocusNode,
textInputType: TextInputType.text),
Container(
padding: EdgeInsets.only(left: w(20)),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
children: [
Container(
child: Text(
'菜品：',
style: TextStyle(
color:
MyColours.color_515151,
fontSize:
ScreenUtil().setSp(32)),
),
),
VEmptyView(24),
Container(
margin: EdgeInsets.only(
right: w(20),
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
r(10)),
border: Border.all(
width: w(1),
color: MyColours
.color_DBDBDB)),
padding: EdgeInsets.only(
left: w(8), right: (w(8))),
child: TextField(
controller: dishControl,
textAlign: TextAlign.left,
textAlignVertical:
TextAlignVertical
.bottom,
maxLines: 5,
maxLength: 500,
// //光标颜色
// cursorColor:
// widget.isSelect ? Colors.white : MyColours.color_199095,
//输入文本的样式
style: TextStyle(
color: MyColours
.color_515151,
fontSize: ScreenUtil()
.setSp(32),
),
focusNode: dishFocusNode,
decoration: InputDecoration(
isCollapsed: true,
border:
OutlineInputBorder(
borderSide:
BorderSide
.none),
hintText: '点击输入赠送菜品名称',
hintStyle: TextStyle(
color: MyColours
.color_999999,
fontSize: ScreenUtil()
.setSp(32),
),
enabledBorder:
new UnderlineInputBorder(
borderSide:
BorderSide.none,
),
focusedBorder:
new UnderlineInputBorder(
borderSide:
BorderSide.none,
),
),
onChanged: (value) {},
onEditingComplete: () {
// FocusScope.of(context)
// .requestFocus(
// FocusNode()); //点击空白处隐藏键盘
},
keyboardType: TextInputType
.multiline)),
],
),
),
// _textfieldSelect('', '',
// , ,
// textInputType: TextInputType.text),
if (dish) VEmptyView(20),
if (dish)
Padding(
padding: EdgeInsets.only(
left: w(10), right: w(15)),
left: w(20), right: w(15)),
child: Consumer<UploadImageProvider>(
builder: (context, model, _) {
return ImgPickerWidget(
... ...
... ... @@ -756,6 +756,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
},
);
} else {
//立即续费 7天之内提示立即续费，其他日期，近体诗过期日期，问红旗是否？？？？？？
DialogUtil
.cupertinoAlertSellerEdateDialogSim(
context,
... ...
... ... @@ -322,9 +322,14 @@ class NavigatorUtil {
/// 创建优惠券
static Future<dynamic> goCouponEditPage(BuildContext context,
{replace = false, bool isMine = true}) {
return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}",
{replace = false, bool isMine = true, CouponSunModel couponSunModel}) {
if(couponSunModel != null){
return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}&couponSunModel=${FluroConvertUtils.object2string(couponSunModel)}",
replace: replace);
}
return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}",
replace: replace);
}
/// 选择优惠券
... ...
... ... @@ -326,8 +326,6 @@ var homeHandler = new Handler(
solt: solt)))));
});
// 跳转到主页
var homeSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -382,9 +380,6 @@ var reserveDetailHandler = new Handler(
))))));
});
// 跳转预订详情页
var reserveDetailSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -446,8 +441,6 @@ var handleOnlineHandler = new Handler(
// return HandleOnlinePage(rid, mid,fromNotify: fromNotify);
});
// 跳转到处理在线预订
var handleOnlineSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -585,8 +578,6 @@ var handleInvicationHandler = new Handler(
child: InvicationPage(rid)))))));
});
// 跳转到邀请函页面
var handleInvicationSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -776,11 +767,24 @@ var handleCouponEditPageHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
// String rid = params["rid"].first;
bool isMine = FluroConvertUtils.string2bool(params["isMine"].first);
CouponSunModel couponSunModel;
if(params.keys.contains("couponSunModel")){
couponSunModel = CouponSunModel.fromJson(json.decode(
FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
}
return ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(),
child: CouponEidtPage(
isMine: isMine,
couponSunModel:couponSunModel
));
});
///选择优惠券
... ... @@ -835,9 +839,6 @@ var baseInfoPageHandler = new Handler(
)));
});
///个人资料页面
var baseInfoPageSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -1134,14 +1135,14 @@ var storeBaseInfoPageHandler = new Handler(
return ChangeNotifierProvider<StoreBaseIndoProvider>(
create: (_) => StoreBaseIndoProvider(),
child: ChangeNotifierProvider<BookSetTimeModel>(
create: (_) => BookSetTimeModel(), child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(), child: StoreBaseInfoPage())));
create: (_) => BookSetTimeModel(),
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: StoreBaseInfoPage())));
// return ChangeNotifierProvider<UploadImageProvider>(
// create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
});
///店铺信息
var storeBaseInfoPageSimHandler = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1150,8 +1151,10 @@ var storeBaseInfoPageSimHandler = new Handler(
return ChangeNotifierProvider<StoreBaseIndoProvider>(
create: (_) => StoreBaseIndoProvider(),
child: ChangeNotifierProvider<BookSetTimeModel>(
create: (_) => BookSetTimeModel(), child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(), child: StoreBaseInfoPageSim())));
create: (_) => BookSetTimeModel(),
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: StoreBaseInfoPageSim())));
// return ChangeNotifierProvider<UploadImageProvider>(
// create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
});
... ... @@ -1253,7 +1256,6 @@ var personnelManagePageHandle = new Handler(
create: (_) => PersonnelProvider(), child: PersonnelManagePage());
});
///店员管理
var personnelManagePageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1261,7 +1263,6 @@ var personnelManagePageSimHandle = new Handler(
create: (_) => PersonnelProvider(), child: PersonnelManagePageSim());
});
///店员详情页面
var personnelDetailPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1275,7 +1276,6 @@ var personnelDetailPageHandle = new Handler(
child: PersonnelDetailPage(index: index, position: position)));
});
///店员详情页面
var personnelDetailPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1363,19 +1363,14 @@ var customerListPageHandle = new Handler(
sellerUser: sellerUser)));
});
///客情列表
var customerListPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
// banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp);
return ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<CollectStoreProvider>(
create: (_) => CollectStoreProvider(),
child: CustomerListPageSim(
)));
create: (_) => CollectStoreProvider(), child: CustomerListPageSim()));
});
///仅供展示的客情列表 ---商家
... ... @@ -1420,7 +1415,6 @@ var myCustomerListPageHandle = new Handler(
MyCustomerListPage(fromPage: fromPage, index: index, uid: uid)));
});
///我的客情列表
var myCustomerListPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1433,8 +1427,7 @@ var myCustomerListPageSimHandle = new Handler(
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<CollectStoreProvider>(
create: (_) => CollectStoreProvider(),
child:
MyCustomerListPageSim()));
child: MyCustomerListPageSim()));
});
///客情设置
... ... @@ -1609,7 +1602,6 @@ var customerDetailPageHandle = new Handler(
));
});
///客户详情
var customerDetailPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1648,7 +1640,6 @@ var myCustomerDetailPageHandle = new Handler(
userHistoryEntity: userHistoryEntity, fromPage: fromPage, uid: uid));
});
///我的客户详情
var myCustomerDetailPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1663,8 +1654,7 @@ var myCustomerDetailPageSimHandle = new Handler(
// String uid = params["uid"].first;
return ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: MyCustomerDetailPageSim(
userHistoryEntity: userHistoryEntity));
child: MyCustomerDetailPageSim(userHistoryEntity: userHistoryEntity));
});
///编辑客户详情
... ... @@ -1680,8 +1670,6 @@ var customerDetailEditPageHandle = new Handler(
child: CustomerDetailEditPage(guest: guest, fromPage: fromPage));
});
///编辑客户详情
var customerDetailEditPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1711,8 +1699,6 @@ var myCustomerDetailEditPageHandle = new Handler(
));
});
///我的编辑客户详情
var myCustomerDetailEditPagSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1725,7 +1711,6 @@ var myCustomerDetailEditPagSimHandle = new Handler(
create: (_) => CustomerProvider(),
child: MyCustomerDetailEditPageSim(
guest: guest,
));
});
... ... @@ -1826,9 +1811,6 @@ var tableManagerPageHandle = new Handler(
child: TableManagerPage(guest: guest)))))))));
});
///客情列表详情---再次预订
var tableManagerPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -1860,12 +1842,13 @@ var tableManagerPageSimHandle = new Handler(
create: (_) => StoreBaseIndoProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<
MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: ChangeNotifierProvider<SmsModel>(
create: (_) => SmsModel(),
child: TableManagerPageSim(guest: guest)))))))));
child:
ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: ChangeNotifierProvider<SmsModel>(
create: (_) => SmsModel(),
child: TableManagerPageSim(
guest: guest)))))))));
});
///账号登录页面
... ... @@ -2888,8 +2871,6 @@ var bookInfoPageHandle = new Handler(
create: (_) => BaseIndoProvider(), child: BookInfoPage()))));
});
//我的----营销中心-预订信息展示
var bookInfoPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -2904,7 +2885,8 @@ var bookInfoPageSimHandle = new Handler(
child: ChangeNotifierProvider<StoreBaseIndoProvider>(
create: (_) => StoreBaseIndoProvider(),
child: ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(), child: BookInfoPageSim()))));
create: (_) => BaseIndoProvider(),
child: BookInfoPageSim()))));
});
//我的----营销中心-店铺介绍
... ... @@ -2914,8 +2896,9 @@ var storeIntroducePageHandle = new Handler(
// NotebookDetail detailEntity = NotebookDetail.fromJson(json
// .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(), child:ChangeNotifierProvider<StoreBaseIndoProvider>(
create: (_) => StoreBaseIndoProvider(), child: StoreIntroducePage()));
create: (_) => MarketingCenterProvider(),
child: ChangeNotifierProvider<StoreBaseIndoProvider>(
create: (_) => StoreBaseIndoProvider(), child: StoreIntroducePage()));
});
//我的----营销中心-主厨介绍
... ... @@ -2949,8 +2932,6 @@ var markingInteractionPageHandle = new Handler(
child: MarkingInteractionPage());
});
//我的----营销中心-客户互动及店铺推广
var markingInteractionPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
... ... @@ -3445,8 +3426,6 @@ var customerNoticeSettingPageHandle = new Handler(
child: CustomerNoticeSettingPage());
});
//客户通知配置页
var customerNoticeSettingPageSimHandle = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -3644,8 +3623,6 @@ var smsTemplateSettingPageHandle = new Handler(
smsTemplate: smsTemplate, bookinginfo: bookinginfo));
});
//预订通知短信模版选择
var smsTemplateSettingPageSimHandle = new Handler(
... ... @@ -3659,8 +3636,6 @@ var smsTemplateSettingPageSimHandle = new Handler(
smsTemplate: smsTemplate, bookinginfo: bookinginfo));
});
//优惠券海报
var couponPosterPageHandle = new Handler(
... ...