xt / Flutter-ReserveApp · Commits

Go to a project

Commit ab74acd8e31620a07f72e8c763ce8ca7359b7a46

Authored by wdn127929
1 parent 8cf8cd50
build: skipped

未读列表

Inline Side-by-side
Showing 6 changed files with 29 additions and 23 deletions
... ... @@ -15,8 +15,8 @@ class Constant {
// };
static const bool simpleApp = true; //极速版
// static const bool simpleApp = false; //标准版
// static const bool simpleApp = true; //极速版
static const bool simpleApp = false; //标准版
static const Map<String, List<String>> authorityConfig = {
'充值短信': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
'有效期': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
... ...
... ... @@ -541,7 +541,7 @@ class MessageItemF extends StatelessWidget {
: SizedBox(),
if (message.label != null &&
message.label != '')
Container(
Container(
padding: EdgeInsets.symmetric(
horizontal:
ScreenUtil().setWidth(16),
... ... @@ -559,7 +559,7 @@ class MessageItemF extends StatelessWidget {
BorderRadius.circular(8)),
child: Text(
message.label,
// overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: isTreated
? MyColours.color_BFC4D4
... ...
... ... @@ -96,7 +96,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
// "type_id": "10", //1提前点餐2内部预订10在线预订
// "status": '0',
"offset": offset.toString(),
"limit": "100000",
"limit": "1000",
};
await messageModel.getNewGetUntreatedMsgList(context, params,
... ...
... ... @@ -18,7 +18,6 @@ import 'package:one_key/utils/event_bus.dart';
import '../../provider/collect_store_provider.dart';
/**
* 已处理消息
*/
... ... @@ -31,8 +30,6 @@ class MessageTreatedPageSim extends StatefulWidget {
}
class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
Color selectedColor = MyColours.color_199095;
Color unSelectedColor = MyColours.color_999999;
... ... @@ -46,27 +43,24 @@ class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
String typeid = ''; //默认全部
CollectStoreProvider collectStoreProvider;
EasyRefreshController easyRefreshController;
EasyRefreshController easyRefreshController;
@override
void initState() {
// TODO: implement initState
super.initState();
_initMenu();
// //移除在线预订消息
// bus.on("remove_untreated_message", (args) {
// messageModel.removeUntreatedMessageByMid(args.toString());
// messageDialogModel.removeMessage(args.toString());
// });
// messageModel.pageState = PageState.Loading;
WidgetsBinding.instance.addPostFrameCallback((_) {
messageModel.controller = EasyRefreshController();
messageModel.controller = EasyRefreshController();
messageModel.pageState = PageState.Loading;
messageModel.notifyListeners();
getMessage(typeid);
... ... @@ -149,7 +143,11 @@ class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
params['type_id'] = typeid; //1提前点餐/2内部预订/10在线预订/店内消息传15
}
await messageModel.getMessagesSim(context, params, showLoading: showLoading);
await messageModel.getMessagesSim(context, params, showLoading: showLoading,
callback: () {
// messageModel.controller.resetLoadState();
// messageModel.controller.callLoad();
});
// _getUnMsgNum();
}
... ... @@ -200,7 +198,7 @@ class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
} else if (index == 2) {
//在线预订
typeid = '10';
}
}
// else if (index == 3) {
// //提前点餐
// typeid = '1';
... ... @@ -274,8 +272,6 @@ class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
)
: EasyRefresh.custom(
controller: messageModel.controller,
slivers: [
SliverList(
delegate: SliverChildBuilderDelegate(
... ... @@ -294,7 +290,7 @@ class MessageTreatedPageSimState extends State<MessageTreatedPageSim> {
},
onLoad: () async {
offset++;
getMessage(typeid, showLoading: false);
},
)))
... ...
... ... @@ -96,7 +96,7 @@ class MessageUntreatedPageSimState extends State<MessageUntreatedPageSim> {
// "type_id": "10", //1提前点餐2内部预订10在线预订
// "status": '0',
"offset": offset.toString(),
"limit": "100000",
"limit": "1000",
};
await messageModel.getNewGetUntreatedMsgList(context, params,
... ...
... ... @@ -36,12 +36,15 @@ class MessageModel extends ChangeNotifier {
// }
//获取已处理消息
getMessagesSim(BuildContext context, Map<String, String> params,
{showLoading = true}) async {
{showLoading = true,VoidCallback callback}) async {
if (showLoading) {
pageState = PageState.Loading;
messagesHas = [];
notifyListeners();
}
List<NewUnmessage> messagesTemp = messagesHas.toList(); //消息
print(messagesTemp);
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.new_get_message_list,
data: params, showLoading: false)
... ... @@ -110,6 +113,12 @@ class MessageModel extends ChangeNotifier {
// return true;
// });
// }
if(messagesTemp.length == messagesHas.length){
callback();
}
if (messagesHas.isEmpty && baseResp.data.length == 0) {
pageState = PageState.Empty;
} else {
... ... @@ -148,6 +157,7 @@ class MessageModel extends ChangeNotifier {
notifyListeners();
});
if (baseResp != null && baseResp.code == Constant.status_success) {
String uid = Provider.of<UserModel>(context, listen: false).user.openid;
List<NewUnmessage> temp = [];
if (params['offset'] == "0") {
... ...