xt / Flutter-ReserveApp · Commits

Go to a project

Commit 04006d80ef4b9e6e9fbfedc658ecddec9f8bc70c

Authored by wdn127929
1 parent 11629fc1
build: skipped

客情跳转&&转圈显示UI

Inline Side-by-side
Showing 5 changed files with 37 additions and 37 deletions
... ... @@ -20,19 +20,19 @@ if (flutterRoot == null) {
def flutterVersionCode = "555"
def flutterVersionCode = "556"
if (flutterVersionCode == null) {
flutterVersionCode = '555'
flutterVersionCode = '556'
}
def flutterVersionName = "5.5.5"
def flutterVersionName = "5.5.6"
if (flutterVersionName == null) {
flutterVersionName = '5.5.5'
flutterVersionName = '5.5.6'
}
... ...
... ... @@ -52,7 +52,7 @@
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* w .app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "w .app"; sourceTree = BUILT_PRODUCTS_DIR; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
... ... @@ -119,7 +119,7 @@
97C146EF1CF9000F007C117D /* Products */ = {
isa = PBXGroup;
children = (
97C146EE1CF9000F007C117D /* w .app */,
97C146EE1CF9000F007C117D /* Runner.app */,
331C8081294A63A400263BE5 /* RunnerTests.xctest */,
);
name = Products;
... ... @@ -169,7 +169,7 @@
productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
97C146ED1CF9000F007C117D /* w */ = {
97C146ED1CF9000F007C117D /* Runner */ = {
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
... ... @@ -187,9 +187,9 @@
);
dependencies = (
);
name = "Runner";
name = Runner;
productName = Runner;
productReference = 97C146EE1CF9000F007C117D /* w .app */;
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
... ... @@ -225,7 +225,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
97C146ED1CF9000F007C117D /* w */,
97C146ED1CF9000F007C117D /* Runner */,
331C8080294A63A400263BE5 /* RunnerTests */,
);
};
... ... @@ -365,7 +365,7 @@
/* Begin PBXTargetDependency section */
331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 97C146ED1CF9000F007C117D /* w */;
target = 97C146ED1CF9000F007C117D /* Runner */;
targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 555;
CURRENT_PROJECT_VERSION = 5560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -458,7 +458,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.5;
MARKETING_VERSION = 5.5.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 555;
CURRENT_PROJECT_VERSION = 5560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -641,7 +641,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.5;
MARKETING_VERSION = 5.5.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 555;
CURRENT_PROJECT_VERSION = 5560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -667,7 +667,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.5;
MARKETING_VERSION = 5.5.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ...
... ... @@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
FocusNode pnumF = FocusNode();
FocusNode priceF = FocusNode();
// CollectStoreProvider collectStoreProvider;
late CollectStoreProvider collectStoreProvider;
ScrollController controller = ScrollController();
String? reserveType = '普通用餐';
UploadImageProvider? _uploadImageProvider;
... ... @@ -174,7 +174,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
offset: value.toString().length)));
});
// _getSellerUserAccountType();
// getSellerVersion();
getSellerVersion();
// _getReserveTypeField();
_initCancel();
_initdDeposit();
... ... @@ -579,11 +579,11 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
}
}
// getSellerVersion() async {
// await collectStoreProvider.getSellerVersion(context, showLoading: false);
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context, showLoading: false);
// setState(() {});
// }
setState(() {});
}
///初始化时间 半个小时
_initTime(int dateSolt) {
... ... @@ -2928,8 +2928,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
// _onlineCheckEditProvider =
// Provider.of<OnlineCheckEditProvider>(context, listen: true);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
// collectStoreProvider =
// Provider.of<CollectStoreProvider>(context, listen: true);
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
// personnelProvider = Provider.of<PersonnelProvider>(context, listen: true);
print(userModel.user!.role_name);
... ... @@ -4564,10 +4564,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
24,
onPressed:
() {
if (detailModel!
if (collectStoreProvider
.sellerNormalSpecial) {
//标准版
if (detailModel!
if (collectStoreProvider
.sellerPreserve) {
//进入超能版客情
_goCustomerDetail(true);
... ...
... ... @@ -230,7 +230,7 @@ class NoteBookPageState extends State<NoteBookPage> {
currTimeIndex = has ? int.parse(ddateSoltSelect) : 1;
}
}
_getReserveList();
_getReserveList(needLoading: true);
}
initCurruntIndex() {
... ...
... ... @@ -66,20 +66,20 @@ class NotebookDetailModel extends ChangeNotifier {
List<SellerVersionSunModel> sellerVersionList = [];
bool sellerCoupon = false; //优惠券营销
bool sellerRecharge = false; //储值营销
bool sellerWine = false; //存酒
// bool sellerCoupon = false; //优惠券营销
// bool sellerRecharge = false; //储值营销
// bool sellerWine = false; //存酒
bool sellerOrderCustomer = false; //用户提前点餐
bool sellerOrderManager = false; //经理排菜
bool sellerFeast = false; //宴会
// bool sellerFeast = false; //宴会
bool sellerPreserve = false; //客情维护
bool sellerMarketing = false; //客情营销
bool sellerNormal = false; //超能或者标准或高级
bool sellerSimple = false; //极速版
// bool sellerMarketing = false; //客情营销
// bool sellerNormal = false; //超能或者标准或高级
// bool sellerSimple = false; //极速版
bool sellerNormalSpecial = false; //标准版客情和极速版一样
// bool sellerNormalSpecial = false; //标准版客情和极速版一样
String sellerNormalEdate = '';
// String sellerNormalEdate = '';
String smsInfo = '';
String? price = '';
... ...