xt / Flutter-ReserveApp · Commits

Go to a project

Commit f8b01d8e48d10b73ca6f3e94dafcab43bc5dc772

Authored by wdn127929
1 parent e1fe13f6
build: skipped

极速版OK

Inline Side-by-side
Showing 13 changed files with 572 additions and 282 deletions
... ... @@ -26,6 +26,7 @@ class User {
String edate; //店铺过期日期
String tokenLoginOut; //信鸽token
String sellerVersion; //版本
User(
this.openid,
... ... @@ -48,7 +49,8 @@ class User {
this.token,
this.nickName,
this.edate,
this.tokenLoginOut);
this.tokenLoginOut,
this.sellerVersion);
factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
... ... @@ -56,6 +58,6 @@ class User {
@override
String toString() {
return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,userphoneMyPage:$userphoneMyPage,token:$token,nickName:$nickName,edate:$edate},tokenLoginOut:$tokenLoginOut}';
return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,userphoneMyPage:$userphoneMyPage,token:$token,nickName:$nickName,edate:$edate,tokenLoginOut:$tokenLoginOut,sellerVersion:$sellerVersion}';
}
}
... ...
... ... @@ -28,7 +28,9 @@ User _$UserFromJson(Map<String, dynamic> json) {
json['token'] as String,
json['nickname'] as String,
json['edate'] as String,
json['tokenLoginOut'] as String
json['tokenLoginOut'] as String,
json['sellerVersion'] as String,
);
}
... ... @@ -53,5 +55,6 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
'token': instance.token,
'nickname': instance.nickName,
'edate': instance.edate,
'tokenLoginOut':instance.tokenLoginOut
'tokenLoginOut':instance.tokenLoginOut,
'sellerVersion':instance.sellerVersion
};
... ...
... ... @@ -299,56 +299,63 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
} else {
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
//获取到店铺过期时间
//店铺过期提醒
// 计算时间差
//店铺过期日期
List<SellerVersionSunModel> showData = [];
// App.sp.remove('sellerEdateModule');
if (App.sp.containsKey('sellerEdateModule')) {
dataSp = json.decode(App.sp.getString('sellerEdateModule'));
}
collectStoreProvider.sellerVersionList.forEach((element) {
_edateSellerModuleShow(showData, element, dataSp);
});
print(showData);
print(dataSp);
if (dataSp.length > 0) {
App.sp.setString("sellerEdateModule", json.encode(dataSp));
// var data = json.decode(App.sp.getString('sellerEdateModule'));
// var str = App.sp.getString('sellerEdateModule');
// print(str);
// print(data);
}
//店铺过期提醒
// 计算时间差
//店铺过期日期
List<SellerVersionSunModel> showData = [];
// App.sp.remove('sellerEdateModule');
if (App.sp.containsKey('sellerEdateModule')) {
dataSp = json.decode(App.sp.getString('sellerEdateModule'));
}
if (showData != null && showData.length > 0) {
DialogUtil.showSellerVersionEdateDialog(context, showData, (object) {});
}
//通过showdata 弹窗
collectStoreProvider.sellerVersionList.forEach((element) {
_edateSellerModuleShow(showData, element, dataSp);
});
print(showData);
print(dataSp);
if (dataSp.length > 0) {
App.sp.setString("sellerEdateModule", json.encode(dataSp));
// var data = json.decode(App.sp.getString('sellerEdateModule'));
// var str = App.sp.getString('sellerEdateModule');
// print(str);
// print(data);
}
// timerSellerModuleEdate = Timer.periodic(Duration(days: 1), (_) {
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// _edateShow();
// });
return true;
} else {
if (_currIndex != 4) {
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
//已经弹过过期弹窗,默认我的
_currIndex = 4;
if (showData != null && showData.length > 0) {
DialogUtil.showSellerVersionEdateDialog(
context, showData, (object) {});
}
//通过showdata 弹窗
// timerSellerModuleEdate = Timer.periodic(Duration(days: 1), (_) {
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// _edateShow();
// });
return true;
} else {
if (_currIndex != 4) {
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
//已经弹过过期弹窗,默认我的
_currIndex = 4;
}
}
NavigatorUtil.goHomePage(context, initialIndex: _currIndex);
}
NavigatorUtil.goHomePage(context, initialIndex: _currIndex);
}
return false;
return false;
}
}
}
... ...
... ... @@ -143,7 +143,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
if (App.sp.getBool("isLogin") ?? false) {
Future.delayed(Duration(milliseconds: 200), () {
// NavigatorUtil.goHomePage(context);
if (Constant.simpleApp) {
//获取登陆接口返回的vid 如果是14 极速版，则跳转至极速版
// if (user['sellerVersion'] == '14') {
if (Provider.of<UserModel>(context,listen: false).user.sellerVersion == '14') {
NavigatorUtil.goHomePageSim(context);
} else {
NavigatorUtil.goHomePage(context);
... ...
... ... @@ -177,7 +177,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'year': DateTime.now().year.toString(),
'month': DateTime.now().month.toString(),
'uid': Provider.of<UserModel>(context ,listen: false).user.openid
'uid': Provider.of<UserModel>(context, listen: false).user.openid
};
await customerProvider.getSellerCountsListByMonth(context, params,
... ... @@ -231,40 +231,47 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerNormal) {
if (collectStoreProvider.sellerNormalEdate != null) {
//店铺过期提醒
// 计算时间差
//店铺过期日期
edate = DateTime.fromMillisecondsSinceEpoch(
int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
String from =
DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
' 00:00:00';
DateTime datenow = DateUtil.getDateTime(from);
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
NavigatorUtil.goHomePageSim(context, initialIndex: 3); //跳转到极速版 我的 页面
} else {
if (collectStoreProvider.sellerNormal) {
if (collectStoreProvider.sellerNormalEdate != null) {
//店铺过期提醒
// 计算时间差
//店铺过期日期
edate = DateTime.fromMillisecondsSinceEpoch(
int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
//比较相差的天数
int difference = edate.difference(datenow).inDays;
String from =
DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
' 00:00:00';
DateTime datenow = DateUtil.getDateTime(from);
int differenceSeconds = edate.difference(datenow).inSeconds;
//比较相差的天数
int difference = edate.difference(datenow).inDays;
if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
//过期
outDay = '0';
int differenceSeconds = edate.difference(datenow).inSeconds;
if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
//过期
outDay = '0';
} else {
outDay = difference.toString();
}
// print(outDay);
} else {
outDay = difference.toString();
outDay = '0';
}
// print(outDay);
setState(() {});
} else {
outDay = '0';
}
setState(() {});
} else {
outDay = '0';
}
setState(() {});
}
Widget _item(String name, String title, {bool isRowLow = false}) {
... ...
... ... @@ -162,6 +162,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
if (!Utils.getAuthority(context, '桌位')) {
_currIndex = 1;
}
// if (App.sp.getBool("sellerEdate") ?? false) {
// //已经弹过过期弹窗,默认我的
// _currIndex = 3;
// }
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
... ... @@ -300,8 +305,7 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
if (collectStoreProvider.sellerSimple) {
//获取到店铺过期时间
//店铺过期提醒
// 计算时间差
... ... @@ -313,7 +317,9 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
}
collectStoreProvider.sellerVersionList.forEach((element) {
_edateSellerModuleShow(showData, element, dataSp);
if (element.vid == '14') {
_edateSellerModuleShow(showData, element, dataSp);
}
});
print(showData);
print(dataSp);
... ... @@ -353,6 +359,84 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
}
}
// getSellerVersion() async {
// await collectStoreProvider.getSellerVersion(context);
// if (collectStoreProvider.sellerSimple) {
// //极速版，处理过期逻辑
// //获取到店铺过期时间
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// List<SellerVersionSunModel> temp = collectStoreProvider.sellerVersionList
// .where((element) => element.vid == '14')
// .toList();
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// DateTime edate =
// DateTime.fromMillisecondsSinceEpoch(int.parse(temp[0].edate) * 1000);
// //当前日期
// final datenow = DateTime.now();
// //比较相差的天数
// int difference = edate.difference(datenow).inDays;
// int differenceSeconds = edate.difference(datenow).inSeconds;
// if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
// //已到期
// // _showSellerAlert('-1', edate);
// //提示到期
// App.sp.setBool("sellerEdate", true);
// DialogUtil.cupertinoAlertSellerHasEdateDialogSim(
// context,
// title: '温馨提示',
// isBold: true,
// lCallback: () {
// NavigatorUtil.goHomePageSim(context, initialIndex: 3);
// },
// rCallback: () {
// //立即续费
// },
// );
// }
// return true;
// } else {
// if (collectStoreProvider.sellerVersionList != null &&
// collectStoreProvider.sellerVersionList.length > 0) {
// App.sp.remove('sellerEdate');
// NavigatorUtil.goHomePage(context); //跳转至正常版本
// } else {
// //过期提醒
// if (_currIndex != 3) {
// App.sp.setBool("sellerEdate", true);
// DialogUtil.cupertinoAlertSellerHasEdateDialogSim(
// context,
// title: '温馨提示',
// isBold: true,
// lCallback: () {
// NavigatorUtil.goHomePageSim(context, initialIndex: 3);
// },
// rCallback: () {
// //立即续费
// },
// );
// }
// return false;
// }
// }
// }
_getTableList() async {
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context, listen: false);
... ... @@ -618,72 +702,72 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
}
}
_showSellerAlert(String day, DateTime edate) {
if (App.sp.containsKey('sellerEdate')) {
//已经存进去过数据
List<String> data = App.sp.getStringList('sellerEdate');
if (!data.contains(day)) {
data.add(day);
App.sp.setStringList("sellerEdate", data);
//过期差ji天，提醒一次s
if (day == '-1') {
DialogUtil.cupertinoAlertSellerHasEdateDialog(
context,
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil.goHomePageSim(context, initialIndex: 3);
},
rCallback: () {
//立即续费
},
);
} else {
DialogUtil.cupertinoAlertSellerEdateDialog(
context,
title: '温馨提示',
isBold: true,
content: DateUtil.formatDate(
edate,
format: DateFormats.full,
),
rCallback: () {
//立即续费
},
);
}
}
} else {
App.sp.setStringList("sellerEdate", [day]);
//过期差ji天，提醒一次s
if (day == '-1') {
DialogUtil.cupertinoAlertSellerHasEdateDialog(
context,
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil.goHomePageSim(context, initialIndex: 3);
},
rCallback: () {
//立即续费
},
);
} else {
DialogUtil.cupertinoAlertSellerEdateDialog(
context,
title: '温馨提示',
isBold: true,
content: DateUtil.formatDate(
edate,
format: DateFormats.full,
),
rCallback: () {
//立即续费
},
);
}
}
}
// _showSellerAlert(String day, DateTime edate) {
// if (App.sp.containsKey('sellerEdate')) {
// //已经存进去过数据
// List<String> data = App.sp.getStringList('sellerEdate');
// if (!data.contains(day)) {
// data.add(day);
// App.sp.setStringList("sellerEdate", data);
// //过期差ji天，提醒一次s
// if (day == '-1') {
// DialogUtil.cupertinoAlertSellerHasEdateDialog(
// context,
// title: '温馨提示',
// isBold: true,
// lCallback: () {
// NavigatorUtil.goHomePageSim(context, initialIndex: 3);
// },
// rCallback: () {
// //立即续费
// },
// );
// } else {
// DialogUtil.cupertinoAlertSellerEdateDialog(
// context,
// title: '温馨提示',
// isBold: true,
// content: DateUtil.formatDate(
// edate,
// format: DateFormats.full,
// ),
// rCallback: () {
// //立即续费
// },
// );
// }
// }
// } else {
// App.sp.setStringList("sellerEdate", [day]);
// //过期差ji天，提醒一次s
// if (day == '-1') {
// DialogUtil.cupertinoAlertSellerHasEdateDialog(
// context,
// title: '温馨提示',
// isBold: true,
// lCallback: () {
// NavigatorUtil.goHomePageSim(context, initialIndex: 3);
// },
// rCallback: () {
// //立即续费
// },
// );
// } else {
// DialogUtil.cupertinoAlertSellerEdateDialog(
// context,
// title: '温馨提示',
// isBold: true,
// content: DateUtil.formatDate(
// edate,
// format: DateFormats.full,
// ),
// rCallback: () {
// //立即续费
// },
// );
// }
// }
// }
_getCustomerActivityBaseinfo() async {
Map<String, String> params = {
... ... @@ -1735,7 +1819,7 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
currentIndex: _currIndex,
onTap: (int index) {
if (_currIndex != index) {
if (App.sp.containsKey('sellerEdate')) {
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
DialogUtil.cupertinoAlertSellerHasEdateDialog(
... ... @@ -1752,6 +1836,21 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
return;
}
}
// if (App.sp.getBool("sellerEdate") ?? false) {
// DialogUtil.cupertinoAlertSellerHasEdateDialogSim(
// context,
// title: '温馨提示',
// isBold: true,
// lCallback: () {
// NavigatorUtil.goHomePageSim(context, initialIndex: 3);
// },
// rCallback: () {
// //立即续费
// },
// );
// return;
// }
if (index == 0) {
if (!Utils.getAuthority(context, '消息中心')) {
return;
... ... @@ -1760,7 +1859,7 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
if (!Utils.getAuthority(context, '桌位')) {
return;
}
}
}
// else if (index == 3) {
// //宴会
// if (!collectStoreProvider.sellerFeast) {
... ...
... ... @@ -730,8 +730,8 @@ class _MyCustomerDetailEditPageSimState extends State<MyCustomerDetailEditPageSi
_textMulLine(
'喜好', '点这里输入客户喜好的东西，请用逗号隔开。', xhController),
VEmptyView(30),
_textMulLine('服务', '点这里输入客户需要的服务，如安静的包间、远离厕所等，请用逗号隔开。',
fwController),
// _textMulLine('服务', '点这里输入客户需要的服务，如安静的包间、远离厕所等，请用逗号隔开。',
// fwController),
],
))),
RoundButton(
... ...
... ... @@ -30,6 +30,7 @@ import 'package:provider/provider.dart';
import '../../app.dart';
import '../../models/get_seller_info_model.dart';
import '../../models/seller_version_model.dart';
import '../../provider/collect_store_provider.dart';
import '../../provider/customer_provider.dart';
import '../../provider/store_base_info_provider.dart';
... ... @@ -231,39 +232,47 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerNormal) {
if (collectStoreProvider.sellerNormalEdate != null) {
//店铺过期提醒
// 计算时间差
//店铺过期日期
edate = DateTime.fromMillisecondsSinceEpoch(
int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
String from =
DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
' 00:00:00';
DateTime datenow = DateUtil.getDateTime(from);
if (collectStoreProvider.sellerSimple) {
//极速版
//店铺过期提醒
// 计算时间差
//店铺过期日期
List<SellerVersionSunModel> temp = collectStoreProvider.sellerVersionList
.where((element) => element.vid == '14')
.toList();
edate =
DateTime.fromMillisecondsSinceEpoch(int.parse(temp[0].edate) * 1000);
//比较相差的天数
int difference = edate.difference(datenow).inDays;
String from =
DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
' 00:00:00';
DateTime datenow = DateUtil.getDateTime(from);
int differenceSeconds = edate.difference(datenow).inSeconds;
//比较相差的天数
int difference = edate.difference(datenow).inDays;
if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
//过期
outDay = '0';
} else {
outDay = difference.toString();
}
int differenceSeconds = edate.difference(datenow).inSeconds;
// print(outDay);
} else {
if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
//过期
outDay = '0';
} else {
outDay = difference.toString();
}
setState(() {});
} else {
outDay = '0';
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
App.sp.remove("sellerEdate");
NavigatorUtil.goHomePage(context); //跳转至正常版本
} else {
//过期提醒
outDay = '0';
}
}
setState(() {});
}
... ... @@ -735,7 +744,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
Utils.getAuthority(context, '有效期')) {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
.cupertinoAlertSellerHasEdateDialogSim(
context,
title: '温馨提示',
isBold: true,
... ... @@ -827,7 +836,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
context, '有效期')) {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
.cupertinoAlertSellerHasEdateDialogSim(
context,
title: '温馨提示',
isBold: true,
... ... @@ -836,7 +845,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
.goHomePageSim(
context,
initialIndex:
4);
3);
},
rCallback: () {
//立即续费
... ...
... ... @@ -35,7 +35,8 @@ class _PersonnelManagePageSimState extends State<PersonnelManagePageSim> {
void initState() {
// TODO: implement initState
super.initState();
titleList = ['管理员', '店长', '客户经理', '收银员', '服务员', '前台', '迎宾'];
// titleList = ['管理员', '店长', '客户经理', '收银员', '服务员', '前台', '迎宾'];
titleList = ['管理员', '客户经理', '服务员', '前台'];
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
_getAuthUserLists(showLoading: false);
});
... ...
... ... @@ -23,6 +23,7 @@ class CollectStoreProvider with ChangeNotifier {
bool sellerPreserve = false; //客情维护
bool sellerMarketing = false; //客情营销
bool sellerNormal = false; //超能或者标准
bool sellerSimple = false; //极速版
String sellerNormalEdate = '';
... ... @@ -53,8 +54,7 @@ class CollectStoreProvider with ChangeNotifier {
}
}
/// 发送意向店铺通知短信
/// 发送意向店铺通知短信
Future<dynamic> sendIntention(
BuildContext context, Map<String, String> params,
{isShowLoading = true}) async {
... ... @@ -103,75 +103,85 @@ class CollectStoreProvider with ChangeNotifier {
sellerVersionList.forEach((element) {
versionCodeList.add(element.vid);
});
sellerCoupon = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '8');
sellerSimple = versionCodeList.any((element) => element == '14');
sellerRecharge = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '9');
if (sellerSimple) {
//极速版
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
}
} else {
sellerCoupon = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '8');
sellerWine = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '7');
sellerRecharge = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '9');
sellerOrderCustomer = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '6');
sellerOrderManager = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '5');
sellerFeast = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '12');
sellerPreserve = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '10');
sellerMarketing = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '11');
sellerWine = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '7');
sellerNormal = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '4' ||
element == '13');
sellerVersionList.forEach((element) {
if (element.vid == '1' ||
element.vid == '2' ||
element.vid == '3' ||
element.vid == '4' ||
element.vid == '13') {
sellerNormalEdate = element.edate;
}
});
if (!sellerNormal) {
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
} else {
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
sellerOrderCustomer = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '6');
sellerOrderManager = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '5');
sellerFeast = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '12');
sellerPreserve = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '10');
sellerMarketing = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '11');
sellerNormal = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '4' ||
element == '13');
sellerVersionList.forEach((element) {
if (element.vid == '1' ||
element.vid == '2' ||
element.vid == '3' ||
element.vid == '4' ||
element.vid == '13') {
sellerNormalEdate = element.edate;
}
});
if (!sellerNormal) {
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
} else {
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
}
}
}
} else {
//超能版或者标准版过期
//超能版或者标准版过期 && 极速版也没有
App.sp.setStringList("sellerEdate", ['-1']);
}
... ...
... ... @@ -91,6 +91,8 @@ class UserModel with ChangeNotifier {
}
Map<String, dynamic> seller = baseResp.data[0]["seller"];
Map<String, dynamic> user = baseResp.data[0]["user"];
String sellerVersion = baseResp.data[0]["sellerVersion"];
Map<String, dynamic> userMap = {
"openid": user['id'],
"account": user['account'],
... ... @@ -110,7 +112,8 @@ class UserModel with ChangeNotifier {
'userphone': user['phone'],
'token': baseResp.data[0]["token"]['token'],
'nickname': user['nick_name'],
'edate': seller['edate']
'edate': seller['edate'],
'sellerVersion':sellerVersion
};
await saveUserInfo(User.fromJson(userMap));
... ... @@ -213,11 +216,12 @@ class UserModel with ChangeNotifier {
App.sp.setBool("isLogin", true);
App.sp.setString("is_call_tel", seller['is_call_tel'].toString());
pullMarketingByUid(context);
if (Constant.simpleApp) {
NavigatorUtil.goHomePageSim(context);
} else {
NavigatorUtil.goHomePage(context);
}
//获取登陆接口返回的vid 如果是14 极速版，则跳转至极速版
if (user['sellerVersion'] == '14') {
NavigatorUtil.goHomePageSim(context);
} else {
NavigatorUtil.goHomePage(context);
}
return null;
}
}
... ...
... ... @@ -1756,41 +1756,41 @@ class DialogUtil {
HEmptyView(32),
InkWell(
onTap: () {
List<String> list = [];
for (FilterBtnModel item
in managerList) {
list.add(item.title);
}
DialogUtil.showSelectCusmanDialog(
context, list, (value) async {
if (value != null) {
currentIndex = value.first;
manager = list[value.first];
state(() {});
// detailModel
// .notifyListeners();
// setState(() {
// selectPnum = value.first;
// pnum = pnumlist[value.first];
// });
// bool sucess =
// await detailModel.upReserveInfo(
// context, widget.rid,
// actualPum:
// detailModel.selectNum);
// if (sucess) {
// EventBus().emit(
// "refresh_tablemanager"); //刷新桌位
// await _getReserveDetail(
// showCicle: false);
// }
}
},
selecteds: currentIndex == null
? []
: [currentIndex])
.then((value) {});
// List<String> list = [];
// for (FilterBtnModel item
// in managerList) {
// list.add(item.title);
// }
// DialogUtil.showSelectCusmanDialog(
// context, list, (value) async {
// if (value != null) {
// currentIndex = value.first;
// manager = list[value.first];
// state(() {});
// // detailModel
// // .notifyListeners();
// // setState(() {
// // selectPnum = value.first;
// // pnum = pnumlist[value.first];
// // });
// // bool sucess =
// // await detailModel.upReserveInfo(
// // context, widget.rid,
// // actualPum:
// // detailModel.selectNum);
// // if (sucess) {
// // EventBus().emit(
// // "refresh_tablemanager"); //刷新桌位
// // await _getReserveDetail(
// // showCicle: false);
// // }
// }
// },
// selecteds: currentIndex == null
// ? []
// : [currentIndex])
// .then((value) {});
},
child: Container(
padding: EdgeInsets.symmetric(
... ... @@ -1803,7 +1803,7 @@ class DialogUtil {
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(20)),
border: Border.all(
color: MyColours.color_438E93,
color: MyColours.color_999999,
width:
ScreenUtil().setWidth(2))),
child: Row(
... ... @@ -1819,12 +1819,12 @@ class DialogUtil {
fontSize:
ScreenUtil().setSp(28),
color:
MyColours.color_438E93),
MyColours.color_999999),
)),
HEmptyView(14),
Image.asset(
Utils.getImgPath(
'c_arrow_down'),
'arrow_down_sim'),
width:
ScreenUtil().setWidth(40)),
],
... ... @@ -8550,6 +8550,152 @@ class DialogUtil {
}
///店铺临近过期弹窗
static cupertinoAlertSellerHasEdateDialogSim(BuildContext context,
{String title = "",
String content = "内容",
String lTitle = "关闭",
String rTitle = "立即续费",
Color rColor = MyColours.color_438E93,
bool isBold = false,
bool isBoldContent = false,
Color contentColor = MyColours.color_99000000,
VoidCallback lCallback,
VoidCallback rCallback}) async {
// bool isRed = content != '' ? false : true;
final action = await showDialog(
context: context,
barrierDismissible: false,
builder: (BuildContext context) {
return StatefulBuilder(builder: (context, state) {
return Scaffold(
backgroundColor: Colors.transparent,
body: Center(
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
// height: ScreenUtil().setWidth(421 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(16))),
child: SingleChildScrollView(
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
// padding: EdgeInsets.symmetric(horizontal: w(20)),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
alignment: Alignment.center,
child: Text(title,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_E5000000)),
),
VEmptyView(16),
Text(
'您的店铺已过期',
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_E34D59),
),
VEmptyView(24),
Text(
'请及时续费或联系您的服务商',
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_515151),
),
// VEmptyView(24),
// Text(
// '以免影响您的正常使用',
// style: TextStyle(
// fontSize: ScreenUtil().setSp(32),
// color: MyColours.color_515151),
// ),
// VEmptyView(24),
// Text(
// '以免影响您的正常使用',
// style: TextStyle(
// fontSize: ScreenUtil().setSp(32),
// color: MyColours.color_515151),
// ),
VEmptyView(66),
MyDivider(double.infinity, ScreenUtil().setWidth(2),
color: MyColours.color_f3f3f3),
// RoundButton(
// text: lTitle,
// width: (ScreenUtil().screenWidth -
// ScreenUtil().setWidth(62) * 2),
// height: ScreenUtil().setWidth(112),
// // radius: ScreenUtil().setWidth(10),
// gradientStart: Colors.transparent,
// gradientEnd: Colors.transparent,
// textColor: MyColours.color_E6000000,
// isBold: false,
// fontSize: 32,
// onPressed: () {
// Navigator.pop(context);
// lCallback();
// }),
Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RoundButton(
text: lTitle,
width: (ScreenUtil().screenWidth -
ScreenUtil().setWidth(62) * 2) /
2,
height: ScreenUtil().setWidth(112),
// radius: ScreenUtil().setWidth(10),
gradientStart: Colors.transparent,
gradientEnd: Colors.transparent,
textColor: MyColours.color_E6000000,
isBold: false,
fontSize: 32,
onPressed: () {
Navigator.pop(context);
lCallback();
}),
MyDivider(ScreenUtil().setWidth(2),
ScreenUtil().setWidth(112),
color: MyColours.color_f3f3f3),
RoundButton(
text: rTitle,
width: (ScreenUtil().screenWidth -
ScreenUtil().setWidth(62) * 2) /
2,
height: ScreenUtil().setWidth(112),
// radius: ScreenUtil().setWidth(10),
gradientStart: Colors.transparent,
gradientEnd: Colors.transparent,
textColor: MyColours.color_438E93,
fontSize: 32,
onPressed: () {
rCallback();
Navigator.pop(
context,
);
}),
],
)
],
),
),
)),
),
));
});
},
);
}
///店铺临近过期弹窗
static cupertinoAlertSellerHasEdateDialog(BuildContext context,
{String title = "",
String content = "内容",
... ...