xt / Flutter-ReserveApp · Commits

Go to a project

Commit 83ee84aa2d0745af6e23b4b8d7201cf9ac753db0

Authored by wdn127929
1 parent 9dba4148
build: skipped

部分UI

Inline Side-by-side
Showing 7 changed files with 90 additions and 48 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "181" 14 +def flutterVersionCode = "190"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '181' 16 + flutterVersionCode = '190'
17 } 17 }
18 18
19 -def flutterVersionName = "1.8.1" 19 +def flutterVersionName = "1.9.0"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.8.1' 21 + flutterVersionName = '1.9.0'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -111,8 +111,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -111,8 +111,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
111 child: Text( 111 child: Text(
112 title, 112 title,
113 style: TextStyle( 113 style: TextStyle(
  114 + color: MyColours.color_333333,
114 fontWeight: FontWeight.bold, 115 fontWeight: FontWeight.bold,
115 - fontSize: ScreenUtil().setSp(30)), 116 + fontSize: ScreenUtil().setSp(34)),
116 ), 117 ),
117 ), 118 ),
118 HEmptyView(20), 119 HEmptyView(20),
@@ -128,7 +129,7 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -128,7 +129,7 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
128 // widget.isSelect ? Colors.white : MyColours.color_199095, 129 // widget.isSelect ? Colors.white : MyColours.color_199095,
129 //输入文本的样式 130 //输入文本的样式
130 style: TextStyle( 131 style: TextStyle(
131 - fontSize: ScreenUtil().setSp(26), 132 + fontSize: ScreenUtil().setSp(32),
132 ), 133 ),
133 focusNode: title == '券名称' ? _nameFocusNode : _requireFocusNode, 134 focusNode: title == '券名称' ? _nameFocusNode : _requireFocusNode,
134 // textAlignVertical: TextAlignVertical.bottom, 135 // textAlignVertical: TextAlignVertical.bottom,
@@ -139,7 +140,7 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -139,7 +140,7 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
139 hintText: hintText, 140 hintText: hintText,
140 hintStyle: TextStyle( 141 hintStyle: TextStyle(
141 color: MyColours.color_999999, 142 color: MyColours.color_999999,
142 - fontSize: ScreenUtil().setSp(26), 143 + fontSize: ScreenUtil().setSp(32),
143 ), 144 ),
144 // contentPadding: EdgeInsets.only( 145 // contentPadding: EdgeInsets.only(
145 // bottom: ScreenUtil().setWidth(30)), //ios 17 146 // bottom: ScreenUtil().setWidth(30)), //ios 17
@@ -246,8 +247,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -246,8 +247,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
246 title, 247 title,
247 textAlign: TextAlign.left, 248 textAlign: TextAlign.left,
248 style: TextStyle( 249 style: TextStyle(
  250 + color: MyColours.color_333333,
249 fontWeight: FontWeight.bold, 251 fontWeight: FontWeight.bold,
250 - fontSize: ScreenUtil().setSp(30)), 252 + fontSize: ScreenUtil().setSp(34)),
251 )), 253 )),
252 ), 254 ),
253 VEmptyView(10), 255 VEmptyView(10),
@@ -261,6 +263,10 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -261,6 +263,10 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
261 decoration: InputDecoration( 263 decoration: InputDecoration(
262 contentPadding: EdgeInsets.all(ScreenUtil().setWidth(20)), 264 contentPadding: EdgeInsets.all(ScreenUtil().setWidth(20)),
263 hintText: hintText, 265 hintText: hintText,
  266 + hintStyle: TextStyle(
  267 + color: MyColours.color_999999,
  268 + fontSize: ScreenUtil().setSp(32),
  269 + ),
264 fillColor: MyColours.color_EEEEEE, 270 fillColor: MyColours.color_EEEEEE,
265 filled: true, 271 filled: true,
266 border: OutlineInputBorder( 272 border: OutlineInputBorder(
@@ -295,8 +301,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -295,8 +301,9 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
295 child: Text( 301 child: Text(
296 title, 302 title,
297 style: TextStyle( 303 style: TextStyle(
  304 + color: MyColours.color_333333,
298 fontWeight: FontWeight.bold, 305 fontWeight: FontWeight.bold,
299 - fontSize: ScreenUtil().setSp(30)), 306 + fontSize: ScreenUtil().setSp(34)),
300 ), 307 ),
301 ), 308 ),
302 Spacer(), 309 Spacer(),
@@ -340,10 +347,15 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -340,10 +347,15 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
340 children: [ 347 children: [
341 VEmptyView(20), 348 VEmptyView(20),
342 _textfield('券名称', '例：9折券/200元代金券/菜品券'), 349 _textfield('券名称', '例：9折券/200元代金券/菜品券'),
  350 + VEmptyView(20),
343 _textfield('券要求', '例：无门槛/满2000元'), 351 _textfield('券要求', '例：无门槛/满2000元'),
  352 + VEmptyView(20),
344 _select('有效期从', fromDate), 353 _select('有效期从', fromDate),
  354 + VEmptyView(20),
345 _select('有效期至', endDate), 355 _select('有效期至', endDate),
  356 + VEmptyView(20),
346 _explain('券说明', '例：可用包间，停车免费，不与店内其他活动共享等'), 357 _explain('券说明', '例：可用包间，停车免费，不与店内其他活动共享等'),
  358 + VEmptyView(20),
347 _canUse('是否立即启用'), 359 _canUse('是否立即启用'),
348 ], 360 ],
349 ))), 361 ))),
@@ -44,13 +44,16 @@ class _CouponItemState extends State<CouponItem> { @@ -44,13 +44,16 @@ class _CouponItemState extends State<CouponItem> {
44 children: [ 44 children: [
45 Container( 45 Container(
46 // width: ScreenUtil().setWidth(610), 46 // width: ScreenUtil().setWidth(610),
47 - margin: EdgeInsets.symmetric(  
48 - horizontal: ScreenUtil().setWidth(30),  
49 - vertical: ScreenUtil().setWidth(12)), 47 + margin: EdgeInsets.fromLTRB(
  48 + ScreenUtil().setWidth(40),
  49 + ScreenUtil().setWidth(0),
  50 + ScreenUtil().setWidth(40),
  51 + ScreenUtil().setWidth(30)),
50 padding: EdgeInsets.all(ScreenUtil().setWidth(30)), 52 padding: EdgeInsets.all(ScreenUtil().setWidth(30)),
51 decoration: BoxDecoration( 53 decoration: BoxDecoration(
52 - color: notSelect ? MyColours.app_main : MyColours.color_E0E0E0,  
53 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))), 54 + color:
  55 + notSelect ? MyColours.color_FFF0E5 : MyColours.color_EEF0F2,
  56 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20))),
54 child: Column( 57 child: Column(
55 mainAxisSize: MainAxisSize.min, 58 mainAxisSize: MainAxisSize.min,
56 crossAxisAlignment: CrossAxisAlignment.start, 59 crossAxisAlignment: CrossAxisAlignment.start,
@@ -68,8 +71,10 @@ class _CouponItemState extends State<CouponItem> { @@ -68,8 +71,10 @@ class _CouponItemState extends State<CouponItem> {
68 maxLines: 2, 71 maxLines: 2,
69 overflow: TextOverflow.ellipsis, 72 overflow: TextOverflow.ellipsis,
70 style: TextStyle( 73 style: TextStyle(
71 - color: MyColours.color_ffffff,  
72 - fontSize: ScreenUtil().setSp(34), 74 + color: notSelect
  75 + ? MyColours.color_F05522
  76 + : MyColours.color_999999,
  77 + fontSize: ScreenUtil().setSp(44),
73 fontWeight: FontWeight.bold), 78 fontWeight: FontWeight.bold),
74 ), 79 ),
75 ), 80 ),
@@ -82,13 +87,31 @@ class _CouponItemState extends State<CouponItem> { @@ -82,13 +87,31 @@ class _CouponItemState extends State<CouponItem> {
82 maxLines: 1, 87 maxLines: 1,
83 overflow: TextOverflow.ellipsis, 88 overflow: TextOverflow.ellipsis,
84 style: TextStyle( 89 style: TextStyle(
85 - color: MyColours.color_ffffff,  
86 - fontSize: ScreenUtil().setSp(22),  
87 - fontWeight: FontWeight.bold)), 90 + color: notSelect
  91 + ? MyColours.color_F05522
  92 + : MyColours.color_999999,
  93 + fontSize: ScreenUtil().setSp(30),
  94 + fontWeight: FontWeight.normal)),
88 )) 95 ))
89 ], 96 ],
90 ), 97 ),
91 ), 98 ),
  99 + (ObjectUtil.isNotEmpty(sunModel.stime) &&
  100 + sunModel.stime != '0') ||
  101 + (ObjectUtil.isNotEmpty(sunModel.etime) &&
  102 + sunModel.etime != '0')
  103 + ? Container(
  104 + padding:
  105 + EdgeInsets.only(top: ScreenUtil().setWidth(20)),
  106 + child: Text(
  107 + '有效期：${ObjectUtil.isNotEmpty(sunModel.stime) ? Utils.getDateStrFromJiekou(sunModel.stime) : '--'} 至 ${ObjectUtil.isNotEmpty(sunModel.etime) ? Utils.getDateStrFromJiekou(sunModel.etime) : '--'}',
  108 + style: TextStyle(
  109 + color: notSelect
  110 + ? MyColours.color_EF7249
  111 + : MyColours.color_B7B7B7,
  112 + fontSize: ScreenUtil().setSp(22))),
  113 + )
  114 + : Container(),
