xt / Flutter-ReserveApp · Commits

Go to a project

Commit e1bd456d9bdeb9788199a45f67456fe93b13f8bc

Authored by wdn127929
1 parent 42724802
build: skipped

录入预订人信息页面bug

Inline Side-by-side
Showing 17 changed files with 161 additions and 55 deletions
... ... @@ -494,7 +494,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.4;
MARKETING_VERSION = 3.1.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -639,7 +639,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.4;
MARKETING_VERSION = 3.1.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -674,7 +674,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.4;
MARKETING_VERSION = 3.1.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -20,8 +20,11 @@ import 'package:provider/provider.dart';
*/
class EditReserverPage extends StatefulWidget {
final String rid;
final String name;
final String sex;
final bool needBtn;
EditReserverPage(this.rid, {Key key, this.needBtn}) : super(key: key);
EditReserverPage(this.rid, this.name, this.sex, {Key key, this.needBtn})
: super(key: key);
@override
_EditReserverPageState createState() => _EditReserverPageState();
... ... @@ -35,6 +38,27 @@ class _EditReserverPageState extends State<EditReserverPage> {
bool showPhoneHistory = false; //显示客户历史记录
EasyContactPicker _contactPicker = EasyContactPicker();
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.name != '' &&
widget.name != null &&
widget.sex != '' &&
widget.sex != null) {
nameStr = widget.name;
for (var item in detailModel.sexList) {
item['select'] = false;
if (item['code'] == widget.sex) {
item['select'] = true;
}
}
_addNameSuffix(nameStr, _nameSuffix());
setState(() {});
}
});
}
_openAddressBook() async {
if (!(await checkContactPermission())) {
PermissionStatus permissionStatus = await contactPermissionStatus();
... ... @@ -202,7 +226,10 @@ class _EditReserverPageState extends State<EditReserverPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
// border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
),
onChanged: (value) {
print('ggg');
... ... @@ -262,6 +289,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
child: Container(
height: ScreenUtil().setWidth(60),
decoration: BoxDecoration(
// color: Colors.red,
border: Border(
bottom: BorderSide(
width: ScreenUtil().setWidth(2),
... ... @@ -282,9 +310,9 @@ class _EditReserverPageState extends State<EditReserverPage> {
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(30),
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
),
onChanged: (value) {
if (value.isEmpty ||
... ...
... ... @@ -722,7 +722,9 @@
// ),
// // contentPadding:
// // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
// border: InputBorder.none,
// contentPadding: EdgeInsets.zero,
// border: OutlineInputBorder(
// borderSide: BorderSide.none),
// ),
// onChanged: (value) {
// print(value);
... ... @@ -1438,7 +1440,7 @@
// color: isSelect ? Colors.white : MyColours.color_353535,
// fontSize: ScreenUtil().setSp(28)),
// ),
// ),
// );
// }
... ...
... ... @@ -579,7 +579,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
print('ggg');
... ... @@ -639,7 +640,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
LogUtil.v("value:$value");
... ... @@ -705,7 +707,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border:
OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
print(value);
... ... @@ -1551,7 +1555,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding:
EdgeInsets.zero,
border: OutlineInputBorder(
borderSide:
BorderSide.none),
),
onChanged: (value) {
print('ggg');
... ... @@ -1653,7 +1661,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding:
EdgeInsets.zero,
border: OutlineInputBorder(
borderSide:
BorderSide.none),
),
onChanged: (value) {
LogUtil.v("value:$value");
... ... @@ -1776,8 +1788,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
color: MyColours.color_979797,
fontSize: ScreenUtil().setSp(28),
),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
),
keyboardType: TextInputType.text,
onChanged: (value) {
... ... @@ -2051,6 +2064,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
Utils.showToast("请选择桌位");
return;
}
if (_notebookDetailChangeModel.phoneController.text
.trim()
.length >
0) {
if (!Utils.phoneRegExp(
_notebookDetailChangeModel.phoneController.text)) {
Utils.showToast('手机号错误，请修改正确');
return;
}
}
SunReserveInfoModel _model =
_notebookDetailChangeModel.detailEntity.type == "1"
? //判断是否在线预订
... ... @@ -2106,6 +2130,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
ddate_solt,
_model.row.phone,
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
tid: _tid,
replace: true);
EventBus().emit("refresh_tablemanager"); //刷新桌位
... ...
... ... @@ -767,8 +767,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
color: MyColours.color_979797,
fontSize: ScreenUtil().setSp(28),
),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border:
OutlineInputBorder(borderSide: BorderSide.none),
),
keyboardType: TextInputType.text,
onChanged: (value) {
... ... @@ -2089,6 +2090,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
context,
widget
.rid,
'',
'',
needBtn:
false);
},
... ... @@ -2527,6 +2530,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
detailEntity.phone,
detailEntity
.ddate_solt,
detailEntity.rname ==
null
? ''
: detailEntity
.rname,
detailEntity.sex ==
null
? ''
: detailEntity
.sex,
tid: _tid);
},
child: Container(
... ...
... ... @@ -424,7 +424,8 @@ class _EnterPageState extends State<EnterPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ... @@ -480,7 +481,8 @@ class _EnterPageState extends State<EnterPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ... @@ -531,7 +533,8 @@ class _EnterPageState extends State<EnterPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ... @@ -793,6 +796,8 @@ class _EnterPageState extends State<EnterPage> {
ddate_solt,
_model.row.phone,
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
tid: _tid,
replace: true);
} else {
... ...
... ... @@ -270,7 +270,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
print('ggg');
... ... @@ -335,7 +336,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
LogUtil.v("value:$value");
... ... @@ -415,7 +417,9 @@ class _HomeEnterPageState extends State<HomeEnterPage>
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border:
OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
print(value);
... ... @@ -1423,6 +1427,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
ddate_solt,
_model.row.phone,
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
tid: _tid,
replace: false);
//今天 明天 其他天
... ...
... ... @@ -34,9 +34,11 @@ class InvicationPage extends StatefulWidget {
final String phone;
final String dateSolt;
final String tid;
final String name;
final String sex;
InvicationPage(this.rid, this.tableInfo, this.ddate, this.ddateStr,
this.phone, this.dateSolt, this.tid);
this.phone, this.dateSolt, this.tid, this.name, this.sex);
@override
State<StatefulWidget> createState() {
... ... @@ -941,7 +943,10 @@ class InvicationPageState extends State<InvicationPage> {
//跳转到录入联系人页面
String temp =
await NavigatorUtil.goEditReserverPage(
context, widget.rid,
context,
widget.rid,
widget.name,
widget.sex,
needBtn: true);
if (temp != null) {
reserverPhone = temp;
... ... @@ -952,7 +957,10 @@ class InvicationPageState extends State<InvicationPage> {
//跳转到录入联系人页面
String temp =
await NavigatorUtil.goEditReserverPage(
context, widget.rid,
context,
widget.rid,
widget.name,
widget.sex,
needBtn: true);
if (temp != null) {
reserverPhone = temp;
... ...
... ... @@ -144,12 +144,14 @@ class _BindingPhoneState extends State<BindingPhone> {
hintStyle: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(26)),
border: InputBorder.none,
contentPadding: EdgeInsets.fromLTRB(
0,
ScreenUtil().setWidth(28),
ScreenUtil().setWidth(30),
ScreenUtil().setWidth(28)),
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
// contentPadding: EdgeInsets.fromLTRB(
// 0,
// ScreenUtil().setWidth(28),
// ScreenUtil().setWidth(30),
// ScreenUtil().setWidth(28)),
),
onChanged: (value) {
phone = value;
... ... @@ -200,12 +202,14 @@ class _BindingPhoneState extends State<BindingPhone> {
hintStyle: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(26)),
border: InputBorder.none,
contentPadding: EdgeInsets.fromLTRB(
0,
ScreenUtil().setWidth(28),
ScreenUtil().setWidth(30),
ScreenUtil().setWidth(28)),
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
// contentPadding: EdgeInsets.fromLTRB(
// 0,
// ScreenUtil().setWidth(28),
// ScreenUtil().setWidth(30),
// ScreenUtil().setWidth(28)),
),
onChanged: (value) {
code = value;
... ...
... ... @@ -85,7 +85,7 @@ class _ContactListPageState extends State<ContactListPage>
// textAlignVertical: TextAlignVertical.center,
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
right: ScreenUtil().setWidth(70 * 2)),
right: ScreenUtil().setWidth(40 * 2)),
hintText: "搜索联系人",
hintStyle: TextStyle(
color: MyColours.color_999999,
... ... @@ -93,7 +93,8 @@ class _ContactListPageState extends State<ContactListPage>
),
isCollapsed:
true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
border: InputBorder.none,
border: OutlineInputBorder(
borderSide: BorderSide.none),
// 左边图标设置
icon: Image.asset(
Utils.getImgPath('search'),
... ...
... ... @@ -31,6 +31,8 @@ class NotebookItemState extends State<NoteBookItem> {
widget.notebook.ddateStr,
widget.notebook.phone,
widget.notebook.ddate_solt,
widget.notebook.rname == null ? '' : widget.notebook.rname,
widget.notebook.sex == null ? '' : widget.notebook.sex,
tid: widget.notebook.tid);
}
}
... ...
... ... @@ -305,9 +305,8 @@ class _StatisticsPageState extends State<StatisticsPage> {
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(26),
),
contentPadding: EdgeInsets.zero, //ios 17
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ...
... ... @@ -155,8 +155,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
fontSize: ScreenUtil().setSp(32),
),
contentPadding: EdgeInsets.zero, //ios 17
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ... @@ -257,9 +258,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
fontSize:
ScreenUtil().setSp(32),
),
contentPadding:
EdgeInsets.zero, //ios 17
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none),
),
onChanged: (value) {},
onEditingComplete: () {
... ...
... ... @@ -371,7 +371,9 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
),
// contentPadding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
contentPadding: EdgeInsets.zero,
border:
OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
print(value);
... ...
... ... @@ -667,6 +667,8 @@ class TableManagerPageState extends State<TableManagerPage> {
ddate_solt,
_model.row.phone,
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
tid: _tid,
replace: false);
// //今天 明天 其他天
... ...
... ... @@ -117,10 +117,12 @@ class NavigatorUtil {
String ddateStr,
String phone,
String ddate_solt,
String name,
String sex,
{bool replace = false,
String tid}) {
_navigateTo(context,
"${Routes.invication}?rid=$rid&tid=$tid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt",
"${Routes.invication}?rid=$rid&tid=$tid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt&name=${Uri.encodeComponent(name)}&sex=$sex",
replace: replace);
}
... ... @@ -503,10 +505,11 @@ class NavigatorUtil {
}
/// 填写预订联系人页面
static Future<dynamic> goEditReserverPage(BuildContext context, String rid,
static Future<dynamic> goEditReserverPage(
BuildContext context, String rid, String name,String sex,
{replace = false, bool needBtn = false}) {
return _navigateTo(
context, "${Routes.edit_reserver_page}?rid=${rid}&needBtn=$needBtn",
return _navigateTo(context,
"${Routes.edit_reserver_page}?rid=${rid}&needBtn=$needBtn&name=${Uri.encodeComponent(name)}&sex=$sex",
replace: replace);
}
}
... ...
... ... @@ -137,12 +137,14 @@ var editReserverPageHandle = new Handler(
String rid = params['rid'].first;
// String mid = params['mid'].first;
// String uid = params['uid'].first;
String name = params["name"].first;
String sex = params["sex"].first;
bool needBtn = FluroConvertUtils.string2bool(params["needBtn"].first);
return ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
child: ChangeNotifierProvider<CouponProvider>(
create: (_) => CouponProvider(),
child: EditReserverPage(rid, needBtn: needBtn
child: EditReserverPage(rid, name, sex, needBtn: needBtn
// mid: mid,
// uid: uid,
// fromNotify: fromNotify,
... ... @@ -254,10 +256,12 @@ var handleInvicationHandler = new Handler(
String phone = params["phone"].first;
String ddate_solt = params["ddate_solt"].first;
String tid = params["tid"].first;
String name = params["name"].first;
String sex = params["sex"].first;
return ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: InvicationPage(
rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid));
rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid, name, sex));
});
// 发短信
... ...