From 4127b54e566534ce4161cab15a206070ea72c404 Mon Sep 17 00:00:00 2001 From: datang Date: Wed, 6 Apr 2022 10:58:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=91=E7=9A=84/=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E2=80=94=E2=80=94=E6=A0=87=E9=A2=98=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=94=B9=E4=B8=BA=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/personal/intergral/integral_center_page.dart | 2 +- lib/pages/tab_navigator.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/personal/intergral/integral_center_page.dart b/lib/pages/personal/intergral/integral_center_page.dart index c2011265..1301f15b 100644 --- a/lib/pages/personal/intergral/integral_center_page.dart +++ b/lib/pages/personal/intergral/integral_center_page.dart @@ -168,7 +168,7 @@ class _integralCenterPageState extends State { child: Assets.icons.vipFont.image(height: 32.w), ), TextSpan( - text: ' 积分中心', + text: ' 会员中心', style: TextStyle( color: Colors.white.withOpacity(0.85), fontSize: 36.w, diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 4e7f1b87..5b632c8d 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -91,7 +91,7 @@ class _TabNavigatorState extends State R.ASSETS_ICONS_TABBAR_MARKET_NO_PNG, R.ASSETS_ICONS_TABBAR_MARKET_PNG, ), - BottomNavigationBarItem(icon: Container()), + // BottomNavigationBarItem(icon: Container()), _buildBottomBar( '社区', Assets.home.icShequNor.path, From 71c6a7a1e4cc87d7659bc6fb5fd25aab0f1581fc Mon Sep 17 00:00:00 2001 From: datang Date: Wed, 6 Apr 2022 11:09:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=9F=8E/=E8=AF=A6=E6=83=85/?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=94=B6=E8=97=8F=E2=80=94=E2=80=94=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=8A=9F=E8=83=BD=E9=9C=80=E8=A6=81=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ui/market/search/good_detail_page.dart | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/ui/market/search/good_detail_page.dart b/lib/ui/market/search/good_detail_page.dart index 682d9b52..965e3cd4 100644 --- a/lib/ui/market/search/good_detail_page.dart +++ b/lib/ui/market/search/good_detail_page.dart @@ -611,29 +611,29 @@ class _GoodDetailPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ 40.wb, - GestureDetector( - onTap: () async { - await CollectionFunc.collection(_goodDetail!.id); - _refreshController.callRefresh(); - }, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - _goodDetail!.isCollection == 0 - ? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG - : R.ASSETS_ICONS_SHOP_FAVORFILL_PNG, - width: 48.w, - height: 48.w, - ), - Text( - '加入收藏', - style: TextStyle(fontSize: 20.sp, color: ktextPrimary), - ), - ], - ), - ), + // GestureDetector( + // onTap: () async { + // await CollectionFunc.collection(_goodDetail!.id); + // _refreshController.callRefresh(); + // }, + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.center, + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // Image.asset( + // _goodDetail!.isCollection == 0 + // ? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG + // : R.ASSETS_ICONS_SHOP_FAVORFILL_PNG, + // width: 48.w, + // height: 48.w, + // ), + // Text( + // '加入收藏', + // style: TextStyle(fontSize: 20.sp, color: ktextPrimary), + // ), + // ], + // ), + // ), 40.wb, GestureDetector( onTap: () async { @@ -656,7 +656,7 @@ class _GoodDetailPageState extends State { ], ), ), - 40.wb, + 80.wb, Row( children: [ GestureDetector( From 399d228a64bd1d99c955eac74a3adbc84c57fad6 Mon Sep 17 00:00:00 2001 From: datang Date: Wed, 6 Apr 2022 11:18:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=9F=8E/=E8=AF=A6=E6=83=85/?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=94=B6=E8=97=8F=E2=80=94=E2=80=94=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activity_detail_page.dart | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/ui/community/activity/activity_detail_page.dart b/lib/ui/community/activity/activity_detail_page.dart index 01eeefb9..75d8eef2 100644 --- a/lib/ui/community/activity/activity_detail_page.dart +++ b/lib/ui/community/activity/activity_detail_page.dart @@ -237,40 +237,40 @@ class _ActivityDetailPageState extends State { format: 'yyyy.MM.dd HH:mm', )}', ), - 16.hb, - Row( - children: [ - '活动方式'.text.size(28.sp).make().box.width(136.w).make(), - '本次活动介绍' - .richText - .tap(() { - var bottomSheet = Container( - width: double.infinity, - padding: EdgeInsets.all(32.w), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(16.w)), - child: Column( - children: [ - '活动介绍'.text.size(32.sp).black.bold.make(), - 32.w.heightBox, - _model!.content.text - .size(28.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ], - ), - ); - Get.bottomSheet( - bottomSheet, - ); - }) - .size(28.sp) - .color(Colors.blue) - .make(), - Spacer(), - ], - ), + // 16.hb, + // Row( + // children: [ + // '活动方式'.text.size(28.sp).make().box.width(136.w).make(), + // '本次活动介绍' + // .richText + // .tap(() { + // var bottomSheet = Container( + // width: double.infinity, + // padding: EdgeInsets.all(32.w), + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.circular(16.w)), + // child: Column( + // children: [ + // '活动介绍'.text.size(32.sp).black.bold.make(), + // 32.w.heightBox, + // _model!.content.text + // .size(28.sp) + // .color(Colors.black.withOpacity(0.65)) + // .make(), + // ], + // ), + // ); + // Get.bottomSheet( + // bottomSheet, + // ); + // }) + // .size(28.sp) + // .color(Colors.blue) + // .make(), + // Spacer(), + // ], + // ), 16.hb, Row( children: [