xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7e7f0a1acccfd63ce65d0c7ce4d76f76558ccd1e

Authored by wdn127929
1 parent 4c457a82
build: skipped

已预订 xxx 订

Inline Side-by-side
Showing 8 changed files with 35 additions and 20 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 = 490;
CURRENT_PROJECT_VERSION = 491;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -656,10 +656,10 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 490;
CURRENT_PROJECT_VERSION = 491;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -692,7 +692,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 490;
CURRENT_PROJECT_VERSION = 491;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -28,12 +28,13 @@ class UserHistoryEntity extends Object with ISuspensionBean {
String pinyinFirst; //首字母
String tagIndex; //abcdefg
String get rnameStr {
if (rname == null || rname == '' || rname == ' ') return "";
if (rname == null || rname == ' ' || rname.replaceAll(' ', '') == '')
return "";
return rname + sexStr;
}
String get sexStr {
if (sex == null || sex == '') return "";
if (sex != '1' && sex != '2' && sex != '3') return "";
switch (sex.toString()) {
case "1": //先生
case "男":
... ...
... ... @@ -710,7 +710,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
detailModel
.userHistorys[
index]
.rname ==
.rnameStr ==
null
? ''
: detailModel
... ...
... ... @@ -2050,7 +2050,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
"1"
? //判断是否在线预订
await _notebookDetailChangeModel
.updateOnlineReserveInfo(context, nameStr)
.updateOnlineReserveInfo(context, nameStr,widget.detailEntity.uid)
: await _notebookDetailChangeModel
.setReserveInfo(context, nameStr,
widget.detailEntity.uid);
... ...
... ... @@ -951,6 +951,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
cusdem: _cusdemController.text);
if (sucess) {
bus.emit("refresh_book_list"); //刷新已预订列表
await _getReserveDetail(showCicle: false);
Navigator.pop(context);
}
... ... @@ -1526,6 +1528,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
pnumC.text);
if (sucess) {
bus.emit(
"refresh_book_list"); //刷新已预订列表
EventBus().emit(
"refresh_tablemanager"); //刷新桌位
await _getReserveDetail(
... ... @@ -1596,9 +1601,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
focusNode: priceF,
),
Offstage(
offstage: detailEntity.place_order_name ==
offstage: detailEntity
.place_order_name ==
'' ||
detailEntity.place_order_name == null,
detailEntity
.place_order_name ==
null,
child: RowMultiText("下单人",
'${detailEntity.place_order_name ?? ''}',
textColor:
... ... @@ -3539,15 +3547,16 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield>
}
/// 修改金额
_updateMoney() {
_updateMoney() async {
removeOverlay();
if (widget.detailModel.prestrTF == null ||
widget.detailModel.prestrTF == "") {
if (widget.detailModel.numController.text.trim().length > 0) {
//修改之前无内容，不弹框
widget.detailModel.prestrTF = widget.detailModel.numController.text;
widget.detailModel.upReserveInfo(context, widget.rid,
await widget.detailModel.upReserveInfo(context, widget.rid,
conAmount: widget.detailModel.prestrTF);
bus.emit("refresh_detail");
}
} else {
//修改之前有内容，则弹框
... ... @@ -3562,11 +3571,12 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield>
? ""
: widget.detailModel.prestrTF;
widget.detailModel.strTF = widget.detailModel.numController.text;
}, rCallback: () {
}, rCallback: () async {
print("确定");
widget.detailModel.prestrTF = widget.detailModel.numController.text;
widget.detailModel.upReserveInfo(context, widget.rid,
await widget.detailModel.upReserveInfo(context, widget.rid,
conAmount: widget.detailModel.prestrTF);
bus.emit("refresh_detail");
});
}
}
... ...
... ... @@ -705,10 +705,12 @@ class NoteBookItemFState extends State<NoteBookItemF>
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(28)),
),
notebook.place_order_name == null
notebook.place_order_name == null ||
notebook.place_order_name == ''
? SizedBox()
: VEmptyView(6),
notebook.place_order_name == null
notebook.place_order_name == null ||
notebook.place_order_name == ''
? SizedBox()
: Text(
notebook.place_order_name + '订',
... ...
... ... @@ -616,7 +616,8 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
],
),
VEmptyView(8),
notebook.place_order_name == null &&
(notebook.place_order_name == null ||
notebook.place_order_name == '') &&
notebook.tid.split(",").length < 2 &&
(notebook.cusdem == null ||
notebook.cusdem == '') &&
... ... @@ -624,7 +625,8 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
? SizedBox()
: Row(
children: [
notebook.place_order_name == null
notebook.place_order_name == null ||
notebook.place_order_name == ''
? SizedBox()
: Padding(
padding: EdgeInsets.only(
... ...
... ... @@ -731,7 +731,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
//更改在线预订
Future<SunReserveInfoModel> updateOnlineReserveInfo(
BuildContext context, String nameStr) async {
BuildContext context, String nameStr,String uid) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
// String pnum = '';
// for (var item in personNumList) {
... ...