xt / Flutter-ReserveApp · Commits

Go to a project

Commit 78c935ce5e62087cd57681783c208b2e47b4ffea

Authored by wdn127929
1 parent 7bcbc529
build: skipped

宴会管理修改

Inline Side-by-side
Showing 7 changed files with 178 additions and 156 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "430"
def flutterVersionCode = "423"
if (flutterVersionCode == null) {
flutterVersionCode = '430'
flutterVersionCode = '423'
}
def flutterVersionName = "4.3.0"
def flutterVersionName = "4.2.3"
if (flutterVersionName == null) {
flutterVersionName = '4.3.0'
flutterVersionName = '4.2.3'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -33,9 +33,15 @@ class ClassifySunModel {
String className;
String status;
dynamic cdate;
String isDefault;
ClassifySunModel(
{this.id, this.sid, this.className, this.status, this.cdate});
{this.id,
this.sid,
this.className,
this.status,
this.cdate,
this.isDefault});
ClassifySunModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -43,6 +49,7 @@ class ClassifySunModel {
className = json['class_name'];
status = json['status'];
cdate = json['cdate'];
isDefault = json['is_default'];
}
Map<String, dynamic> toJson() {
... ... @@ -52,6 +59,7 @@ class ClassifySunModel {
data['class_name'] = this.className;
data['status'] = this.status;
data['cdate'] = this.cdate;
data['is_default'] = this.isDefault;
return data;
}
}
... ...
... ... @@ -33,8 +33,10 @@ class GetDepositSunModel {
String dname;
String status;
String cdate;
String isDefault;
GetDepositSunModel({this.id, this.sid, this.dname, this.status, this.cdate});
GetDepositSunModel(
{this.id, this.sid, this.dname, this.status, this.cdate, this.isDefault});
GetDepositSunModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -42,6 +44,7 @@ class GetDepositSunModel {
dname = json['dname'];
status = json['status'];
cdate = json['cdate'];
isDefault = json['is_default'];
}
Map<String, dynamic> toJson() {
... ... @@ -51,6 +54,7 @@ class GetDepositSunModel {
data['dname'] = this.dname;
data['status'] = this.status;
data['cdate'] = this.cdate;
data['is_default'] = this.isDefault;
return data;
}
}
... ...
... ... @@ -2609,50 +2609,50 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
? SizedBox()
: Row(
children: [
detailEntity.order.cookbooklist
.length ==
0
? Expanded(
flex: 1,
child: InkWell(
onTap: () {
NavigatorUtil
.goOrderAdvanceHomePage(
context,
);
},
child: Container(
margin: EdgeInsets.only(
right: ScreenUtil()
.setWidth(20)),
decoration: BoxDecoration(
color: MyColours
.color_ffffff,
border: Border.all(
width: w(1),
color: MyColours
.color_438E93),
borderRadius:
BorderRadius.circular(
ScreenUtil()
.setWidth(
10)),
),
child: Align(
alignment:
Alignment.center,
child: Text('预点菜',
style: TextStyle(
color: MyColours
.color_438E93,
fontSize:
ScreenUtil()
.setSp(
34))),
),
),
))
: SizedBox(),
// detailEntity.order.cookbooklist
// .length ==
// 0
// ? Expanded(
// flex: 1,
// child: InkWell(
// onTap: () {
// NavigatorUtil
// .goOrderAdvanceHomePage(
// context,
// );
// },
// child: Container(
// margin: EdgeInsets.only(
// right: ScreenUtil()
// .setWidth(20)),
// decoration: BoxDecoration(
// color: MyColours
// .color_ffffff,
// border: Border.all(
// width: w(1),
// color: MyColours
// .color_438E93),
// borderRadius:
// BorderRadius.circular(
// ScreenUtil()
// .setWidth(
// 10)),
// ),
// child: Align(
// alignment:
// Alignment.center,
// child: Text('预点菜',
// style: TextStyle(
// color: MyColours
// .color_438E93,
// fontSize:
// ScreenUtil()
// .setSp(
// 34))),
// ),
// ),
// ))
// : SizedBox(),
Expanded(
flex: 2,
child: InkWell(
... ...
... ... @@ -109,50 +109,55 @@ class _FeastDepositTypePageState extends State<FeastDepositTypePage> {
TextStyle(fontSize: font(16), color: MyColours.color_E6000000),
),
Spacer(),
InkWell(
onTap: () {
DialogUtil.textfeildAlertDialog(context,
title: '输入类型名称',
hintText: '请输入',
text: sunModel.dname,
lenghtLimit: true,
toast: '请输入类型名称', rCallback: (name) {
// _addCookbookClass(name, showLoading: true);
_setDeposit(name, did: sunModel.id);
});
},
child: Text(
'修改',
style: TextStyle(
decoration: TextDecoration.underline,
fontSize: font(16),
color: MyColours.color_438E93),
)),
sunModel.isDefault == '1'
? SizedBox()
: InkWell(
onTap: () {
DialogUtil.textfeildAlertDialog(context,
title: '输入类型名称',
hintText: '请输入',
text: sunModel.dname,
lenghtLimit: true,
toast: '请输入类型名称', rCallback: (name) {
// _addCookbookClass(name, showLoading: true);
_setDeposit(name, did: sunModel.id);
});
},
child: Text(
'修改',
style: TextStyle(
decoration: TextDecoration.underline,
fontSize: font(16),
color: MyColours.color_438E93),
)),
HEmptyView(32),
InkWell(
onTap: () {
//已经传到服务器，弹提醒窗口，是否删除
//修改之前有内容，则弹框
DialogUtil.cupertinoAlertDialogFeast(context,
rTitle: '删除',
title: "是否确认删除",
content: sunModel.dname, lCallback: () {
print("取消");
}, rCallback: () async {
print("确定");
Map<String, String> pramas = {'id': sunModel.id};
bool success = await feastModel.delDeposit(context, pramas);
if (success) {
Utils.showToast('删除成功');
_getDeposit(isShowLoading: true);
}
});
},
child: Image.asset(
Utils.getImgPath('f_delete_red'),
width: w(32),
height: w(32),
)),
sunModel.isDefault == '1'
? SizedBox()
: InkWell(
onTap: () {
//已经传到服务器，弹提醒窗口，是否删除
//修改之前有内容，则弹框
DialogUtil.cupertinoAlertDialogFeast(context,
rTitle: '删除',
title: "是否确认删除",
content: sunModel.dname, lCallback: () {
print("取消");
}, rCallback: () async {
print("确定");
Map<String, String> pramas = {'id': sunModel.id};
bool success =
await feastModel.delDeposit(context, pramas);
if (success) {
Utils.showToast('删除成功');
_getDeposit(isShowLoading: true);
}
});
},
child: Image.asset(
Utils.getImgPath('f_delete_red'),
width: w(32),
height: w(32),
)),
HEmptyView(32),
],
),
... ...
... ... @@ -106,52 +106,57 @@ class _FeastTypePageState extends State<FeastTypePage> {
TextStyle(fontSize: font(16), color: MyColours.color_E6000000),
),
Spacer(),
InkWell(
onTap: () {
DialogUtil.textfeildAlertDialog(context,
title: '输入类型名称',
hintText: '请输入',
text: data.className,
lenghtLimit: true,
toast: '请输入类型名称', rCallback: (name) {
_setClassify(name, idstr: data.id);
});
},
child: Text(
'修改',
style: TextStyle(
decoration: TextDecoration.underline,
fontSize: font(16),
color: MyColours.color_438E93),
)),
data.isDefault == '1'
? SizedBox()
: InkWell(
onTap: () {
DialogUtil.textfeildAlertDialog(context,
title: '输入类型名称',
hintText: '请输入',
text: data.className,
lenghtLimit: true,
toast: '请输入类型名称', rCallback: (name) {
_setClassify(name, idstr: data.id);
});
},
child: Text(
'修改',
style: TextStyle(
decoration: TextDecoration.underline,
fontSize: font(16),
color: MyColours.color_438E93),
)),
HEmptyView(32),
InkWell(
onTap: () {
if (index == 0) {
return;
}
DialogUtil.cupertinoAlertDialogFeast(context,
rTitle: '删除',
title: "是否确认删除",
content: data.className, lCallback: () {
print("取消");
}, rCallback: () async {
print("确定");
data.isDefault == '1'
? SizedBox()
: InkWell(
onTap: () {
if (index == 0) {
return;
}
DialogUtil.cupertinoAlertDialogFeast(context,
rTitle: '删除',
title: "是否确认删除",
content: data.className, lCallback: () {
print("取消");
}, rCallback: () async {
print("确定");
Map<String, String> pramas = {'id': data.id};
bool success = await feastModel.delClassify(context, pramas);
if (success) {
Utils.showToast('删除成功');
_getClassify(isShowLoading: true);
}
});
},
child: Image.asset(
Utils.getImgPath(
index == 0 ? 'f_delete_red_un' : 'f_delete_red'),
width: w(32),
height: w(32),
)),
Map<String, String> pramas = {'id': data.id};
bool success =
await feastModel.delClassify(context, pramas);
if (success) {
Utils.showToast('删除成功');
_getClassify(isShowLoading: true);
}
});
},
child: Image.asset(
Utils.getImgPath(
index == 0 ? 'f_delete_red_un' : 'f_delete_red'),
width: w(32),
height: w(32),
)),
HEmptyView(32),
],
),
... ...
... ... @@ -649,25 +649,25 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
Utils.getImgPath('cybz'), '常用备注')),
],
),
VEmptyView(68),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
InkWell(
onTap: () {
NavigatorUtil.goMyPlanDishHomePage(
context);
},
child: _item(
Utils.getImgPath('cdgl'), '我的排菜')),
InkWell(
onTap: () {}, child: _item('', '空空空空')),
InkWell(
onTap: () {}, child: _item('', '空空空空')),
InkWell(
onTap: () {}, child: _item('', '空空空空')),
])
// VEmptyView(68),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.spaceEvenly,
// children: [
// InkWell(
// onTap: () {
// NavigatorUtil.goMyPlanDishHomePage(
// context);
// },
// child: _item(
// Utils.getImgPath('cdgl'), '我的排菜')),
// InkWell(
// onTap: () {}, child: _item('', '空空空空')),
// InkWell(
// onTap: () {}, child: _item('', '空空空空')),
// InkWell(
// onTap: () {}, child: _item('', '空空空空')),
// ])
]),
)),
VEmptyView(20),
... ...