diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 556654a0..b65c6da1 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -14,6 +14,7 @@ import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:image_pickers/image_pickers.dart'; +import 'package:photo_view/photo_view.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:video_player/video_player.dart'; @@ -171,7 +172,10 @@ class _CommunityDynamic extends State { children: [ GestureDetector( onTap: (){ - // ImagePickers.previewImages(widget.comment.memberInfo.avatar); + Navigator.push(context, MaterialPageRoute( builder: (context) => PhotoViewGalleryScreen( + images:[widget?.comment?.memberInfo?.avatar ?? ""],//传入图片list + index: 0,//传入当前点击的图片的index + ), ), ); }, child: MImage( widget?.comment?.memberInfo?.avatar ?? "", @@ -339,6 +343,10 @@ class _CommunityDynamic extends State { child: InkWell( onTap: () { ImagePickers.previewImages(subjectInfo.images,0); + // Navigator.push(context, MaterialPageRoute( builder: (context) => PhotoViewGalleryScreen( + // images:subjectInfo.images,//传入图片list + // index: 0,//传入当前点击的图片的index + // ), ), ); }, child: MImage( subjectInfo.images[0], diff --git a/lib/integral/intergra_view/integral_vip.dart b/lib/integral/intergra_view/integral_vip.dart index 813aac89..2295200e 100644 --- a/lib/integral/intergra_view/integral_vip.dart +++ b/lib/integral/intergra_view/integral_vip.dart @@ -44,7 +44,7 @@ class _IntegralVip extends State { Expanded( child: Container( margin: EdgeInsets.only(left: 15.w), - height: 50.h, + height: 53.h, child: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index 57b3d053..b5f418ea 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -98,7 +98,12 @@ class _MineView extends State { String tableId = uri.queryParameters["tableId"]; String tenantCode = uri.queryParameters["tenantCode"]; String shopId = uri.queryParameters["shopId"]; - if (tableId != null && tableId != "" && tenantCode != null && tenantCode != "" && shopId != null && shopId != "") { + if (tableId != null && + tableId != "" && + tenantCode != null && + tenantCode != "" && + shopId != null && + shopId != "") { Navigator.of(context).pushNamed( '/router/store_order', arguments: { @@ -156,7 +161,7 @@ class _MineView extends State { Expanded( flex: 1, child: Container( - height: 50.h, + height: 53.h, child: Column( mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.stretch, @@ -211,7 +216,7 @@ class _MineView extends State { : Text( widget.userInfo == null ? "" - : "NO.${widget.userInfo.vipNo}", + : "我的积分:${widget.userInfo.points}", style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, @@ -236,28 +241,34 @@ class _MineView extends State { alignment: Alignment.bottomRight, height: 50.h, child: GestureDetector( - onTap: () { - widget.toIntegralPage(); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Text( - S.of(context).jifenxiangqing, - style: TextStyle( - color: Colors.black, - fontSize: 12.sp, - fontWeight: MyFontWeight.semi_bold, - ), + onTap: () { + widget.toIntegralPage(); + }, + child: Container( + padding: EdgeInsets.only(top: 4, bottom: 4, right: 16,left: 7), + decoration: BoxDecoration( + color: Color(0xFF87E8B0), + borderRadius: BorderRadius.only(topLeft: Radius.circular(100),bottomLeft:Radius.circular(100)), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text( + S.of(context).jifenxiangqing, + style: TextStyle( + color: Colors.black, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), + ), + Icon( + Icons.keyboard_arrow_right, + size: 16, + color: Colors.black, + ) + ], ), - Icon( - Icons.keyboard_arrow_right, - size: 16, - color: Colors.black, - ) - ], - ), - ), + )), ), ], ),