fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

消息ui更改

dart3_last
wurong 2 years ago
parent
81837a2724
commit
a3edc6b49f
3 changed files with 43 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      lib/message/system_details.dart
  2. 4
      lib/message/system_message.dart
  3. 85
      lib/order/order_detail_page.dart

4
lib/message/system_details.dart
Unescape View File

@ -243,7 +243,7 @@ class _SystemDetails extends State<SystemDetails> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon_cz.webp",
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
), ),
@ -370,7 +370,7 @@ class _SystemDetails extends State<SystemDetails> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon_cz.webp",
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
), ),

4
lib/message/system_message.dart
Unescape View File

@ -154,6 +154,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
// ), // ),
// ], // ],
// ), // ),
backgroundColor: Colors.white,
body: SmartRefresher( body: SmartRefresher(
enablePullDown: true, enablePullDown: true,
enablePullUp: true, enablePullUp: true,
@ -363,6 +364,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
), ),
], ],
), ),
if(title != S.of(context).xitongxiaoxi)
Container( Container(
margin: EdgeInsets.only(top: 12.h), margin: EdgeInsets.only(top: 12.h),
width: double.infinity, width: double.infinity,
@ -643,7 +645,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon_cz.webp",
width: 40.w, width: 40.w,
height: 40.h, height: 40.h,
), ),

85
lib/order/order_detail_page.dart
Unescape View File

@ -174,61 +174,52 @@ class _OrderDetailPage extends State<OrderDetailPage> {
}, },
), ),
onRefresh:(){ onRefresh:(){
setState(() { queryDetails();
queryDetails();
});
}, },
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
scrollController: ScrollController(), scrollController: ScrollController(),
child: Container( child: Column(
child: SingleChildScrollView( children: [
physics: BouncingScrollPhysics(), ///订单状态显示
child: Container( OrderStatus(
child: Column( orderStatus,
children: [ isTakeOut,
///订单状态显示 sendStatus,
OrderStatus( payStatus,
orderStatus, refundStatus,
isTakeOut, title,
sendStatus, center,
payStatus, orderInfo,
refundStatus, ),
title,
center,
orderInfo,
),
///订单取货地址，或， 收货地址 ///订单取货地址，或， 收货地址
if(orderInfo != null && orderInfo.addressExt != null) if(orderInfo != null && orderInfo.addressExt != null)
OrderAddress( OrderAddress(
orderStatus, orderStatus,
isTakeOut, isTakeOut,
sendStatus, sendStatus,
payStatus, payStatus,
refundStatus, refundStatus,
title, title,
center, center,
paySelected, paySelected,
_orderCancel, _orderCancel,
orderInfo, orderInfo,
jumpState jumpState
), ),
///订单商品 ///订单商品
if(orderInfo != null) if(orderInfo != null)
OrderCommodity(orderInfo), OrderCommodity(orderInfo),
///显示订单信息 ///显示订单信息
if(orderInfo != null) if(orderInfo != null)
OrderInfoView(orderInfo, isTakeOut), OrderInfoView(orderInfo, isTakeOut),
Container( Container(
height: 42.h, height: 42.h,
),
],
),
), ),
), ],
), ),
), ),
) )

Write Preview
Loading…
Cancel
Save