xt / Flutter-ReserveApp · Commits

Go to a project

Commit f9c2381aee60ea9d57437f35d5866ed0dbaa7ded

Authored by wdn127929
1 parent ec2c692f
build: skipped

l

Inline Side-by-side
Showing 5 changed files with 51 additions and 34 deletions
... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52697;
CURRENT_PROJECT_VERSION = 52698;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52697;
CURRENT_PROJECT_VERSION = 52698;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52697;
CURRENT_PROJECT_VERSION = 52698;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -90,7 +90,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
String cusmanText = "";
List<Manager> managers = []; //客户经理
// List<Manager> managers = []; //客户经理
Manager manager = Manager();
List cancelReasonList = [];
... ... @@ -171,7 +171,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
};
await remarkManagerModel.getRemarks(context, params,
showPageLoading: true);
managers = await detailModel.getManagers(context);
// managers = await detailModel.getManagers(context);
//添加listener监听
//对应的TextField失去或者获取焦点都会回调此监听
_cancelNode.addListener(() {
... ... @@ -608,17 +608,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
//设置当前客户经理
_setCurrManager() {
manager = managers.firstWhere((manager) => manager.userName == cusmanText,
orElse: () => Manager());
if (manager.id == null || manager.id.toString().isEmpty) return;
Map<String, String> params = {
"rid": detailEntity.id,
"cusman_id": manager.id.toString(),
"cusman": manager.userName
};
detailModel.setReserveCusmnan(context, params);
}
// _setCurrManager() {
// manager = managers.firstWhere((manager) => manager.userName == cusmanText,
// orElse: () => Manager());
// if (manager.id == null || manager.id.toString().isEmpty) return;
// Map<String, String> params = {
// "rid": detailEntity.id,
// "cusman_id": manager.id.toString(),
// "cusman": manager.userName
// };
// detailModel.setReserveCusmnan(context, params);
// }
///处理在线预订
setReserveStatus(String status,
... ... @@ -2331,7 +2331,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
_initCancel();
_getReserveDetail();
_getOrderInfo();
managers = await detailModel.getManagers(context);
// managers = await detailModel.getManagers(context);
},
emptyMsg: "暂时没有预订信息哦",
emptyImg: "empty_search",
... ...
... ... @@ -284,9 +284,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
if (widget.initialIndex == 0 ||
widget.initialIndex == 1 && needRefreshTemp == false) return;
_initNotification();
Future.delayed(Duration(minutes: 5), () {
Future.delayed(Duration(minutes: 3), () {
//30000
ContactModel.getInstance().uploadLocalContact(context);
// ContactModel.getInstance().uploadLocalContact(context);
UserModel usermodel = Provider.of<UserModel>(context, listen: false);
if (needUpdate && !usermodel.downLoading) {
... ...
... ... @@ -280,9 +280,9 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
if (widget.initialIndex == 0 ||
widget.initialIndex == 1 && needRefreshTemp == false) return;
_initNotification();
Future.delayed(Duration(minutes: 5), () {
Future.delayed(Duration(minutes: 3), () {
//30000
ContactModel.getInstance().uploadLocalContact(context);
// ContactModel.getInstance().uploadLocalContact(context);
UserModel usermodel = Provider.of<UserModel>(context, listen: false);
if (needUpdate && !usermodel.downLoading) {
... ...
import 'dart:math';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:one_key/res/colors.dart';
... ... @@ -7,6 +9,16 @@ class Loading {
static void showLoading(BuildContext context) {
if (!isLoading) {
// final mediaQuery = MediaQuery.of(context);
// final size = mediaQuery.size;
// final double width = min(size.width, 400.0) * 0.763;
// final double height = 200;
// final constraint = BoxConstraints(
// minWidth: width,
// minHeight: height,
// maxWidth: size.width,
// maxHeight: double.infinity);
isLoading = true;
showGeneralDialog(
context: context,
... ... @@ -17,19 +29,24 @@ class Loading {
transitionDuration: const Duration(milliseconds: 150),
pageBuilder: (BuildContext context, Animation animation,
Animation secondaryAnimation) {
return Align(
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Container(
width: 200,
height: 200,
color: Colors.transparent,
child: CupertinoActivityIndicator(
color: MyColours.color_000000,
radius: 30,
),
)),
);
return
// Container(
// constraints: constraint,
// child:
Align(
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Container(
width: 200,
height: 200,
color: Colors.transparent,
child: CupertinoActivityIndicator(
color: MyColours.color_000000,
radius: 30,
),
)),
// )
);
}).then((v) {
isLoading = false;
});
... ...