Commit 9e428c25de8e99c650d21660bca910e142a6ec81

Authored by wdn127929
1 parent b0cda2c4

删除桌位的时候402code提示“当前桌位有未到店预订,不能被删除

... ... @@ -59,7 +59,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.naji.one_key"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
... ...
... ... @@ -512,7 +512,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5144;
CURRENT_PROJECT_VERSION = 5146;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -658,7 +658,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5144;
CURRENT_PROJECT_VERSION = 5146;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -694,7 +694,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5144;
CURRENT_PROJECT_VERSION = 5146;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -158,10 +158,10 @@ class _BookDepositPageState extends State<BookDepositPage> {
Utils.showToast('请选择支付方式');
return;
}
if (receiptNumberC.text.trim().length == 0) {
Utils.showToast('请输入收据编号');
return;
}
// if (receiptNumberC.text.trim().length == 0) {
// Utils.showToast('请输入收据编号');
// return;
// }
Map<String, String> pramas = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'rid': widget.rid,
... ... @@ -177,8 +177,9 @@ class _BookDepositPageState extends State<BookDepositPage> {
.toString(),
'pay_type': payTypeIndex == null ? null : payType[payTypeIndex],
'pay_no': receiptNumberC.text,
'insert_uid':Provider.of<UserModel>(context,listen: false).user.openid
'pay_no':
receiptNumberC.text.trim().length == 0 ? null : receiptNumberC.text,
'insert_uid': Provider.of<UserModel>(context, listen: false).user.openid
};
print(feastModel.sellerManageList[collectionPIndex].title);
bool success = await detailModel.createReserveDeposit(context, pramas);
... ...
... ... @@ -56,6 +56,7 @@ import '../../provider/store_base_info_provider.dart';
import '../../utils/event_bus.dart';
import '../../utils/screen_util.dart';
import '../feast/feast_page.dart';
// import 'package:sipflutterplugin/sipflutterplugin.dart';
class HomePage extends StatefulWidget {
final int initialIndex; //初始tab
... ...
... ... @@ -154,7 +154,7 @@ class MyTableManageHomeModel with ChangeNotifier {
pageState = PageState.Success;
}
App.sp.setString('table_list', json.encode(tableOuterList));
App.sp.setString('table_list', json.encode(tableOuterList));
return tableOuterList;
}
... ... @@ -575,7 +575,12 @@ class MyTableManageHomeModel with ChangeNotifier {
Utils.showToast(baseResp.msg ?? '删除桌位失败!');
}
} else {
Utils.showToast(baseResp.msg ?? '删除桌位失败!');
if (baseResp.code == 402) {
//有预订
Utils.showToast('当前桌位有未到店预订,不能被删除!');
} else {
Utils.showToast(baseResp.msg ?? '删除桌位失败!');
}
}
return false;
}
... ...
... ... @@ -217,6 +217,8 @@ dependencies:
fijkplayer: ^0.11.0
city_pickers: ^1.1.3
... ...