1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

Browse Source
pull/1/head
章文轩 3 years ago
parent 8b6c650d9f 399d228a64
commit 8fde6eb959
4 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File

2
lib/pages/personal/intergral/integral_center_page.dart
Unescape View File

@ -168,7 +168,7 @@ class _integralCenterPageState extends State<integralCenterPage> {
child: Assets.icons.vipFont.image(height: 32.w),
),
TextSpan(
text: ' 积分中心',
text: ' 会员中心',
style: TextStyle(
color: Colors.white.withOpacity(0.85),
fontSize: 36.w,

2
lib/pages/tab_navigator.dart
Unescape View File

@ -91,7 +91,7 @@ class _TabNavigatorState extends State<TabNavigator>
R.ASSETS_ICONS_TABBAR_MARKET_NO_PNG,
R.ASSETS_ICONS_TABBAR_MARKET_PNG,
),
BottomNavigationBarItem(icon: Container()),
// BottomNavigationBarItem(icon: Container()),
_buildBottomBar(
'社区',
Assets.home.icShequNor.path,

68
lib/ui/community/activity/activity_detail_page.dart
Unescape View File

@ -239,40 +239,40 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
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: [

48
lib/ui/market/search/good_detail_page.dart
Unescape View File

@ -611,29 +611,29 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
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<GoodDetailPage> {
],
),
),
40.wb,
80.wb,
Row(
children: [
GestureDetector(

Write Preview
Loading…
Cancel
Save