xt / Flutter-ReserveApp · Commits

Go to a project

Commit 28cb2550860b71743b159932a771197ff3161a8a

Authored by wdn127929
1 parent 72bb927d
build: skipped

小程序卡片样式调整

Inline Side-by-side
Showing 2 changed files with 152 additions and 111 deletions
@@ -10,10 +10,10 @@ class Constant { @@ -10,10 +10,10 @@ class Constant {
10 * 10 *
11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！ 11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
12 * */ 12 * */
13 - static const WXMiniProgramType wxMiniProgramType =  
14 - WXMiniProgramType.release; //正式版  
15 // static const WXMiniProgramType wxMiniProgramType = 13 // static const WXMiniProgramType wxMiniProgramType =
16 - // WXMiniProgramType.preview; //体验版 14 + // WXMiniProgramType.release; //正式版
  15 + static const WXMiniProgramType wxMiniProgramType =
  16 + WXMiniProgramType.preview; //体验版
17 // static const WXMiniProgramType wxMiniProgramType = 17 // static const WXMiniProgramType wxMiniProgramType =
18 // WXMiniProgramType.test; //开发版 18 // WXMiniProgramType.test; //开发版
19 19
@@ -41,7 +41,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -41,7 +41,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
41 late MarketingCenterProvider marketingCenterProvider; 41 late MarketingCenterProvider marketingCenterProvider;
42 ScrollController controller = ScrollController(); 42 ScrollController controller = ScrollController();
43 43
44 - String miniType = '2-4'; 44 + String miniType = '3';
45 late PageController pageController; 45 late PageController pageController;
46 double? pageOffset = 0; 46 double? pageOffset = 0;
47 47
@@ -49,6 +49,9 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -49,6 +49,9 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
49 49
50 List<String> types = [ 50 List<String> types = [
51 '0', 51 '0',
  52 + '1',
  53 + '2',
  54 + '3',
52 '1-1', 55 '1-1',
53 '1-2', 56 '1-2',
54 '1-3', 57 '1-3',
@@ -89,10 +92,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -89,10 +92,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
89 showLoading: false, selfDismiss: true); 92 showLoading: false, selfDismiss: true);
90 if (success) { 93 if (success) {
91 marketingCenterProvider.pageStateSettingMini = PageState.Success; 94 marketingCenterProvider.pageStateSettingMini = PageState.Success;
92 - miniType = marketingCenterProvider.dzSellerConfModel!.liteStyle ?? '2-4';  
93 - if (miniType == '1' || miniType == '2' || miniType == '3') {  
94 - miniType = '2-4';  
95 - } 95 + miniType = marketingCenterProvider.dzSellerConfModel!.liteStyle ?? '3';
96 tilteContentC.text = marketingCenterProvider 96 tilteContentC.text = marketingCenterProvider
97 .dzSellerConfModel!.liteStyleTitle ?? 97 .dzSellerConfModel!.liteStyleTitle ??
98 "您预订的${Provider.of<UserModel>(context, listen: false).user!.sellername}，已经安排，点击查看详情"; 98 "您预订的${Provider.of<UserModel>(context, listen: false).user!.sellername}，已经安排，点击查看详情";
@@ -224,7 +224,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -224,7 +224,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
224 return Container( 224 return Container(
225 color: MyColours.color_99000000, 225 color: MyColours.color_99000000,
226 padding: EdgeInsets.symmetric(horizontal: w(10)), 226 padding: EdgeInsets.symmetric(horizontal: w(10)),
227 - width: w(210), 227 + // width: w(210),
228 height: h(168), 228 height: h(168),
229 alignment: Alignment.center, 229 alignment: Alignment.center,
230 child: Text( 230 child: Text(
@@ -237,6 +237,58 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -237,6 +237,58 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
237 fontSize: font(20)), 237 fontSize: font(20)),
238 ), 238 ),
239 ); 239 );
  240 + } else if (types[index] == '1' ||
  241 + types[index] == '2' ||
  242 + types[index] == '3') {
  243 + return Container(
  244 + color: Color.fromRGBO(81, 81, 81, 0.4),
  245 + padding: EdgeInsets.symmetric(horizontal: w(10)),
  246 + // width: w(180),
  247 + height: h(168),
  248 + child: Column(
  249 + children: [
  250 + VEmptyView(20),
  251 + Text(
  252 + '${Provider.of<UserModel>(context, listen: false).user!.sellername!}',
  253 + textAlign: TextAlign.center,
  254 + maxLines: 2,
  255 + overflow: TextOverflow.ellipsis,
  256 + style: TextStyle(
  257 + color: MyColours.color_FFEFC5,
  258 + fontSize: font(12)),
  259 + ),
  260 + VEmptyView(54),
  261 + Text(
  262 + '${Utils.addZeroNumber(DateTime.now().month)}月${Utils.addZeroNumber(DateTime.now().day)}日',
  263 + textAlign: TextAlign.center,
  264 + maxLines: 2,
  265 + overflow: TextOverflow.ellipsis,
  266 + style: TextStyle(
  267 + color: MyColours.color_FFEFC5,
  268 + fontWeight: FontWeight.bold,
  269 + fontSize: font(36)),
  270 + ),
  271 + VEmptyView(10),
  272 + Text(
  273 + returnWeek(DateTime.now(), context) +
  274 + (types[index] == '1'
  275 + ? '中午'
  276 + : types[index] == '2'
  277 + ? (user!.noon != '00:00'
  278 + ? user!.noon!.split('-')[0]
  279 + : '14:30')
  280 + : '午餐'),
  281 + textAlign: TextAlign.center,
  282 + maxLines: 2,
  283 + overflow: TextOverflow.ellipsis,
  284 + style: TextStyle(
  285 + color: MyColours.color_FFEFC5,
  286 + fontWeight: FontWeight.bold,
  287 + fontSize: font(18)),
  288 + )
  289 + ],
  290 + ),
  291 + );
240 } else { 292 } else {
241 List<String> subType = types[index].split('-'); 293 List<String> subType = types[index].split('-');
242 String subType0 = subType[0]; //几号模版 294 String subType0 = subType[0]; //几号模版
@@ -244,12 +296,13 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -244,12 +296,13 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
244 if (subType0 == '1') { 296 if (subType0 == '1') {
245 //1号模版 297 //1号模版
246 String month = 298 String month =
247 - '${Utils.addZeroNumber(DateTime.now().month)}月${Utils.addZeroNumber(DateTime.now().day)}日 ';  
248 - String week = returnWeek(DateTime.now(), context); 299 + '${Utils.addZeroNumber(DateTime.now().month)}月${Utils.addZeroNumber(DateTime.now().day)}日';
  300 + String week =
  301 + returnWeek(DateTime.now(), context).trim();
249 String hour = subType1 == '1' || subType1 == '3' 302 String hour = subType1 == '1' || subType1 == '3'
250 ? (user!.noon != '00:00' 303 ? (user!.noon != '00:00'
251 - ? '${user!.noon!.split('-')[0]} '  
252 - : '14:30 ') 304 + ? '${user!.noon!.split('-')[0]}'
  305 + : '14:30')
253 : ''; 306 : '';
254 String section = 307 String section =
255 subType1 == '1' || subType1 == '4' 308 subType1 == '1' || subType1 == '4'
@@ -258,7 +311,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -258,7 +311,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
258 ? '中午' 311 ? '中午'
259 : ''; 312 : '';
260 313
261 - String time = month + week + hour + section; 314 + if (hour != '' && section != '') {
  315 + hour = hour + ' ';
  316 + }
  317 +
  318 + String time =
  319 + month + ' ' + week + ' ' + hour + section;
262 320
263 return Container( 321 return Container(
264 color: MyColours.color_ffffff, 322 color: MyColours.color_ffffff,
@@ -272,8 +330,8 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -272,8 +330,8 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
272 alignment: Alignment.center, 330 alignment: Alignment.center,
273 // color: Color.fromRGBO(81, 81, 81, 0.4), 331 // color: Color.fromRGBO(81, 81, 81, 0.4),
274 color: MyColours.color_99000000, 332 color: MyColours.color_99000000,
275 - width: w(210),  
276 - height: h(26), 333 + // width: w(210),
  334 + height: h(28),
277 child: Text( 335 child: Text(
278 '${Provider.of<UserModel>(context, listen: false).user!.sellername}', 336 '${Provider.of<UserModel>(context, listen: false).user!.sellername}',
279 textAlign: TextAlign.center, 337 textAlign: TextAlign.center,
@@ -282,14 +340,16 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -282,14 +340,16 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
282 style: TextStyle( 340 style: TextStyle(
283 fontWeight: FontWeight.bold, 341 fontWeight: FontWeight.bold,
284 color: MyColours.color_FFEFC5, 342 color: MyColours.color_FFEFC5,
285 - fontSize: font(12)), 343 + fontSize: font(16)),
286 )), 344 )),
287 Container( 345 Container(
288 alignment: Alignment.center, 346 alignment: Alignment.center,
  347 + padding: EdgeInsets.symmetric(
  348 + horizontal: w(2)),
289 // color: Color.fromRGBO(81, 81, 81, 0.4), 349 // color: Color.fromRGBO(81, 81, 81, 0.4),
290 color: MyColours.color_99000000, 350 color: MyColours.color_99000000,
291 - width: w(210),  
292 - height: h(26), 351 + // width: w(220),
  352 + height: h(28),
293 child: Text( 353 child: Text(
294 time, 354 time,
295 textAlign: TextAlign.center, 355 textAlign: TextAlign.center,
@@ -298,7 +358,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -298,7 +358,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
298 style: TextStyle( 358 style: TextStyle(
299 color: MyColours.color_FFEFC5, 359 color: MyColours.color_FFEFC5,
300 fontWeight: FontWeight.bold, 360 fontWeight: FontWeight.bold,
301 - fontSize: font(12)), 361 + fontSize: font(16)),
302 )), 362 )),
303 ], 363 ],
304 ), 364 ),
@@ -326,11 +386,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -326,11 +386,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
326 color: MyColours.color_99000000, 386 color: MyColours.color_99000000,
327 padding: 387 padding:
328 EdgeInsets.symmetric(horizontal: w(10)), 388 EdgeInsets.symmetric(horizontal: w(10)),
329 - width: w(210), 389 + // width: w(210),
330 height: h(168), 390 height: h(168),
331 child: Column( 391 child: Column(
332 children: [ 392 children: [
333 - VEmptyView(66), 393 + VEmptyView(64),
334 Text( 394 Text(
335 '${Provider.of<UserModel>(context, listen: false).user!.sellername}', 395 '${Provider.of<UserModel>(context, listen: false).user!.sellername}',
336 textAlign: TextAlign.center, 396 textAlign: TextAlign.center,
@@ -339,20 +399,21 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -339,20 +399,21 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
339 style: TextStyle( 399 style: TextStyle(
340 fontWeight: FontWeight.bold, 400 fontWeight: FontWeight.bold,
341 color: MyColours.color_FFEFC5, 401 color: MyColours.color_FFEFC5,
342 - fontSize: font(12)), 402 + fontSize: font(16)),
343 ), 403 ),
344 VEmptyView(60), 404 VEmptyView(60),
345 Text( 405 Text(
346 '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)}', 406 '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)}',
347 textAlign: TextAlign.center, 407 textAlign: TextAlign.center,
348 - maxLines: 2, 408 + maxLines: 1,
349 overflow: TextOverflow.ellipsis, 409 overflow: TextOverflow.ellipsis,
350 style: TextStyle( 410 style: TextStyle(
  411 + height: 1,
351 color: MyColours.color_FFEFC5, 412 color: MyColours.color_FFEFC5,
352 fontWeight: FontWeight.bold, 413 fontWeight: FontWeight.bold,
353 - fontSize: font(24)), 414 + fontSize: font(36)),
354 ), 415 ),
355 - VEmptyView(8), 416 + // VEmptyView(8),
356 Text( 417 Text(
357 time, 418 time,
358 textAlign: TextAlign.center, 419 textAlign: TextAlign.center,
@@ -361,7 +422,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -361,7 +422,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
361 style: TextStyle( 422 style: TextStyle(
362 color: MyColours.color_FFEFC5, 423 color: MyColours.color_FFEFC5,
363 fontWeight: FontWeight.bold, 424 fontWeight: FontWeight.bold,
364 - fontSize: font(12)), 425 + fontSize: font(16)),
365 ) 426 )
366 ], 427 ],
367 ), 428 ),
@@ -391,23 +452,24 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -391,23 +452,24 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
391 452
392 return Container( 453 return Container(
393 color: MyColours.color_99000000, 454 color: MyColours.color_99000000,
394 - width: w(210), 455 + // width: w(210),
395 height: h(168), 456 height: h(168),
396 padding: EdgeInsets.only( 457 padding: EdgeInsets.only(
397 right: w(20), bottom: w(20)), 458 right: w(20), bottom: w(20)),
398 child: Column( 459 child: Column(
399 mainAxisAlignment: 460 mainAxisAlignment:
400 MainAxisAlignment.spaceBetween, 461 MainAxisAlignment.spaceBetween,
  462 + crossAxisAlignment: CrossAxisAlignment.end,
401 children: [ 463 children: [
402 Container( 464 Container(
403 alignment: Alignment.centerLeft, 465 alignment: Alignment.centerLeft,
404 padding: EdgeInsets.only( 466 padding: EdgeInsets.only(
405 - top: w(20), 467 + top: w(18),
406 left: w(12), 468 left: w(12),
407 right: w(12)), 469 right: w(12)),
408 // color: Color.fromRGBO(81, 81, 81, 0.4), 470 // color: Color.fromRGBO(81, 81, 81, 0.4),
409 471
410 - width: w(210), 472 + // width: w(210),
411 // height: h(26), 473 // height: h(26),
412 child: Text( 474 child: Text(
413 '${Provider.of<UserModel>(context, listen: false).user!.sellername}', 475 '${Provider.of<UserModel>(context, listen: false).user!.sellername}',
@@ -417,7 +479,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -417,7 +479,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
417 style: TextStyle( 479 style: TextStyle(
418 fontWeight: FontWeight.bold, 480 fontWeight: FontWeight.bold,
419 color: MyColours.color_FFEFC5, 481 color: MyColours.color_FFEFC5,
420 - fontSize: font(12)), 482 + fontSize: font(16)),
421 )), 483 )),
422 Column( 484 Column(
423 // crossAxisAlignment: 485 // crossAxisAlignment:
@@ -427,14 +489,14 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -427,14 +489,14 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
427 children: [ 489 children: [
428 Container( 490 Container(
429 alignment: Alignment.centerRight, 491 alignment: Alignment.centerRight,
430 - height: w(34), 492 + // height: w(34),
431 child: Row( 493 child: Row(
432 mainAxisAlignment: 494 mainAxisAlignment:
433 MainAxisAlignment.end, 495 MainAxisAlignment.end,
434 children: [ 496 children: [
435 Text( 497 Text(
436 month, 498 month,
437 - textAlign: TextAlign.center, 499 + textAlign: TextAlign.right,
438 maxLines: 1, 500 maxLines: 1,
439 overflow: 501 overflow:
440 TextOverflow.ellipsis, 502 TextOverflow.ellipsis,
@@ -443,11 +505,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -443,11 +505,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
443 .color_FFEFC5, 505 .color_FFEFC5,
444 fontWeight: 506 fontWeight:
445 FontWeight.bold, 507 FontWeight.bold,
446 - fontSize: font(24)), 508 + fontSize: font(40)),
447 ), 509 ),
  510 + HEmptyView(5),
448 Container( 511 Container(
449 - width: w(10),  
450 - height: w(34), 512 + width: w(16),
  513 + // height: w(34),
451 alignment: Alignment.center, 514 alignment: Alignment.center,
452 child: Text( 515 child: Text(
453 week, 516 week,
@@ -463,11 +526,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -463,11 +526,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
463 .color_FFEFC5, 526 .color_FFEFC5,
464 fontWeight: 527 fontWeight:
465 FontWeight.bold, 528 FontWeight.bold,
466 - fontSize: font(12)), 529 + fontSize: font(16)),
467 )), 530 )),
468 ], 531 ],
469 )), 532 )),
470 - VEmptyView(14), 533 + // VEmptyView(14),
471 Container( 534 Container(
472 535
473 // constraints: BoxConstraints( 536 // constraints: BoxConstraints(
@@ -488,7 +551,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -488,7 +551,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
488 style: TextStyle( 551 style: TextStyle(
489 color: MyColours.color_FFEFC5, 552 color: MyColours.color_FFEFC5,
490 fontWeight: FontWeight.bold, 553 fontWeight: FontWeight.bold,
491 - fontSize: font(10)), 554 + fontSize: font(16)),
492 )), 555 )),
493 ], 556 ],
494 ), 557 ),
@@ -498,7 +561,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -498,7 +561,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
498 } else { 561 } else {
499 //4号模版 562 //4号模版
500 String month = 563 String month =
501 - '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)}'; 564 + '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)} ';
502 String week = returnWeek(DateTime.now(), context); 565 String week = returnWeek(DateTime.now(), context);
503 String hour = subType1 == '1' || subType1 == '3' 566 String hour = subType1 == '1' || subType1 == '3'
504 ? (user!.noon != '00:00' 567 ? (user!.noon != '00:00'
@@ -513,97 +576,75 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -513,97 +576,75 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
513 : ''; 576 : '';
514 577
515 if (section != '' && hour != '') { 578 if (section != '' && hour != '') {
516 - hour = hour + ' '; 579 + hour = hour + ' ';
517 } 580 }
518 581
519 String time = hour + section; 582 String time = hour + section;
520 583
521 return Container( 584 return Container(
522 color: MyColours.color_ffffff, 585 color: MyColours.color_ffffff,
523 - width: w(210), 586 + // width: w(210),
524 height: h(168), 587 height: h(168),
525 child: Column( 588 child: Column(
526 - mainAxisAlignment:  
527 - MainAxisAlignment.spaceBetween, 589 + // mainAxisAlignment:
  590 + // MainAxisAlignment.spaceAround,
528 children: [ 591 children: [
529 Spacer(), 592 Spacer(),
530 Container( 593 Container(
531 // height: w(45), 594 // height: w(45),
532 color: MyColours.color_99000000, 595 color: MyColours.color_99000000,
533 padding: EdgeInsets.only( 596 padding: EdgeInsets.only(
534 - top: w(8),  
535 - left: w(8),  
536 - bottom: w(8),  
537 - right: w(13)),  
538 - child: Row(  
539 - mainAxisAlignment:  
540 - MainAxisAlignment.spaceBetween, 597 + top: w(6),
  598 + // left: w(8),
  599 + bottom: w(6),
  600 + // right: w(13)
  601 + ),
  602 + child: Column(
541 children: [ 603 children: [
542 - Expanded(  
543 - child: Text( 604 + Text(
544 '${Provider.of<UserModel>(context, listen: false).user!.sellername}', 605 '${Provider.of<UserModel>(context, listen: false).user!.sellername}',
545 textAlign: TextAlign.left, 606 textAlign: TextAlign.left,
546 overflow: TextOverflow.ellipsis, 607 overflow: TextOverflow.ellipsis,
547 style: TextStyle( 608 style: TextStyle(
548 fontWeight: FontWeight.bold, 609 fontWeight: FontWeight.bold,
549 color: MyColours.color_FFEFC5, 610 color: MyColours.color_FFEFC5,
550 - fontSize: font(10)),  
551 - )),  
552 - Column(  
553 - crossAxisAlignment:  
554 - CrossAxisAlignment.end, 611 + fontSize: font(16)),
  612 + ),
  613 + VEmptyView(16),
  614 + Row(
  615 + mainAxisAlignment:
  616 + MainAxisAlignment.center,
555 children: [ 617 children: [
556 - Container(  
557 - alignment:  
558 - Alignment.centerRight,  
559 - // height: w(34),  
560 - child: Row(  
561 - mainAxisAlignment:  
562 - MainAxisAlignment.end,  
563 - children: [  
564 - Text(  
565 - month,  
566 - textAlign:  
567 - TextAlign.right,  
568 - maxLines: 1,  
569 - overflow: TextOverflow  
570 - .ellipsis,  
571 - style: TextStyle(  
572 - color: MyColours  
573 - .color_FFEFC5,  
574 - fontWeight:  
575 - FontWeight  
576 - .bold,  
577 - fontSize:  
578 - font(10)),  
579 - ),  
580 - HEmptyView(10),  
581 - Container(  
582 - // width: w(10),  
583 - // height: w(34),  
584 - child: Text(  
585 - week,  
586 - textAlign:  
587 - TextAlign.right,  
588 - // maxLines: 3,  
589 - overflow: TextOverflow  
590 - .ellipsis,  
591 - style: TextStyle(  
592 - // writingMode: TextWritingMode.verticalLr,  
593 - color: MyColours  
594 - .color_FFEFC5,  
595 - fontWeight:  
596 - FontWeight  
597 - .bold,  
598 - fontSize:  
599 - font(10)),  
600 - )),  
601 - ],  
602 - )),  
603 - VEmptyView(8), 618 + Text(
  619 + month,
  620 + // textAlign: TextAlign.right,
  621 + maxLines: 1,
  622 + overflow:
  623 + TextOverflow.ellipsis,
  624 + style: TextStyle(
  625 + color: MyColours
  626 + .color_FFEFC5,
  627 + fontWeight:
  628 + FontWeight.bold,
  629 + fontSize: font(16)),
  630 + ),
  631 + Text(
  632 + week,
  633 + // textAlign: TextAlign.right,
  634 + // maxLines: 3,
  635 + overflow:
  636 + TextOverflow.ellipsis,
  637 + style: TextStyle(
  638 + // writingMode: TextWritingMode.verticalLr,
  639 + color: MyColours
  640 + .color_FFEFC5,
  641 + fontWeight:
  642 + FontWeight.bold,
  643 + fontSize: font(16)),
  644 + ),
604 Container( 645 Container(
605 alignment: Alignment.center, 646 alignment: Alignment.center,
606 - width: w(56), 647 + // width: w(87),
607 // height: w(13), 648 // height: w(13),
608 // constraints: BoxConstraints( 649 // constraints: BoxConstraints(
609 // maxWidth: w(300)), 650 // maxWidth: w(300)),
@@ -616,8 +657,8 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -616,8 +657,8 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
616 r(3))), 657 r(3))),
617 padding: 658 padding:
618 EdgeInsets.symmetric( 659 EdgeInsets.symmetric(
619 - // horizontal: w(1),  
620 - vertical: w(3)), 660 + horizontal: w(4),
  661 + vertical: w(2)),
621 // height: h(26), 662 // height: h(26),
622 child: Text( 663 child: Text(
623 time, 664 time,
@@ -629,7 +670,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -629,7 +670,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
629 .color_FFEFC5, 670 .color_FFEFC5,
630 fontWeight: 671 fontWeight:
631 FontWeight.bold, 672 FontWeight.bold,
632 - fontSize: font(10)), 673 + fontSize: font(16)),
633 )), 674 )),
634 ], 675 ],
635 ), 676 ),
@@ -668,7 +709,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -668,7 +709,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
668 }, 709 },
669 index: swiperController.index, 710 index: swiperController.index,
670 itemCount: types.length, 711 itemCount: types.length,
671 - viewportFraction: 0.5, 712 + viewportFraction: 0.58,
672 scale: 0.4, 713 scale: 0.4,
673 )) 714 ))
674 ], 715 ],