Skip to content

B
book-app
提交 4d922c99 authored 作者: maodou's avatar maodou
浏览文件
操作

ui修改

上级 5d50372a
隐藏空白字符变更
内嵌 并排
正在显示 包含 85 行增加 和 59 行删除
lib/pages/mine/view.dart
浏览文件 @ 4d922c99
......@@ -93,7 +93,7 @@ class _MinePageState extends State<MinePage> {
}
}),
),
controller.ads.isNotEmpty?Gaps.vGaps10:const SizedBox(),
controller.ads.isNotEmpty?Gaps.vGaps5:const SizedBox(),
controller.ads.isNotEmpty?
Container(
color: Colors.transparent,
......@@ -105,7 +105,7 @@ class _MinePageState extends State<MinePage> {
} ,
),
):const SizedBox(),
Gaps.vGaps5,
Gaps.vGaps15,
BuildAccount(items:controller.accounts,onTap: (ReadModel model) async{
final result = await context.pushNamed(model.link??'');
if (result == true){
......
lib/pages/mine/widgets/account.dart
浏览文件 @ 4d922c99
......@@ -55,10 +55,10 @@ class BuildAccount extends StatelessWidget {
child: Column(
children: [
SizedBox(
width: 25.w,
height: 25.w,
width: 32.w,
height: 32.w,
// color: Colors.green,
child: Image.asset(model.icon!),
child: Image.asset(model.icon!,fit: BoxFit.cover,),
),
Gaps.vGaps5,
Text(model.name,style: TextStyle(fontSize:12.w,height: 1.6.w,color: Colours.c9),),
......
lib/pages/mine/widgets/read.dart
浏览文件 @ 4d922c99
......@@ -62,7 +62,6 @@ class BuildRead extends StatelessWidget {
child: Column(
children: [
Text(model.value,style: TextStyle(fontSize: 18.w,height: 1.6.w,fontWeight: Fonts.medium,color: Colours.c3),),
Gaps.vGaps5,
Text(model.name,style: TextStyle(fontSize: 13.w,height:1.6.w,color: Colours.c6))
],
),
......
lib/pages/mine/widgets/user.dart
浏览文件 @ 4d922c99
......@@ -59,6 +59,7 @@ class BuildUser extends StatelessWidget {
Stack(
children: [
Container(
margin: EdgeInsets.only(top: 5.w),
padding: EdgeInsets.only(right: 8.w, left: 8.w),
height: 20.w,
decoration: BoxDecoration(
......@@ -88,7 +89,8 @@ class BuildUser extends StatelessWidget {
),
),
Positioned(
left: 8,
top: 7.w,
left: 8.w,
child: SizedBox(
width: 16.w,
height: 17.w,
......
lib/pages/user_coin/widgets/cell.dart
浏览文件 @ 4d922c99
......@@ -42,7 +42,7 @@ class BuildCell extends StatelessWidget {
],
),
),
Text(model.options == 1?'+${model.numbers}':'-${model.numbers}',style: TextStyle(fontSize: 17.w,fontWeight: Fonts.medium,color: AppTheme.primary),)
Text(model.options == 1?'+${model.numbers}':'-${model.numbers}',style: TextStyle(fontSize: 17.w,fontWeight: Fonts.medium,color: model.options == 1?AppTheme.primary:Colours.c3),)
],
),
),
......
lib/pages/user_discuss_des/view.dart
浏览文件 @ 4d922c99
......@@ -32,37 +32,58 @@ class _UserDiscussDesPageState extends State<UserDiscussDesPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
BuildItem(model: widget.model),
ClipRRect(
borderRadius:BorderRadius.only(topLeft: Radius.circular(5.w),topRight: Radius.circular(5)),
child: Container(
width: double.infinity,
Expanded(child: Container(
decoration: BoxDecoration(
color: Colors.white,
height: 35.w,
child: TabBar(
indicator: UnderlineTabIndicator(
borderRadius: BorderRadius.circular(0.75.w),
borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary),
insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距
boxShadow: [
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(1.5.w, 0),
blurRadius: 7.w,
spreadRadius: 0.w,
),
],
),
child: Column(children: [
ClipRRect(
borderRadius:BorderRadius.only(topLeft: Radius.circular(5.w),topRight: Radius.circular(5)),
child: Container(
width: double.infinity,
color: Colors.white,
height: 35.w,
child: TabBar(
indicator: UnderlineTabIndicator(
borderRadius: BorderRadius.circular(0.75.w),
borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary),
insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距
),
labelPadding: EdgeInsets.symmetric(horizontal: 20.w),
indicatorSize: TabBarIndicatorSize.label,
indicatorColor: AppTheme.primary,
indicatorWeight: 1.5,
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
isScrollable: true,
tabs: tabs
),
labelPadding: EdgeInsets.symmetric(horizontal: 20.w),
indicatorSize: TabBarIndicatorSize.label,
indicatorColor: AppTheme.primary,
indicatorWeight: 1.5,
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
isScrollable: true,
tabs: tabs
),
),
),
),
Expanded(
child: TabBarView(
children: List.generate(tabs.length, (index){
return BuildListPage(tag:'$index',model:widget.model);
})
),
)
Container(
height: 0.5.w,
color: Colours.cF2,
),
SizedBox(height:10.w),
Expanded(
child: TabBarView(
children: List.generate(tabs.length, (index){
return BuildListPage(tag:'$index',model:widget.model);
})
),
)
],),
)),
],
)
),
......
lib/pages/user_discuss_des/widgets/discuss.dart
浏览文件 @ 4d922c99
......@@ -129,6 +129,7 @@ class _BuildDiscussState extends State<BuildDiscuss> {
TextSpan(text: '：${model.content?.text?.content??''}',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
]
)),
SizedBox(height: 10.w,),
Row(
children: [
Row(
......@@ -159,6 +160,7 @@ class _BuildDiscussState extends State<BuildDiscuss> {
child: Image.asset('assets/images/reply.png',height: 15.w,width: 15.w,fit: BoxFit.fitWidth,),
),
),
SizedBox(width: 3.w,),
Text(model.replyNum.toString(),style: TextStyle(fontSize:12.w,height: 1.5,color: Colours.c9))
],
)
......
lib/pages/user_order/controller.dart
浏览文件 @ 4d922c99
......@@ -8,13 +8,13 @@ class UserOrderController extends GetxController
UserOrderController(this.tag);/*{
onRefresh();
}*/
List<Tab> tabs = [
/* List<Tab> tabs = [
const Tab(text: '全部',),
const Tab(text: '待付款',),
const Tab(text: '待支付',),
const Tab(text: '已取消',),
const Tab(text: '已完成',),
const Tab(text: '已退款',),
];
];*/
List<OrderListModel> orderList = [];
......
lib/pages/user_order/view.dart
浏览文件 @ 4d922c99
......@@ -10,7 +10,7 @@ class UserOrderPage extends StatefulWidget {
}
List<Tab> tabs = [
const Tab(text: '全部',),
const Tab(text: '待付款',),
const Tab(text: '待支付',),
const Tab(text: '已取消',),
const Tab(text: '已完成',),
const Tab(text: '已退款',),
......
lib/pages/user_order/widgets/coin.dart
浏览文件 @ 4d922c99
......@@ -45,8 +45,9 @@ class BuiltCoin extends StatelessWidget {
margin: EdgeInsets.only(top: 19.w, bottom: 19.w, right: 16.5.w),
child: Image.asset(
'assets/images/coin.png',
height: 27.w,
width: 27.w,
height: 30.w,
width: 30.w,
fit: BoxFit.cover,
),
),
Expanded(
......
lib/pages/user_order/widgets/list.dart
浏览文件 @ 4d922c99
......@@ -24,7 +24,7 @@ class _BuildListPageState extends State<BuildListPage>
@override
void initState() {
myController = Get.put(UserOrderController(widget.tag));
// myController = Get.put(UserOrderController(widget.tag));
super.initState();
}
......@@ -32,7 +32,7 @@ class _BuildListPageState extends State<BuildListPage>
Widget build(BuildContext context) {
return GetBuilder<UserOrderController>(
tag: widget.tag.toString(),
init: myController,
init: Get.put(UserOrderController(widget.tag)),
builder: (controller) => CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
......
lib/pages/user_order_awaiting/view.dart
浏览文件 @ 4d922c99
......@@ -236,7 +236,7 @@ class _UserOrderAwaitingState extends State<UserOrderAwaitingPage> {
child: const Text(
'取消',
style: TextStyle(
fontSize: 12,
fontSize: 14,
fontWeight: Fonts.medium,
color: Colours.c6,
),
......@@ -261,8 +261,8 @@ class _UserOrderAwaitingState extends State<UserOrderAwaitingPage> {
child: const Text(
'确定',
style: TextStyle(
fontSize: 12,
fontWeight: Fonts.medium,
fontSize: 14,
fontWeight: Fonts.boldSemi,
color: Colours.cAB1941,
),
),
......
lib/pages/user_order_coin_awaiting/view.dart
浏览文件 @ 4d922c99
......@@ -256,7 +256,7 @@ class _UserOrderCoinAwaitingState extends State<UserOrderCoinAwaitingPage> {
child: const Text(
'取消',
style: TextStyle(
fontSize: 12,
fontSize: 14,
fontWeight: Fonts.medium,
color: Colours.c6,
),
......@@ -281,8 +281,8 @@ class _UserOrderCoinAwaitingState extends State<UserOrderCoinAwaitingPage> {
child: const Text(
'确定',
style: TextStyle(
fontSize: 12,
fontWeight: Fonts.medium,
fontSize: 14,
fontWeight: Fonts.boldSemi,
color: Colours.cAB1941,
),
),
......
lib/pages/user_order_evaluate/view.dart
浏览文件 @ 4d922c99
......@@ -163,7 +163,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
style: TextStyle(
fontSize: 13.w,
height: 1.5,
fontWeight: Fonts.medium,
fontWeight: Fonts.boldSemi,
color: Colours.c3),
maxLines: 2,
overflow: TextOverflow.ellipsis,
......@@ -183,6 +183,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height:15.w),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
......
lib/pages/user_order_refunded/view.dart
浏览文件 @ 4d922c99
......@@ -49,7 +49,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
children: [
Padding(
padding: EdgeInsets.only(
left: 12.0.w, top: 12.0.w, bottom: 12.0.w),
left: 8.0.w, top: 12.0.w, bottom: 12.0.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -118,7 +118,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: controller.orderCompleteds.map((model) {
return Padding(
padding: EdgeInsets.only(top: 12.w),
padding: EdgeInsets.only(bottom: 12.w),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
......@@ -198,9 +198,9 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
}).toList(),
),
),
SizedBox(
height: 14.5.w,
),
// SizedBox(
// height: 2.5.w,
// ),
],
),
),
......@@ -224,7 +224,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
),
child: ClipRRect(
borderRadius: BorderRadius.circular(8.w),
child: Container(margin: EdgeInsets.only(top:24.w,left:11.5.w,right: 23.5.w,bottom: 24.w),
child: Container(margin: EdgeInsets.only(top:13.w,left:11.5.w,right: 23.5.w,bottom: 24.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
......
lib/pages/user_order_refunded_details/view.dart
浏览文件 @ 4d922c99
......@@ -53,7 +53,7 @@ class _RefundedDetailsState extends State<RefundedDetailsPage> {
)
),
),
SizedBox(height: 50.w,),
SizedBox(height: 30.w,),
Container(
margin: EdgeInsets.only(left: 15.w,right: 17.5.w),
child: Row(
......
lib/pages/user_point/widgets/cell.dart
浏览文件 @ 4d922c99
......@@ -42,7 +42,7 @@ class BuildCell extends StatelessWidget {
],
),
),
Text(model.options == 1?'+${model.numbers}':'-${model.numbers}',style: TextStyle(fontSize: 17.w,fontWeight: Fonts.medium,color: AppTheme.primary),)
Text(model.options == 1?'+${model.numbers}':'-${model.numbers}',style: TextStyle(fontSize: 17.w,fontWeight: Fonts.medium,color: model.options == 1?AppTheme.primary:Colours.c3),)
],
),
),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论