订单中心中的(自购)多余,查看全部应变为“查看明细”,特卖应变为特推,排行榜板块多余,商务合作的图标不对

master
laiiihz 4 years ago
parent f2c17ca9f4
commit a952edf4a6

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -296,7 +296,7 @@ class _BottomBarState extends State<BottomBar> {
// items: AppConfig.getShowCommission() // items: AppConfig.getShowCommission()
items: [ items: [
NavigationItemBean( NavigationItemBean(
textStr: '', textStr: '',
image: AssetImage("assets/tabbar_sale_normal.png"), image: AssetImage("assets/tabbar_sale_normal.png"),
imageSelected: AssetImage("assets/tabbar_sale_selected.png"), imageSelected: AssetImage("assets/tabbar_sale_selected.png"),
), ),

@ -53,19 +53,10 @@ class _OrderCentralViewState extends BaseStoreState<OrderCentralView> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Container( child: Text(
child: ExtendedText.rich(TextSpan(children: [ '订单中心',
TextSpan( style:
text: '订单中心 ', AppTextStyle.generate(16, fontWeight: FontWeight.w700),
style: AppTextStyle.generate(16,
fontWeight: FontWeight.w700),
),
TextSpan(
text: '(自购)',
style: AppTextStyle.generate(14,
fontWeight: FontWeight.w400),
),
])),
), ),
// child: Text( // child: Text(
// "订单中心", // "订单中心",
@ -73,7 +64,7 @@ class _OrderCentralViewState extends BaseStoreState<OrderCentralView> {
// ), // ),
), ),
CustomImageButton( CustomImageButton(
title: "查看全部", title: "查看明细",
fontSize: ScreenAdapterUtils.setSp(12), fontSize: ScreenAdapterUtils.setSp(12),
color: Colors.black45, color: Colors.black45,
onPressed: () { onPressed: () {

@ -70,11 +70,7 @@ class OtherItemView extends StatelessWidget {
), ),
Expanded( Expanded(
child: CustomImageButton( child: CustomImageButton(
icon: Icon( icon: Image.asset(R.ASSETS_SHOP_BUSINESS_CORP_PNG),
AppIcons.icon_business_cooperation,
color: _itemColor,
size: _iconSize,
),
title: "商务合作", title: "商务合作",
fontSize: _fontSize, fontSize: _fontSize,
color: Colors.grey[700], color: Colors.grey[700],

@ -11,16 +11,12 @@ class OtherItemViewV2 extends StatelessWidget {
final Color _itemColor = Colors.grey[500]; final Color _itemColor = Colors.grey[500];
final double _iconSize = rSize(30); final double _iconSize = rSize(30);
Widget _buildItem(IconData icon, String title, VoidCallback onTap) { Widget _buildItem(Widget icon, String title, VoidCallback onTap) {
return CustomImageButton( return CustomImageButton(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
onPressed: onTap, onPressed: onTap,
child: <Widget>[ child: <Widget>[
Icon( icon,
icon,
color: _itemColor,
size: _iconSize,
),
title.text.color(Color(0xFF666666)).size(12.sp).make(), title.text.color(Color(0xFF666666)).size(12.sp).make(),
].column(), ].column(),
).expand(); ).expand();
@ -33,12 +29,20 @@ class OtherItemViewV2 extends StatelessWidget {
children: [ children: [
70.hb, 70.hb,
_buildItem( _buildItem(
AppIcons.icon_address, Icon(
AppIcons.icon_address,
color: _itemColor,
size: _iconSize,
),
'地址', '地址',
() => AppRouter.push(context, RouteName.RECEIVING_ADDRESS_PAGE), () => AppRouter.push(context, RouteName.RECEIVING_ADDRESS_PAGE),
), ),
_buildItem( _buildItem(
AppIcons.icon_help, Icon(
AppIcons.icon_help,
color: _itemColor,
size: _iconSize,
),
'帮助', '帮助',
() => MQManager.goToChat( () => MQManager.goToChat(
userId: UserManager.instance.user.info.id.toString(), userId: UserManager.instance.user.info.id.toString(),
@ -50,12 +54,20 @@ class OtherItemViewV2 extends StatelessWidget {
}), }),
), ),
_buildItem( _buildItem(
AppIcons.icon_business_cooperation, Image.asset(
R.ASSETS_SHOP_BUSINESS_CORP_PNG,
width: 30.w,
height: 30.w,
),
'商务合作', '商务合作',
() => AppRouter.push(context, RouteName.BUSSINESS_COOPERATION_PAGE), () => AppRouter.push(context, RouteName.BUSSINESS_COOPERATION_PAGE),
), ),
_buildItem( _buildItem(
AppIcons.icon_setting, Icon(
AppIcons.icon_setting,
color: _itemColor,
size: _iconSize,
),
'设置', '设置',
() => AppRouter.push(context, RouteName.SETTING_PAGE), () => AppRouter.push(context, RouteName.SETTING_PAGE),
), ),

Loading…
Cancel
Save