xt / Flutter-ReserveApp · Commits

Go to a project

Commit f49a09959d41d23ba27798d2cb1b08159dc37d3c

Authored by wdn127929
1 parent ce2b4458
build: skipped

提测

Inline Side-by-side
Showing 13 changed files with 149 additions and 26 deletions
... ... @@ -20,6 +20,9 @@
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<application
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -550,7 +550,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5200;
CURRENT_PROJECT_VERSION = 5204;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -560,10 +560,7 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -701,7 +698,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5200;
CURRENT_PROJECT_VERSION = 5204;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -711,10 +708,7 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -740,7 +734,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5200;
CURRENT_PROJECT_VERSION = 5204;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -750,10 +744,7 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
... ... @@ -124,7 +124,7 @@ class ListData extends Object {
return "待确认";
break;
case "1":
return "已定座";
return "已订座";
break;
case "2":
return "已到店";
... ...
... ... @@ -37,7 +37,7 @@ class Notebook {
String is_set_ddate;
String topic;
String ddate_solt;
String status; //订单状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单,10表示宴会
String status; //订单状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单,10表示宴会
String cause;
String abolition;
String action;
... ... @@ -142,7 +142,7 @@ class Notebook {
type = reserveRecheckType.last.typeShow;
}
switch (status) {
//订单状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订
//订单状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订
case "1":
return type ?? "";
case "2":
... ...
... ... @@ -87,7 +87,7 @@ class NotebookDetail {
String ddate;
String is_set_ddate;
String ddate_solt;
String status = "0"; //订单状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
String status = "0"; //订单状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
String action;
String type; //0 内部订单 1 在线预订
String note_name;
... ...
class ReserveActionLogModol {
int ret;
List<ReserveActionLogSunModol> data;
String msg;
ReserveActionLogModol({this.ret, this.data, this.msg});
ReserveActionLogModol.fromJson(Map<String, dynamic> json) {
ret = json['ret'];
if (json['data'] != null) {
data = <ReserveActionLogSunModol>[];
json['data'].forEach((v) {
data.add(new ReserveActionLogSunModol.fromJson(v));
});
}
msg = json['msg'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ret'] = this.ret;
if (this.data != null) {
data['data'] = this.data.map((v) => v.toJson()).toList();
}
data['msg'] = this.msg;
return data;
}
}
class ReserveActionLogSunModol {
String content;
String upDate;
String nick_name;
ReserveActionLogSunModol({this.content, this.upDate, this.nick_name});
ReserveActionLogSunModol.fromJson(Map<String, dynamic> json) {
content = json['content'];
upDate = json['up_date'];
nick_name = json['nick_name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['content'] = this.content;
data['up_date'] = this.upDate;
data['nick_name'] = this.nick_name;
return data;
}
}
... ...
... ... @@ -21,7 +21,7 @@ class Table {
dynamic isExitsClass; //表示这个桌子已经关联到包间分类了 null是没有
String max; //最多可做人数
String low; //最低消费
String sign; //标签 桌位状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
String reserver; //订餐人
String notebookId; //桌位对应的预订id
bool selected; //是否选中
... ...
... ... @@ -114,7 +114,7 @@ class TableList extends Object {
// String notebookId; //桌位对应的预订id
bool selected = false; //是否选中
// String max; //最多可做人数
String sign; //标签 桌位状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
// String get maxText {
// if (max == null || max == "0" || max == "null") {
... ... @@ -178,7 +178,8 @@ class TableList extends Object {
this.enable,
this.spell,
this.cdate,
this.rname,this.regionName);
this.rname,
this.regionName);
factory TableList.fromJson(Map<String, dynamic> srcJson) =>
_$TableListFromJson(srcJson);
... ...
... ... @@ -509,4 +509,9 @@ class HttpUrl {
static const String sort_by_table =
"?service=App.Tables.SortByTable"; // 区域内桌位排序
static const String get_reserve_action_log =
"?service=Android.Reserve.GetReserveActionLog"; // 获取预订操作记录
}
... ...
... ... @@ -2422,6 +2422,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
replace: true);
}
EventBus().emit("refresh_tablemanager"); //刷新桌位
EventBus().emit("refresh_detail"); //刷新订座详情页
EventBus().emit("refresh_action_log"); //获取变更记录
} else {
Utils.showToast(widget.detailEntity.id == "-1"
? "录入预订订单失败，请重试！"
... ...
... ... @@ -53,6 +53,7 @@ import '../../app.dart';
import '../../models/customer_by_seller_model.dart';
import '../../models/customer_list_model.dart';
import '../../models/reserveA_action_log_modol.dart';
import '../../models/reserve_deposit_model.dart';
import '../../provider/collect_store_provider.dart';
import '../../utils/screen_util.dart';
... ... @@ -141,6 +142,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
_getReserveTypeField();
_initCancel();
_initdDeposit();
_getReserveActionLog();
_getReserveDetail();
_getOrderInfo();
_getReserveDepositByRid();
... ... @@ -200,6 +202,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
bus.on("refresh_detail_reserve_recheck", (args) {
_getReserveRecheckByRid(); //获取核餐记录
});
bus.on("refresh_action_log", (args) {
_getReserveActionLog(); //获取变更记录
});
});
}
... ... @@ -450,6 +455,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
bus.off("refresh_detail");
bus.off("refresh_detail_deposit");
bus.off("refresh_detail_reserve_recheck");
bus.off("refresh_action_log");
}
///获取订单详情
... ... @@ -462,6 +470,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
///订座详情
_getReserveActionLog({bool showCicle = false}) async {
await detailModel.getReserveActionLog(
context,
{
"rid": widget.rid,
},
showCircle: showCicle);
}
///订座详情
_getReserveDetail({bool showCicle = false}) async {
detailEntity = await detailModel.getReserveDetail(
context,
... ... @@ -1866,9 +1884,37 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
TextStyle(color: MyColours.color_999999, fontSize: font(14)),
),
])),
// if (detailModel.reserveActionLogData.length > 0)
ListView.builder(
itemCount: detailModel.reserveActionLogData.length,
shrinkWrap: true,
controller: controller,
itemBuilder: (context, index) {
ReserveActionLogSunModol data =
detailModel.reserveActionLogData[index];
return Container(
padding: EdgeInsets.only(left: w(13), top: w(20)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'变更预订',
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151, fontSize: font(14)),
),
Text(
'${data.nick_name ?? ''} ${data.upDate}',
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_999999, fontSize: font(14)),
),
]));
}),
if (detailEntity.up_date != null)
Container(
padding: EdgeInsets.only(left: w(13), top: w(10)),
padding: EdgeInsets.only(left: w(13), top: w(20)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
... ...
... ... @@ -270,7 +270,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
if (widget.initialIndex == 0 ||
widget.initialIndex == 1 && needRefreshTemp == false) return;
_initNotification();
Future.delayed(Duration(minutes: 3), () {
Future.delayed(Duration(minutes: 5), () {
//30000
ContactModel.getInstance().uploadLocalContact(context);
UserModel usermodel = Provider.of<UserModel>(context, listen: false);
... ... @@ -1412,7 +1412,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// if (widget.initialIndex == 1 && needRefreshTemp == false) {
// } else {
// _clearBadge(() {
// _getAllUnMessages();
// _getAllUnMessages();
// });
// }
... ...
... ... @@ -18,6 +18,7 @@ import 'package:provider/provider.dart';
import '../models/get_reserve_type_field_model.dart';
import '../models/notebook.dart';
import '../models/reserveA_action_log_modol.dart';
import '../models/reserve_deposit_model.dart';
import '../models/reserve_recheck_model.dart';
import '../models/user.dart';
... ... @@ -39,6 +40,8 @@ class NotebookDetailModel extends ChangeNotifier {
List<GetReserveTypeFieldsSunModel> reserveTypes = []; //用餐类型
List<ReserveActionLogSunModol> reserveActionLogData = []; // 获取预订操作记录
NotebookDetailModel() {
initSexList();
}
... ... @@ -84,6 +87,26 @@ class NotebookDetailModel extends ChangeNotifier {
}
}
/// 获取预订操作记录
getReserveActionLog(BuildContext context, Map<String, String> params,
{bool showCircle = false}) async {
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_action_log,
data: params, showLoading: showCircle)
.catchError((error) {
print(error.toString());
});
if (baseResp.code == Constant.status_success) {
reserveActionLogData =
ReserveActionLogModol.fromJson(baseResp.responseData).data;
} else {
if (baseResp != null) {
Utils.showToast(baseResp.msg ?? "");
}
}
notifyListeners();
}
/// 通过预订ID查收定金详情
getReserveDepositByRid(
BuildContext context, Map<String, String> params) async {
... ...