92 ObjectUtil.isNotEmpty(sunModel.explain) 115 ObjectUtil.isNotEmpty(sunModel.explain)
93 ? Container( 116 ? Container(
94 margin: EdgeInsets.only(top: ScreenUtil().setWidth(30)), 117 margin: EdgeInsets.only(top: ScreenUtil().setWidth(30)),
@@ -100,27 +123,13 @@ class _CouponItemState extends State<CouponItem> { @@ -100,27 +123,13 @@ class _CouponItemState extends State<CouponItem> {
100 softWrap: false, 123 softWrap: false,
101 style: TextStyle( 124 style: TextStyle(
102 color: notSelect 125 color: notSelect
103 - ? MyColours.app_main  
104 - : MyColours.color_e5e5e5,  
105 - fontSize: ScreenUtil().setSp(22))), 126 + ? MyColours.color_EF7249
  127 + : MyColours.color_999999,
  128 + fontSize: ScreenUtil().setSp(24))),
106 decoration: BoxDecoration( 129 decoration: BoxDecoration(
107 color: MyColours.color_ffffff, 130 color: MyColours.color_ffffff,
108 borderRadius: BorderRadius.circular( 131 borderRadius: BorderRadius.circular(
109 - ScreenUtil().setWidth(10))),  
110 - )  
111 - : Container(),  
112 - (ObjectUtil.isNotEmpty(sunModel.stime) &&  
113 - sunModel.stime != '0') ||  
114 - (ObjectUtil.isNotEmpty(sunModel.etime) &&  
115 - sunModel.etime != '0')  
116 - ? Container(  
117 - padding:  
118 - EdgeInsets.only(top: ScreenUtil().setWidth(20)),  
119 - child: Text(  
120 - '有效期：${ObjectUtil.isNotEmpty(sunModel.stime) ? Utils.getDateStrFromJiekou(sunModel.stime) : '--'} 至 ${ObjectUtil.isNotEmpty(sunModel.etime) ? Utils.getDateStrFromJiekou(sunModel.etime) : '--'}',  
121 - style: TextStyle(  
122 - color: MyColours.color_ffffff,  
123 - fontSize: ScreenUtil().setSp(22))), 132 + ScreenUtil().setWidth(30))),
124 ) 133 )
125 : Container(), 134 : Container(),
126 ], 135 ],
@@ -138,12 +147,16 @@ class _CouponItemState extends State<CouponItem> { @@ -138,12 +147,16 @@ class _CouponItemState extends State<CouponItem> {
138 children: [ 147 children: [
139 Text('被领取：${sunModel.receiveNum}张', 148 Text('被领取：${sunModel.receiveNum}张',
140 style: TextStyle( 149 style: TextStyle(
141 - color: MyColours.color_ffffff, 150 + color: notSelect
  151 + ? MyColours.color_EF7249
  152 + : MyColours.color_B7B7B7,
142 fontSize: ScreenUtil().setSp(22))), 153 fontSize: ScreenUtil().setSp(22))),
143 VEmptyView(5), 154 VEmptyView(5),
144 Text('已使用：${sunModel.useNum}张', 155 Text('已使用：${sunModel.useNum}张',
145 style: TextStyle( 156 style: TextStyle(
146 - color: MyColours.color_ffffff, 157 + color: notSelect
  158 + ? MyColours.color_EF7249
  159 + : MyColours.color_B7B7B7,
147 fontSize: ScreenUtil().setSp(22))), 160 fontSize: ScreenUtil().setSp(22))),
148 ], 161 ],
149 ), 162 ),
@@ -152,11 +165,17 @@ class _CouponItemState extends State<CouponItem> { @@ -152,11 +165,17 @@ class _CouponItemState extends State<CouponItem> {
152 ? RoundButton( 165 ? RoundButton(
153 width: ScreenUtil().setWidth(100), 166 width: ScreenUtil().setWidth(100),
154 height: ScreenUtil().setWidth(50), 167 height: ScreenUtil().setWidth(50),
155 - radius: ScreenUtil().setWidth(10), 168 + radius: ScreenUtil().setWidth(40),
156 text: notSelect ? '停用' : '启用', 169 text: notSelect ? '停用' : '启用',
157 - textColor: MyColours.color_666666,  
158 - gradientStart: Colors.white,  
159 - gradientEnd: Colors.white, 170 + textColor: notSelect
  171 + ? MyColours.color_F05522
  172 + : MyColours.color_999999,
  173 + gradientStart: notSelect
  174 + ? MyColours.color_FFE2D3
  175 + : MyColours.color_E9E9E9,
  176 + gradientEnd: notSelect
  177 + ? MyColours.color_FFE2D3
  178 + : MyColours.color_E9E9E9,
160 onPressed: widget.onPressedSwich, 179 onPressed: widget.onPressedSwich,
161 ) 180 )
162 : Container() 181 : Container()
@@ -112,13 +112,15 @@ class _CouponPageState extends State<CouponPage> { @@ -112,13 +112,15 @@ class _CouponPageState extends State<CouponPage> {
112 delegate: SliverChildBuilderDelegate( 112 delegate: SliverChildBuilderDelegate(
113 (BuildContext context, int index) { 113 (BuildContext context, int index) {
114 return Container( 114 return Container(
  115 + margin: EdgeInsets.all(ScreenUtil().setWidth(40)),
115 padding: 116 padding:
116 - EdgeInsets.all(ScreenUtil().setWidth(20)), 117 + EdgeInsets.all(ScreenUtil().setWidth(30)),
  118 + color: MyColours.color_F0F0F0,
117 child: Text( 119 child: Text(
118 '使用说明：需在结账前出示优惠券二维码，店内工作人员微信扫码核销。超过有效期的券，会自动作废并移出列表。优惠券不可找零、兑现。', 120 '使用说明：需在结账前出示优惠券二维码，店内工作人员微信扫码核销。超过有效期的券，会自动作废并移出列表。优惠券不可找零、兑现。',
119 style: TextStyle( 121 style: TextStyle(
120 - color: MyColours.color_333333,  
121 - fontSize: ScreenUtil().setSp(28), 122 + color: MyColours.color_666666,
  123 + fontSize: ScreenUtil().setSp(24),
122 ), 124 ),
123 strutStyle: StrutStyle( 125 strutStyle: StrutStyle(
124 forceStrutHeight: true, 126 forceStrutHeight: true,
@@ -209,7 +209,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -209,7 +209,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
209 // ), 209 // ),
210 VEmptyView(40), 210 VEmptyView(40),
211 MyItem( 211 MyItem(
212 - title: "活动创建", 212 + title: "线上券创建",
213 content: '', 213 content: '',
214 callback: () { 214 callback: () {
215 NavigatorUtil.goCouponPage(context); 215 NavigatorUtil.goCouponPage(context);
@@ -60,4 +60,11 @@ class MyColours { @@ -60,4 +60,11 @@ class MyColours {
60 static const Color color_0D0D0D = Color(0xff0D0D0D); 60 static const Color color_0D0D0D = Color(0xff0D0D0D);
61 static const Color color_24A4A8 = Color(0xff24A4A8); 61 static const Color color_24A4A8 = Color(0xff24A4A8);
62 static const Color color_F59A23 = Color(0xffF59A23); 62 static const Color color_F59A23 = Color(0xffF59A23);
  63 + static const Color color_FFF0E5 = Color(0xffFFF0E5);
  64 + static const Color color_F05522 = Color(0xffF05522);
  65 + static const Color color_EF7249 = Color(0xffEF7249);
  66 + static const Color color_FFE2D3 = Color(0xffFFE2D3);
  67 + static const Color color_EEF0F2 = Color(0xffEEF0F2);
  68 + static const Color color_B7B7B7 = Color(0xffB7B7B7);
  69 + static const Color color_E9E9E9 = Color(0xffE9E9E9);
63 } 70 }
@@ -62,7 +62,9 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget { @@ -62,7 +62,9 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget {
62 alignment: Alignment.center, 62 alignment: Alignment.center,
63 child: Text( 63 child: Text(
64 rightImgName, 64 rightImgName,
65 - style: TextStyle(color: MyColours.app_main), 65 + style: TextStyle(
  66 + color: MyColours.color_199095,
  67 + fontSize: ScreenUtil().setSp(34)),
66 ), 68 ),
67 )), 69 )),
68 ) 70 )