xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6f686dba80a92717b2b1e124fc7519d3245c4e76

Authored by wdn127929
1 parent 558b3e32

姓名、电话配置

Inline Side-by-side
Showing 6 changed files with 153 additions and 96 deletions
... ... @@ -10,6 +10,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/provider/coupon_provider.dart';
import 'package:one_key/provider/marketing_center_provider.dart';
import 'package:one_key/provider/notebook_detail_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
... ... @@ -62,6 +63,8 @@ class _EditReserverPageState extends State<EditReserverPage> {
ScrollController _scrollCrl = ScrollController();
MarketingCenterProvider marketingCenterProvider;
@override
void initState() {
super.initState();
... ... @@ -89,9 +92,14 @@ class _EditReserverPageState extends State<EditReserverPage> {
_addNameSuffix(nameStr, _nameSuffix());
setState(() {});
}
getDzSellerConf();
});
}
getDzSellerConf() async {
await marketingCenterProvider.getDzSellerConf(context);
}
_openAddressBook() async {
if (!(await checkContactPermission())) {
PermissionStatus permissionStatus = await contactPermissionStatus();
... ... @@ -333,6 +341,8 @@ class _EditReserverPageState extends State<EditReserverPage> {
@override
Widget build(BuildContext context) {
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_ffffff,
... ... @@ -415,19 +425,23 @@ class _EditReserverPageState extends State<EditReserverPage> {
.length ==
0 &&
value.length > 0) {
detailModel.userHistorys = [];
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() => detailModel
.getUserHistorys(context, params));
if (marketingCenterProvider.nameSwich) {
detailModel.userHistorys = [];
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
detailModel.getUserHistorys(
context, params));
}
} else {
setState(() {
showPhoneHistory = false;
... ... @@ -529,21 +543,24 @@ class _EditReserverPageState extends State<EditReserverPage> {
}
if (value.isEmpty || value.length > 0) {
detailModel.userHistorys = [];
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
detailModel.getUserHistorys(
context, params));
if (marketingCenterProvider
.phoneSwich) {
detailModel.userHistorys = [];
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
detailModel.getUserHistorys(
context, params));
}
} else {
setState(() {
showPhoneHistory = false;
... ...
... ... @@ -38,6 +38,7 @@ import 'package:one_key/models/table_list.dart' as t;
import 'dart:convert' as convert;
import 'package:easy_contact_picker/easy_contact_picker.dart';
import '../../models/user_history_entity.dart';
import '../../provider/marketing_center_provider.dart';
import '../../utils/call_log_utils.dart';
import '../../utils/common_utils.dart';
import '../../utils/screen_util.dart';
... ... @@ -81,6 +82,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
MyTextSelectionControls();
ScrollController _scrollCrl = ScrollController();
MarketingCenterProvider marketingCenterProvider;
@override
void initState() {
super.initState();
... ... @@ -119,6 +122,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
widget.detailEntity.ddate_solt,
widget.detailEntity.pnum,
widget.detailEntity.tables);
getDzSellerConf();
_initData();
});
}
... ... @@ -130,6 +134,10 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
super.dispose();
}
getDzSellerConf() async {
await marketingCenterProvider.getDzSellerConf(context);
}
_initData() async {
print(widget.detailEntity);
for (var item in widget.detailEntity.tables) {
... ... @@ -1316,6 +1324,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
_notebookDetailChangeModel =
Provider.of<NotebookDetailChangeModel>(context, listen: true);
remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true);
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
int sum = 3;
int hide = 0;
int btnNum = 0;
... ... @@ -1744,21 +1754,24 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
.length ==
0 &&
value.length > 0) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
_notebookDetailChangeModel
.getUserHistorys(
context, params));
if (marketingCenterProvider
.nameSwich) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
_notebookDetailChangeModel
.getUserHistorys(
context, params));
}
} else {
setState(() {
showPhoneHistory = false;
... ... @@ -1887,22 +1900,26 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
if (value.isEmpty ||
value.length > 0) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
_notebookDetailChangeModel
.getUserHistorys(
context, params));
if (marketingCenterProvider
.phoneSwich) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid":
Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() =>
_notebookDetailChangeModel
.getUserHistorys(
context, params));
}
} else {
setState(() {
showPhoneHistory = false;
... ...
... ... @@ -27,6 +27,7 @@ import 'package:one_key/provider/notebook_detail_model.dart';
import 'package:one_key/provider/remark_manager_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/route_handles.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/event_bus.dart';
import 'package:one_key/utils/misc.dart';
... ... @@ -184,6 +185,8 @@ class InvicationPageState extends State<InvicationPage>
String smsContent = '';
MarketingCenterProvider marketingCenterProvider;
@override
void initState() {
super.initState();
... ... @@ -308,20 +311,16 @@ class InvicationPageState extends State<InvicationPage>
bus.on("refresh_photo_invication", (args) {
_getTablesPhoto();
});
bus.on("getDzSellerConf", (args) {
getDzSellerConf();
bus.on("getDzSellerConf", (args) {
getDzSellerConf();
});
// Utils.changeStatusColor(color: Colors.transparent);
user = Provider.of<UserModel>(context, listen: false).user;
}
getDzSellerConf() async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
noticeSms = marketingCenterProvider.dzSellerConfModel.isNotice == '1'
... ... @@ -429,9 +428,8 @@ class InvicationPageState extends State<InvicationPage>
bus.off("refresh_coupon_invitation");
bus.off("refresh_invitaion_info");
bus.off("refresh_photo_invication");
bus.off("getDzSellerConf");
bus.off("getDzSellerConf");
WidgetsBinding.instance.removeObserver(this); //销毁观察者
if (_timer != null) {
_timer.cancel();
... ... @@ -2157,10 +2155,12 @@ class InvicationPageState extends State<InvicationPage>
}
if (value.isEmpty || value.length > 0) {
setState(() {
showPhoneHistory = true;
});
JhCommonUtils.debounce(() => _searchMethod(value));
if (marketingCenterProvider.phoneSwich) {
setState(() {
showPhoneHistory = true;
});
JhCommonUtils.debounce(() => _searchMethod(value));
}
} else {
setState(() {
showPhoneHistory = false;
... ... @@ -2291,19 +2291,22 @@ class InvicationPageState extends State<InvicationPage>
.phoneController.text.length ==
0 &&
value.length > 0) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value.trim(),
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
if (marketingCenterProvider.nameSwich) {
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value.trim(),
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
JhCommonUtils.debounce(() => _baseIndoProvider
.getUserHistorys(context, params));
JhCommonUtils.debounce(() =>
_baseIndoProvider.getUserHistorys(
context, params));
}
} else {
setState(() {
showPhoneHistory = false;
... ... @@ -5220,6 +5223,8 @@ class InvicationPageState extends State<InvicationPage>
_baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
couponProvider = Provider.of<CouponProvider>(context, listen: true);
remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true);
marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: true);
myModel = Provider.of<MyModel>(context, listen: true);
return SafeArea(
child: Scaffold(
... ...
... ... @@ -113,7 +113,7 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> {
_setConfing() async {
List<String> setting =
marketingCenterProvider.dzSellerConfModel.isShowRnamePhone;
marketingCenterProvider.dzSellerConfModel.isShowRnamePhone.toList();
String uid = Provider.of<UserModel>(context, listen: false).user.openid;
marketingCenterProvider.dzSellerConfModel.isShowRnamePhone
... ... @@ -121,7 +121,8 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> {
List subdata = element.split('-');
if (subdata[0] == uid) {
//设置过
setting.remove(element); //如果有,则移除,重新设置
//如果有,则移除,重新设置
setting.remove(element);
}
});
String inputSetting =
... ...
... ... @@ -49,6 +49,8 @@ class MarketingCenterProvider extends ChangeNotifier {
List<SaiYouYunChangeSunModel> saiYouYunchangedData = []; //塞邮云可变模版数据
List<SmsChangeFieldSunModel> smsChangeFieldData = []; // 获取可变模板允许配置字段
bool phoneSwich = true;
bool nameSwich = true;
// 获取赛邮云短信模板列表 (固定模版)
... ... @@ -165,6 +167,17 @@ class MarketingCenterProvider extends ChangeNotifier {
if (baseResp.code == Constant.status_success) {
dzSellerConfModel =
GetDzSellerConfModel.fromJson(baseResp.responseData).data;
if (dzSellerConfModel.isShowRnamePhone.length > 0) {
String uid = Provider.of<UserModel>(context, listen: false).user.openid;
dzSellerConfModel.isShowRnamePhone.forEach((element) {
List subdata = element.split('-');
if (subdata[0] == uid) {
//设置过
phoneSwich = subdata[1] == '1' ? true : false;
nameSwich = subdata[2] == '1' ? true : false;
}
});
}
return true;
} else {
Utils.showToast(baseResp.msg ?? '请求失败,请重试');
... ... @@ -237,7 +250,7 @@ class MarketingCenterProvider extends ChangeNotifier {
});
if (baseResp.code == Constant.status_success) {
// if (baseResp.data == 0 || baseResp.data == 1) {
return true;
return true;
// } else {
// Utils.showToast('配置可变模板内容失败,请重试');
// }
... ...
... ... @@ -346,11 +346,13 @@ var editReserverPageHandle = new Handler(
create: (_) => CouponProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn
//
// uid: uid,
// fromNotify: fromNotify,
))));
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn
//
// uid: uid,
// fromNotify: fromNotify,
)))));
});
// 跳转到处理在线预订
... ... @@ -542,11 +544,13 @@ var noteBookChangeFPageHandle = new Handler(
create: (_) => RemarkManagerModel(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: NoteBookChangeFPage(
detailEntity: detailEntity,
rid: rid,
back: back,
))));
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: NoteBookChangeFPage(
detailEntity: detailEntity,
rid: rid,
back: back,
)))));
});
// 跳转可订时段管理页面
... ...