Commit c2930089 authored by skeyboy's avatar skeyboy

Revert "订阅页展示微调"

This reverts commit c69c35c4.
parent ded174bb
import 'dart:io';
import 'package:chart/common/routers/routes.dart'; import 'package:chart/common/routers/routes.dart';
import 'package:chart/common/values/colors.dart'; import 'package:chart/common/values/colors.dart';
import 'package:chart/common/widgets/widgets.dart'; import 'package:chart/common/widgets/widgets.dart';
...@@ -15,16 +13,9 @@ class AndroidPayListPage extends GetView<AndroidPayListController> { ...@@ -15,16 +13,9 @@ class AndroidPayListPage extends GetView<AndroidPayListController> {
// 内容页 // 内容页
Widget _buildView() { Widget _buildView() {
// return PayItemWidget(); // return PayItemWidget();
if (Platform.isAndroid) {
return WillPopScope(
child: PayItemWidget(),
onWillPop: () async {
return false;
});
} else {
return PayItemWidget(); return PayItemWidget();
} }
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
......
...@@ -128,9 +128,9 @@ class PayItemWidget extends GetView<AndroidPayListController> { ...@@ -128,9 +128,9 @@ class PayItemWidget extends GetView<AndroidPayListController> {
// crossAxisAlignment // crossAxisAlignment
children: [ children: [
const Icon(Icons.check, color: color), Icon(Icons.check, color: color),
Text(item, Text(item,
style: const TextStyle( style: TextStyle(
color: color, fontSize: 16)) color: color, fontSize: 16))
], ],
), ),
...@@ -280,39 +280,30 @@ class PayItemWidget extends GetView<AndroidPayListController> { ...@@ -280,39 +280,30 @@ class PayItemWidget extends GetView<AndroidPayListController> {
: Colors.grey), : Colors.grey),
child: Container( child: Container(
height: 100, height: 100,
padding: const EdgeInsets.only( padding: EdgeInsets.only(
top: 16, top: 16,
left: 5, left: 16,
right: 5, right: 16,
bottom: 16), bottom: 16),
// color: Colors.pink, // color: Colors.pink,
child: Expanded(
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.spaceAround, .spaceAround,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [ children: [
Text( Text(
'${controller.state.items[item].amount!}', '${controller.state.items[item].amount!}',
maxLines: 1, style: TextStyle(
style: const TextStyle(
color: Colors.white), color: Colors.white),
), ),
Text( Text(
controller "${controller.state.items[item].goodsName!}",
.state maxLines: 2,
.items[item] overflow: TextOverflow.clip,
.goodsName!, style: TextStyle(
maxLines: 1,
overflow:
TextOverflow.clip,
style: const TextStyle(
color: Colors.white), color: Colors.white),
) )
], ],
),
)), )),
))), ))),
) )
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment