1.90正式版

4 years ago · 9374ee6978
parent f4d19cdb12
commit 9374ee6978
6 changed files with 69 additions and 38 deletions
--- a/lib/pages/buy_tickets/airplane_detail_page.dart
+++ b/lib/pages/buy_tickets/airplane_detail_page.dart
@ -25,17 +25,17 @@ class _AirplaneDetailPageState extends State<AirplaneDetailPage> {
  void initState() {
    super.initState();
    _passengerList
-        .add(Item(item: '张伟', choice: false, num: '123243354543645456'));
+        .add(Item(item: '张伟', choice: false, num: '12345678901234567890'));
    _passengerList
-        .add(Item(item: '欧阳青青', choice: false, num: '123123546576863432'));
+        .add(Item(item: '欧阳青青', choice: false, num: '12345678901234567'));
    _passengerList
-        .add(Item(item: '小星星', choice: false, num: '76573353456435435345'));
+        .add(Item(item: '小星星', choice: false, num: '12345678901234567890'));
    _passengerList
-        .add(Item(item: '吕小树', choice: false, num: '54676578658234234'));
+        .add(Item(item: '吕小树', choice: false, num: '12345678901234567890'));
    _passengerList
-        .add(Item(item: '吕小树', choice: false, num: '54676578658234234'));
+        .add(Item(item: '吕小树', choice: false, num: '12345678901234567890'));
    _passengerList
-        .add(Item(item: '吕小树', choice: false, num: '54676578658234234'));
+        .add(Item(item: '吕小树', choice: false, num: '12345678901234567890'));
  }

  @override
@ -427,7 +427,7 @@ class _AirplaneDetailPageState extends State<AirplaneDetailPage> {
      child: Column(
        children: [
          Container(
-            padding: EdgeInsets.symmetric(horizontal: 10.rw),
+            padding: EdgeInsets.symmetric(horizontal: 15.rw),
            height: 148.rw,
            decoration: BoxDecoration(
              borderRadius: BorderRadius.all(Radius.circular(4.rw)),
@ -491,18 +491,29 @@ class _AirplaneDetailPageState extends State<AirplaneDetailPage> {

  _getPassengerItem(Item item, index, VoidCallback onPressed) {
    return Container(
+      padding: EdgeInsets.only(top: 10.rw),
      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
-          Text(
-            item.item,
-            style: TextStyle(fontSize: 14.rsp, color: Color(0xFF666666)),
+          Container(
+            width: 80.rw,
+            child: Text(
+              item.item,
+              style: TextStyle(
+                  fontSize: 16.rsp,
+                  color: Color(0xFF333333),
+                  fontWeight: FontWeight.bold),
+            ),
          ),
-          Text(
-            item.item,
-            style: TextStyle(fontSize: 14.rsp, color: Color(0xFF666666)),
+          20.wb,
+          Container(
+            width: 200.rw,
+            child: Text(
+              _getCardId(item.num),
+              style: TextStyle(fontSize: 16.rsp, color: Color(0xFF666666)),
+            ),
          ),
-          Icon(CupertinoIcons.check_mark, size: 20, color: Colors.white),
+          30.wb,
+          Icon(CupertinoIcons.check_mark, size: 20, color: Colors.blue),
        ],
      ),
    );
@ -517,7 +528,10 @@ class _AirplaneDetailPageState extends State<AirplaneDetailPage> {
            alignment: Alignment.centerLeft,
            child: Text(
              "选择乘客",
-              style: TextStyle(fontSize: 16.rsp, color: Color(0xFF333333)),
+              style: TextStyle(
+                  fontSize: 16.rsp,
+                  color: Color(0xFF333333),
+                  fontWeight: FontWeight.bold),
            ),
          ),
        ),
@ -556,10 +570,23 @@ class _AirplaneDetailPageState extends State<AirplaneDetailPage> {
              });
            });
          }, childCount: 3),
-        )
+        ),
+        SliverToBoxAdapter(child: 20.hb),
      ],
    ).expand();
  }
+
+  _getCardId(String id) {
+    String hear = id.substring(0, 4);
+    String foot = id.substring(id.length - 3);
+    String newId = '';
+    if (id.length > 7) {
+      for (var i = 0; i < id.length - 7; i++) {
+        newId += '*';
+      }
+    }
+    return hear + newId + foot;
+  }
 }

 class Item {
--- a/lib/pages/user/setting_page.dart
+++ b/lib/pages/user/setting_page.dart
@ -84,10 +84,10 @@ class _SettingItemListViewState extends BaseStoreState<SettingItemListView> {
                      }),

                      //购票临时入口
-                      SCTile.normalTile("购票(临时)", listener: () {
-                        Get.to(() => ChooseTicketsTypePage());
-                        //CRoute.push(context, PrivacyPageV2());
-                      }),
+                      // SCTile.normalTile("购票(临时)", listener: () {
+                      //   Get.to(() => ChooseTicketsTypePage());
+                      //   //CRoute.push(context, PrivacyPageV2());
+                      // }),

                      getEmptyBox(),
                      SCTile.normalTile("退出登录", listener: () {
--- a/lib/pages/user/user_benefit_currency_pag.dart
+++ b/lib/pages/user/user_benefit_currency_pag.dart
@ -377,25 +377,30 @@ class _UserBenefitCurrencyPageState extends State<UserBenefitCurrencyPage> {
      clipBehavior: Clip.antiAlias,
      height: 146.rw,
      decoration: BoxDecoration(
+        color: Colors.white,
        borderRadius: BorderRadius.circular(5.rw),
        boxShadow: [
          BoxShadow(
-            offset: Offset(0, 1.rw),
+            offset: Offset(0, 2.rw),
            color: Color.fromRGBO(166, 166, 173, 0.43),
            blurRadius: 6.rw,
          )
        ],
-        image: DecorationImage(
-          image: AssetImage(UserLevelTool.currentCardImagePath()),
-          fit: BoxFit.cover,
-        ),
      ),
      child: Column(
        children: [
          Container(
            decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(5.rw),
+                boxShadow: [
+                  BoxShadow(
+                    offset: Offset(0, 1.rw),
+                    color: Color.fromRGBO(166, 166, 173, 0.43),
+                    blurRadius: 6.rw,
+                  )
+                ],
                image: DecorationImage(
-                  fit: BoxFit.cover,
+                  fit: BoxFit.fill,
                  image: AssetImage(UserLevelTool.currentCardImagePath()),
                ),
                color: Colors.transparent),
@ -407,7 +412,7 @@ class _UserBenefitCurrencyPageState extends State<UserBenefitCurrencyPage> {
                  padding: role != UserRoleLevel.Diamond_1 &&
                          role != UserRoleLevel.Diamond_2 &&
                          _notSelfNotGUide
-                      ? EdgeInsets.only(top: 25.rw)
+                      ? EdgeInsets.only(top: 22.rw)
                      : EdgeInsets.only(top: 0.rw),
                  child: Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
@ -534,7 +539,7 @@ class _UserBenefitCurrencyPageState extends State<UserBenefitCurrencyPage> {
          _amount = _models?.amount?.toStringAsFixed(2);
          _all = _models?.all?.toStringAsFixed(2);
          //对隐藏列表全部置为隐藏
-          for (int i = 0; i < _models.detail.length; i++) {
+          for (int i = 0; i < _models?.detail?.length; i++) {
            _gone.add(true);
          }
          for (int i = 0; i < _gone.length; i++) {
--- a/lib/pages/user/user_benefit_shop_page.dart
+++ b/lib/pages/user/user_benefit_shop_page.dart
@ -61,6 +61,7 @@ class _UserBenefitShopPageState extends State<UserBenefitShopPage> {
  bool _sortMoney = true;

  bool _isOver = false;
+  String _text = '';

  GSRefreshController _refreshController = GSRefreshController();

@ -75,11 +76,7 @@ class _UserBenefitShopPageState extends State<UserBenefitShopPage> {
              Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
-                  ('当日未到账补贴(瑞币)')
-                      .text
-                      .color(Colors.black54)
-                      .size(16.rsp)
-                      .make(),
+                  _text.text.color(Colors.black54).size(16.rsp).make(),
                  _amount.text.color(Color(0xFF333333)).size(34.rsp).make(),
                ],
              ),
@ -570,8 +567,10 @@ class _UserBenefitShopPageState extends State<UserBenefitShopPage> {
    super.initState();
    _date = widget.date;
    if (widget.receivedType == '未到账') {
+      _text = '当日未到账补贴(瑞币)';
      _formatType = 'MM-dd';
    } else if (widget.receivedType == '已到账') {
+      _text = '当月已到账补贴(瑞币)';
      _formatType = 'yyyy-MM';
    }

--- a/pubspec.lock
+++ b/pubspec.lock
@ -56,7 +56,7 @@ packages:
      name: async
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
  audio_session:
    dependency: transitive
    description:
@ -1246,7 +1246,7 @@ packages:
      name: source_span
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
  sp_util:
    dependency: transitive
    description:
@ -1334,7 +1334,7 @@ packages:
      name: test_api
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
  timeline_tile:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -2,7 +2,7 @@ name: recook
 description: Recook Market App.
 publish_to: "none"

-version: 1.8.6-dev+305
+version: 1.9.0-dev+306
 environment:
  sdk: ">=2.10.0 <3.0.0"