mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
guozhigq
2024-12-10 22:29:45 +08:00
parent 43446b395f 55dbd9d5e5
commit fc861715dc
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/http/msg.dart
View File

@ -299,8 +299,10 @@ class MsgHttp {
return { return {
'status': true, 'status': true,
'data': res.data['data']['system_notify_list'] 'data': res.data['data']['system_notify_list']
.map<MessageSystemModel>((e) => MessageSystemModel.fromJson(e)) ?.map<MessageSystemModel>(
.toList(), (e) => MessageSystemModel.fromJson(e))
.toList() ??
[],
}; };
} catch (err) { } catch (err) {
return {'status': false, 'date': [], 'msg': err.toString()}; return {'status': false, 'date': [], 'msg': err.toString()};
@ -341,8 +343,10 @@ class MsgHttp {
return { return {
'status': true, 'status': true,
'data': res.data['data']['system_notify_list'] 'data': res.data['data']['system_notify_list']
.map<MessageSystemModel>((e) => MessageSystemModel.fromJson(e)) ?.map<MessageSystemModel>(
.toList(), (e) => MessageSystemModel.fromJson(e))
.toList() ??
[],
}; };
} catch (err) { } catch (err) {
return {'status': false, 'date': [], 'msg': err.toString()}; return {'status': false, 'date': [], 'msg': err.toString()};

45
lib/pages/message/system/view.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/common/widgets/no_data.dart';
import 'package:pilipala/models/msg/system.dart'; import 'package:pilipala/models/msg/system.dart';
import 'package:pilipala/pages/message/utils/index.dart'; import 'package:pilipala/pages/message/utils/index.dart';
import 'package:pilipala/utils/app_scheme.dart'; import 'package:pilipala/utils/app_scheme.dart';
@ -41,31 +42,35 @@ class _MessageSystemPageState extends State<MessageSystemPage> {
if (snapshot.data == null) { if (snapshot.data == null) {
return const SizedBox(); return const SizedBox();
} }
if (snapshot.data['status']) { Map? data = snapshot.data;
final systemItems = _messageSystemCtr.systemItems; if (data != null && data['status']) {
RxList<MessageSystemModel> systemItems =
_messageSystemCtr.systemItems;
return Obx( return Obx(
() => ListView.separated( () => systemItems.isNotEmpty
controller: scrollController, ? ListView.separated(
itemBuilder: (context, index) => SystemItem( controller: scrollController,
item: systemItems[index], itemBuilder: (context, index) => SystemItem(
index: index, item: systemItems[index],
messageSystemCtr: _messageSystemCtr, index: index,
), messageSystemCtr: _messageSystemCtr,
itemCount: systemItems.length, ),
separatorBuilder: (BuildContext context, int index) { itemCount: systemItems.length,
return Divider( separatorBuilder: (BuildContext context, int index) {
indent: 14, return Divider(
endIndent: 14, indent: 14,
height: 1, endIndent: 14,
color: Colors.grey.withOpacity(0.1), height: 1,
); color: Colors.grey.withOpacity(0.1),
}, );
), },
)
: const CustomScrollView(slivers: [NoData()]),
); );
} else { } else {
// 请求错误 // 请求错误
return HttpError( return HttpError(
errMsg: snapshot.data['msg'], errMsg: data?['msg'] ?? '请求异常',
fn: () { fn: () {
setState(() { setState(() {
_futureBuilderFuture = _futureBuilderFuture =