Commit 433f8f989766cc68fe60f823dee2b2c9a5a9d230

Authored by wdn127929
1 parent 631919f8

channel 5

... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "272"
def flutterVersionCode = "274"
if (flutterVersionCode == null) {
flutterVersionCode = '272'
flutterVersionCode = '274'
}
def flutterVersionName = "2.7.2"
def flutterVersionName = "2.7.4"
if (flutterVersionName == null) {
flutterVersionName = '2.7.2'
flutterVersionName = '2.7.4'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -624,7 +624,7 @@
CURRENT_PROJECT_VERSION = 272;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
... ... @@ -151,6 +151,7 @@ class NoteBookPageState extends State<NoteBookPage> {
if (tabIndex == 1) {
params["account"] = userModel.user.account;
}
model.getReserveList(context, params);
}
... ...
... ... @@ -607,7 +607,8 @@ class EnterModel with ChangeNotifier {
"cusdem": customController.text, //预订人需求:25汉字
"rdate": rdate, //预定用餐时间范围:时间戳 开始时间戳(time)-结束时间戳(time)
"ddate": '$ddate'.substring(0, 10), //到店时间
"ddate_solt": ddateSolt
"ddate_solt": ddateSolt,
"channel":'5'
};
print(params.toString());
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
... ...
... ... @@ -648,7 +648,8 @@ class HomeEnterModel with ChangeNotifier {
'type': "0", //内部预订
"rdate": rdate, //预定用餐时间范围:时间戳 开始时间戳(time)-结束时间戳(time)
"ddate": '${ddate}'.substring(0, 10), //到店时间
'is_set_ddate': '1'
'is_set_ddate': '1',
"channel": '5'
};
print(params);
... ...
... ... @@ -16,7 +16,6 @@ import 'package:one_key/utils/utils.dart';
import 'package:provider/provider.dart';
class NotebookDetailChangeModel with ChangeNotifier {
List dateList = []; //日期选择 月-日 某天
List sunDateList = []; // 早市、午市、晚市
List personNumList = []; // 人数
... ... @@ -37,7 +36,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
bool isRecommend = false; //是否展示推荐
List oldTableList = [];
List<UserHistoryEntity> userHistorys=[];//历史录入
List<UserHistoryEntity> userHistorys = []; //历史录入
clearData() {
dateList = []; //日期选择 月-日 某天
... ... @@ -250,7 +249,8 @@ class NotebookDetailChangeModel with ChangeNotifier {
? dailyMap.putIfAbsent('night', () => '')
: dailyMap.putIfAbsent(
'night', () => _getHourAndMinute(userModel.user.night, 3));
_initSunDateList(userModel.user.morning, userModel.user.noon, userModel.user.night);
_initSunDateList(
userModel.user.morning, userModel.user.noon, userModel.user.night);
}
//根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
... ... @@ -321,7 +321,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
initHourAndMinuteSelect() {
int timeMillsNow = DateTime.now().millisecondsSinceEpoch;
//当前选中 年-月-日
String ymyStr="";
String ymyStr = "";
//今天 明天 其他天
for (var item in dateList) {
if (item['select'] == true) {
... ... @@ -592,7 +592,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
}
}
//当前选中 年-月-日string
String ymyStr="";
String ymyStr = "";
//今天 明天 其他天
for (var item in dateList) {
if (item['select'] == true) {
... ... @@ -657,7 +657,8 @@ class NotebookDetailChangeModel with ChangeNotifier {
'type': "0", //内部预订
"rdate": rdate, //预定用餐时间范围:时间戳 开始时间戳(time)-结束时间戳(time)
"ddate": '${ddate}'.substring(0, 10), //到店时间
'is_set_ddate': "1"
'is_set_ddate': "1",
"channel": '5'
};
if (detailEntity.id.isNotEmpty && detailEntity.id != "-1") {
params['rid'] = detailEntity.id;
... ... @@ -709,7 +710,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
}
}
//当前选中 年-月-日string
String ymyStr="";
String ymyStr = "";
//今天 明天 其他天
for (var item in dateList) {
if (item['select'] == true) {
... ... @@ -805,7 +806,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
getUserHistorys(BuildContext context, Map<String, String> params) async {
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_user,
data: params, showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
});
... ...
... ... @@ -29,6 +29,10 @@ import '../app.dart';
typedef BookTimeSetCallback = void Function(bool needChange);
class Utils {
static String starPhone(phone) {
return phone.replaceFirst(new RegExp(r'\d{4}'), '****', 3);
}
static List<String> stringToList(String str) {
List<String> list = <String>[];
// for (var value in JsonDecoder().convert(str)) {
... ...