From da620c6334f99535e0748555ae75feed368cf8b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 五月 2022 18:56:22 +0800
Subject: [PATCH] 功能完善
---
flutter_module/lib/ui/task.dart | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/flutter_module/lib/ui/task.dart b/flutter_module/lib/ui/task.dart
index 00ed6d6..888f940 100644
--- a/flutter_module/lib/ui/task.dart
+++ b/flutter_module/lib/ui/task.dart
@@ -164,7 +164,7 @@
_refreshController.refreshCompleted();
_refreshController.loadComplete();
- if (result == null && _page == 1&&_taskList.isEmpty) {
+ if (result == null && _page == 1 && _taskList.isEmpty) {
_refreshController.apiError!();
}
@@ -272,7 +272,7 @@
"绛惧埌棰嗛噾甯�",
style: TextStyle(
color: ColorConstant.theme,
- fontSize: 15,
+ fontSize: 18,
fontWeight: FontWeight.bold,
height: 1),
),
@@ -282,14 +282,14 @@
Text.rich(TextSpan(
text: "宸茶繛缁鍒�",
style: const TextStyle(
- color: Color(0xFF666666), fontSize: 9),
+ color: Color(0xFF666666), fontSize: 12),
children: [
TextSpan(
text:
"${_signInfo!.continueSignInDay}",
style: const TextStyle(
color: ColorConstant.theme,
- fontSize: 12,
+ fontSize: 18,
fontWeight: FontWeight.bold)),
const TextSpan(text: "澶�")
])),
@@ -297,7 +297,9 @@
const Text(
"绛惧埌鎻愰啋",
style: TextStyle(
- color: Color(0xFF666666), fontSize: 9),
+ color: Color(0xFF666666),
+ fontSize: 12,
+ height: 1),
),
const SizedBox(
width: 5,
@@ -319,7 +321,8 @@
});
},
child: Padding(
- padding: const EdgeInsets.only(top: 10),
+ padding: const EdgeInsets.only(
+ top: 5, bottom: 3),
child: Image.asset(
_notify
? "assets/imgs/task/icon_task_sign_notify_checked.png"
@@ -344,8 +347,8 @@
child: MyFillButton(
"绔嬪嵆绛惧埌",
10,
- fontSize: 15,
- height: 42,
+ fontSize: 18,
+ height: 45,
color: _signInfo!.isSignIned!
? ColorConstant.theme.withAlpha(128)
: ColorConstant.theme,
@@ -369,7 +372,7 @@
height: 5,
),
const Text(
- "鎵�鏈変换鍔＄洿鎺ュ拰闂存帴闃熷憳瀹屾垚鍚庝綘閮借兘鑾峰緱閲戝竵濂栧姳",
+ "鎵�鏈夐槦鍛樺畬鎴愪换鍔′綘涔熻兘鑾峰緱閲戝竵銆�",
style: TextStyle(
fontSize: 10, color: Color(0xFF666666)),
),
@@ -443,17 +446,21 @@
height: 5,
),
Text.rich(
- TextSpan(children: [
- const TextSpan(text: "杩炵画绛惧埌"),
- TextSpan(
- text: "$continueDay",
- style: const TextStyle(
- fontSize: 20,
- color: Color(0xFFFFF5A9),
- fontWeight: FontWeight.bold)),
- const TextSpan(text: "澶�"),
- ]),
+ TextSpan(
+ children: [
+ const TextSpan(text: "杩炵画绛惧埌"),
+ TextSpan(
+ text: "$continueDay",
+ style: const TextStyle(
+ fontSize: 20,
+ color: Color(0xFFFFF5A9),
+ fontWeight: FontWeight.bold)),
+ const TextSpan(text: "澶�"),
+ ],
+ ),
style: const TextStyle(color: Colors.white, fontSize: 14),
+ overflow: TextOverflow.ellipsis,
+ maxLines: 1,
),
const SizedBox(
height: 8,
@@ -543,7 +550,7 @@
),
Text(
day.day!,
- style: const TextStyle(fontSize: 9, color: Color(0xFF999999)),
+ style: const TextStyle(fontSize: 11, color: Color(0xFF999999)),
)
],
));
@@ -621,32 +628,40 @@
const SizedBox(
width: 10,
),
- Column(
+ Expanded(
+ child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
task.name!,
- style: TextStyle(
- color: Color(0xFF454545), fontSize: 12, height: 1.2),
- ),
- Text(
- task.process!,
style: const TextStyle(
- color: Color(0xFF7F7F7F), fontSize: 9, height: 1.5),
+ color: Color(0xFF454545), fontSize: 16, height: 1.2),
+ ),
+ const SizedBox(
+ height: 5,
),
Text.rich(TextSpan(
style:
- TextStyle(color: const Color(0xFFFF8316), fontSize: 9),
+ const TextStyle(color: Color(0xFFFF8316), fontSize: 13),
children: [
const TextSpan(text: "+"),
- TextSpan(
- text: "${task.price}",
- style: TextStyle(fontSize: 10)),
+ TextSpan(text: "${task.price}"),
TextSpan(text: task.priceUnit),
+ const TextSpan(
+ text: " 浠婃棩杩涘害",
+ style: TextStyle(
+ color: Color(0xFF7F7F7F),
+ fontSize: 10,
+ height: 1.5)),
+ TextSpan(
+ text: task.process!,
+ style: const TextStyle(
+ color: Color(0xFF7F7F7F),
+ fontSize: 12,
+ height: 1.5)),
])),
],
- ),
- Expanded(child: Container()),
+ )),
MyOutlineButton(
task.actionName!,
20,
--
Gitblit v1.8.0