fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ios 更新

remove_uniapp
fmk 3 years ago
parent
03f66febe5
commit
1133013487
14 changed files with 80 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/community/community_course.dart
  3. 8
      lib/community/community_page.dart
  4. 38
      lib/community/community_view/community_dynamic.dart
  5. 28
      lib/community/community_view/home_class.dart
  6. 14
      lib/community/headlines/article_list.dart
  7. 4
      lib/home/guide_page.dart
  8. 18
      lib/login/login_page.dart
  9. 4
      lib/mine/mine_view/mine_view.dart
  10. 2
      lib/retrofit/min_api.dart
  11. 2
      lib/retrofit/retrofit_api.dart
  12. 20
      lib/store/store_order.dart
  13. 4
      lib/store/store_view/store_info.dart
  14. 4
      lib/union/union_view/union_coupon.dart

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -616,7 +616,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 87; CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.87; MARKETING_VERSION = 1.0.88;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -816,7 +816,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 87; CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.87; MARKETING_VERSION = 1.0.88;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -907,7 +907,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 87; CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.87; MARKETING_VERSION = 1.0.88;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

2
lib/community/community_course.dart
Unescape View File

@ -269,7 +269,7 @@ class _CommunityCourse extends State<CommunityCourse>
///课程banner ///课程banner
CourseBanner(bannerData,), CourseBanner(bannerData,),
SizedBox(height: 28), SizedBox(height: 28.h),
///合集列表 ///合集列表
HomeClass(collectMap,collectList,), HomeClass(collectMap,collectList,),

8
lib/community/community_page.dart
Unescape View File

@ -80,7 +80,7 @@ class _CommunityPage extends State<CommunityPage>
leading: false, leading: false,
titleChild: PreferredSize( titleChild: PreferredSize(
preferredSize: Size( preferredSize: Size(
MediaQuery.of(context).size.width - 60, MediaQuery.of(context).size.width - 60.w,
38.h, 38.h,
), ),
child: TabBar( child: TabBar(
@ -92,12 +92,12 @@ class _CommunityPage extends State<CommunityPage>
labelPadding: EdgeInsets.only(left: 8.w, right: 8.w), labelPadding: EdgeInsets.only(left: 8.w, right: 8.w),
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
unselectedLabelStyle: TextStyle( unselectedLabelStyle: TextStyle(
fontSize: 15.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp : 15.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
labelStyle: TextStyle( labelStyle: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 18.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp : 18.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
labelColor: Colors.black, labelColor: Colors.black,
@ -110,7 +110,7 @@ class _CommunityPage extends State<CommunityPage>
action: GestureDetector( action: GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: Container(color: Colors.transparent, child: Container(color: Colors.transparent,
padding: EdgeInsets.only(left: 20,right: 20), padding: EdgeInsets.only(left: 20.w,right: 20.w),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/shequ_fabu.svg", "assets/svg/shequ_fabu.svg",
fit: BoxFit.contain, fit: BoxFit.contain,

38
lib/community/community_view/community_dynamic.dart
Unescape View File

@ -159,10 +159,10 @@ class _CommunityDynamic extends State<CommunityDynamic> {
return Column( return Column(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(top: 2), margin: EdgeInsets.only(top: 2.h),
key: globalKey, key: globalKey,
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
padding: EdgeInsets.only(left: 16,top: 16,right: 16), padding: EdgeInsets.only(left: 16.w,top: 16.h,right: 16.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
boxShadow: [ boxShadow: [
@ -184,7 +184,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
height: 44, height: 44.h,
child: Row( child: Row(
children: [ children: [
GestureDetector( GestureDetector(
@ -213,7 +213,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
), ),
), ),
SizedBox( SizedBox(
width: 8, width: 8.w,
), ),
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@ -222,7 +222,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
Text( Text(
widget?.article?.authorName ?? "", widget?.article?.authorName ?? "",
style: TextStyle( style: TextStyle(
fontSize: 15.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp :15.sp,
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF1A1A1A), color: Color(0xFF1A1A1A),
), ),
@ -230,7 +230,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
Text( Text(
widget?.article?.createTime ?? "", widget?.article?.createTime ?? "",
style: TextStyle( style: TextStyle(
fontSize: 13.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp :13.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF808080), color: Color(0xFF808080),
), ),
@ -353,7 +353,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(bottom: 16), padding: EdgeInsets.only(bottom: 16.h),
child:Row( child:Row(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
@ -364,7 +364,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
height: 16, height: 16,
), ),
SizedBox( SizedBox(
width: 5, width: 5.w,
), ),
Text( Text(
(widget.article != null) (widget.article != null)
@ -381,7 +381,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
), ),
Expanded( Expanded(
child:Container( child:Container(
padding: EdgeInsets.only(bottom: 16), padding: EdgeInsets.only(bottom: 16.h),
child:Row( child:Row(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
@ -392,7 +392,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
height: 16, height: 16,
), ),
SizedBox( SizedBox(
width: 5, width: 5.w,
), ),
Text( Text(
"${widget.article.comments ?? 0}", "${widget.article.comments ?? 0}",
@ -406,7 +406,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
))), ))),
Expanded( Expanded(
child:Container( child:Container(
padding: EdgeInsets.only(bottom: 16), padding: EdgeInsets.only(bottom: 16.h),
child:Row( child:Row(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
@ -417,7 +417,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
height: 16, height: 16,
), ),
SizedBox( SizedBox(
width: 5, width: 5.w,
), ),
Text( Text(
"${widget.article.likes ?? 0}", "${widget.article.likes ?? 0}",
@ -440,7 +440,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
}); });
}, },
child: Container( child: Container(
padding: EdgeInsets.only(top:3,bottom: 16), padding: EdgeInsets.only(top:3.h,bottom: 16.h),
alignment: Alignment.center, alignment: Alignment.center,
// color: Colors.red, // color: Colors.red,
child: Text( child: Text(
@ -458,7 +458,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
), ),
), ),
Container( Container(
height: 16, height: 16.h,
color: Color(0xFFF7F7F7), color: Color(0xFFF7F7F7),
), ),
], ],
@ -793,7 +793,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 10, height: 10.h,
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
@ -806,7 +806,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
child: Row( child: Row(
children: [ children: [
SizedBox( SizedBox(
width: 4, width: 4.w,
), ),
Image.asset( Image.asset(
"assets/image/icon_share.webp", "assets/image/icon_share.webp",
@ -816,7 +816,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
color: Color(0xff515151), color: Color(0xff515151),
), ),
SizedBox( SizedBox(
width: 12, width: 12.w,
), ),
Text( Text(
S.of(context).fenxiang, S.of(context).fenxiang,
@ -847,7 +847,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
child: Row( child: Row(
children: [ children: [
SizedBox( SizedBox(
width: 4, width: 4.w,
), ),
SvgPicture.asset( SvgPicture.asset(
"assets/svg/ju_b.svg", "assets/svg/ju_b.svg",
@ -855,7 +855,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
height: 20, height: 20,
), ),
SizedBox( SizedBox(
width: 15, width: 15.w,
), ),
Text( Text(
S.of(context).jubaogaineirong, S.of(context).jubaogaineirong,

28
lib/community/community_view/home_class.dart
Unescape View File

@ -48,7 +48,7 @@ class _HomeClass extends State<HomeClass> {
Widget collectItem(CollectClassList collectList) { Widget collectItem(CollectClassList collectList) {
return Container( return Container(
width: 168, width: 168.w,
// height: 250, // height: 250,
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6.w, horizontal: 6.w,
@ -58,7 +58,7 @@ class _HomeClass extends State<HomeClass> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(left: 16, top: 5), padding: EdgeInsets.only(left: 16.w, top: 5.h),
child: Text( child: Text(
collectList.name, collectList.name,
style: TextStyle( style: TextStyle(
@ -70,11 +70,11 @@ class _HomeClass extends State<HomeClass> {
), ),
Container( Container(
height: 195, height: 195,
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10.h),
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
padding: EdgeInsets.symmetric(horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 10.w),
itemCount: widget.collectMap[collectList.id] == null itemCount: widget.collectMap[collectList.id] == null
? 0 ? 0
: widget.collectMap[collectList.id].length, : widget.collectMap[collectList.id].length,
@ -105,8 +105,8 @@ class _HomeClass extends State<HomeClass> {
Widget classItem(CourseList collect) { Widget classItem(CourseList collect) {
return Container( return Container(
width: 168, width: 168.w,
height: 195, height: 195.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
bottom: Radius.circular(4), bottom: Radius.circular(4),
@ -122,7 +122,7 @@ class _HomeClass extends State<HomeClass> {
color: Colors.white, color: Colors.white,
), ),
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6, horizontal: 6.w,
), ),
child: Column( child: Column(
children: [ children: [
@ -154,7 +154,7 @@ class _HomeClass extends State<HomeClass> {
child: MImage( child: MImage(
collect.coverImg, collect.coverImg,
width: double.infinity, width: double.infinity,
height: 120, height: 120.h,
fit: BoxFit.cover, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.webp", errorSrc: "assets/image/default_1.webp",
fadeSrc: "assets/image/default_1.webp", fadeSrc: "assets/image/default_1.webp",
@ -179,7 +179,7 @@ class _HomeClass extends State<HomeClass> {
height: 16.h, height: 16.h,
color: Colors.white, color: Colors.white,
), ),
SizedBox(width: 5), SizedBox(width: 5.w),
Text( Text(
collect.viewers.toString(), collect.viewers.toString(),
style: TextStyle( style: TextStyle(
@ -190,7 +190,7 @@ class _HomeClass extends State<HomeClass> {
), ),
], ],
), ),
SizedBox(width: 8), SizedBox(width: 8.w),
// Row( // Row(
// children: [ // children: [
// Image.asset( // Image.asset(
@ -219,8 +219,8 @@ class _HomeClass extends State<HomeClass> {
children: [ children: [
Spacer(), Spacer(),
Container( Container(
margin: EdgeInsets.only(top: 8, right: 8), margin: EdgeInsets.only(top: 8.h, right: 8.w),
padding: EdgeInsets.only(left: 2, right: 2), padding: EdgeInsets.only(left: 2.w, right: 2.w),
height: 20.h, height: 20.h,
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -245,7 +245,7 @@ class _HomeClass extends State<HomeClass> {
), ),
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8.w),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -268,7 +268,7 @@ class _HomeClass extends State<HomeClass> {
), ),
], ],
), ),
SizedBox(height: 2), SizedBox(height: 2.h),
Text( Text(
"${S.of(context).jiangshi}:${collect.author.name}", "${S.of(context).jiangshi}:${collect.author.name}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,

14
lib/community/headlines/article_list.dart
Unescape View File

@ -38,13 +38,13 @@ class _ArticleList extends State<ArticleList> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.only(top: 20, left: 16, right: 16), margin: EdgeInsets.only(top: 20.h, left: 16.w, right: 16.w),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(bottom: 12), padding: EdgeInsets.only(bottom: 12.h),
child: Text( child: Text(
S.of(context).zuixinwenzhang, S.of(context).zuixinwenzhang,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
@ -82,7 +82,7 @@ class _ArticleList extends State<ArticleList> {
return Container( return Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16),
margin: EdgeInsets.only(bottom: 12), margin: EdgeInsets.only(bottom: 12.h),
color: Colors.white, color: Colors.white,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -90,7 +90,7 @@ class _ArticleList extends State<ArticleList> {
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
height: 105, height: MediaQuery.of(context).size.width >= 650 ? 133.h :105,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -105,11 +105,11 @@ class _ArticleList extends State<ArticleList> {
color: Colors.black, color: Colors.black,
), ),
), ),
SizedBox(height:5), SizedBox(height:5.h),
Text( Text(
widget?.articles[position]?.viceTitle ?? "", widget?.articles[position]?.viceTitle ?? "",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 3, maxLines: 2,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
@ -132,7 +132,7 @@ class _ArticleList extends State<ArticleList> {
), ),
), ),
), ),
SizedBox(width: 8), SizedBox(width: 8.w),
Image.asset( Image.asset(
"assets/image/browse.webp", "assets/image/browse.webp",
width: 14, width: 14,

4
lib/home/guide_page.dart
Unescape View File

@ -309,7 +309,7 @@ class _GuidePage extends State<GuidePage> {
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
SizedBox( SizedBox(
height: 66.h, height: MediaQuery.of(context).size.width >= 650 ? 20.h :66.h,
), ),
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
@ -323,7 +323,7 @@ class _GuidePage extends State<GuidePage> {
), ),
), ),
SizedBox( SizedBox(
height: 23.h, height: MediaQuery.of(context).size.width >= 650 ? 15.h :23.h,
), ),
Padding( Padding(
padding: EdgeInsets.only(left: 52.w, right: 52.w), padding: EdgeInsets.only(left: 52.w, right: 52.w),

18
lib/login/login_page.dart
Unescape View File

@ -1066,7 +1066,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return SimpleDialog( return SimpleDialog(
titlePadding: EdgeInsets.all(10), titlePadding: EdgeInsets.all(10.h),
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
elevation: 0, elevation: 0,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
@ -1079,7 +1079,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
width: double.infinity, width: double.infinity,
height: 305.h, height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h,
padding: EdgeInsets.only(left: 16.w, right: 16.w), padding: EdgeInsets.only(left: 16.w, right: 16.w),
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: Colors.white, color: Colors.white,
@ -1105,7 +1105,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
fontSize: 14.sp, fontSize: 14.sp,
height: 1.3.h, height: 1.2.h,
color: Color(0xff727272), color: Color(0xff727272),
), ),
), ),
@ -1124,14 +1124,14 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
]), ]),
), ),
SizedBox( SizedBox(
height: 10.h, height: 5.h,
), ),
Text( Text(
S.of(context).yinsizhengce2, S.of(context).yinsizhengce2,
style: TextStyle( style: TextStyle(
color: Color(0xff727272), color: Color(0xff727272),
fontSize: 14.sp, fontSize: 14.sp,
height: 1.3.h, height: 1.2.h,
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
), ),
), ),
@ -1155,8 +1155,8 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
margin: EdgeInsets.only(bottom: 20.h), margin: EdgeInsets.only(bottom: 20.h),
child: BorderText( child: BorderText(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10.h, top: 5.h,
bottom: 10.h, bottom: 5.h,
left: 36.w, left: 36.w,
right: 36.w, right: 36.w,
), ),
@ -1192,8 +1192,8 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
); );
}, },
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10.h, top: 5.h,
bottom: 10.h, bottom: 5.h,
left: 21.5.w, left: 21.5.w,
right: 21.5.w, right: 21.5.w,
), ),

4
lib/mine/mine_view/mine_view.dart
Unescape View File

@ -239,7 +239,7 @@ class _MineView extends State<MineView> {
? S.of(context).denglu ? S.of(context).denglu
: "${widget.userInfo.nickname}", : "${widget.userInfo.nickname}",
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 14.sp :16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -267,7 +267,7 @@ class _MineView extends State<MineView> {
? "" ? ""
: "我的积分:${widget.userInfo.points}", : "我的积分:${widget.userInfo.points}",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp :12.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF2F2F2F), color: Color(0xFF2F2F2F),
), ),

2
lib/retrofit/min_api.dart
Unescape View File

@ -32,7 +32,7 @@ part 'min_api.g.dart';
// const base_url = "http://192.168.10.37:8766/app/"; // const base_url = "http://192.168.10.37:8766/app/";
const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -68,7 +68,7 @@ part 'retrofit_api.g.dart';
// const base_url = "http://192.168.10.132:8766/app/";///詹云久 // const base_url = "http://192.168.10.132:8766/app/";///詹云久
const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
@RestApi(baseUrl: localBaseUrl) @RestApi(baseUrl: localBaseUrl)

20
lib/store/store_order.dart
Unescape View File

@ -257,8 +257,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
height: double.infinity, height: double.infinity,
color: Colors.transparent, color: Colors.transparent,
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
margin: EdgeInsets.only(left: 10), margin: EdgeInsets.only(left: 10.w),
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10.h),
child: Icon( child: Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Colors.black, color: Colors.black,
@ -315,7 +315,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
if (storeInfo == null || if (storeInfo == null ||
storeInfo.couponVOList == null) storeInfo.couponVOList == null)
SizedBox( SizedBox(
height: 8, height: 8.h,
), ),
///门店对应VIP信息 ///门店对应VIP信息
@ -323,7 +323,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
], ],
), ),
), ),
top:105.h, top:MediaQuery.of(context).size.width >= 650 ? 80.h :105.h,
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0, right: 0,
@ -338,7 +338,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
bottom: PreferredSize( bottom: PreferredSize(
preferredSize: Size( preferredSize: Size(
MediaQuery.of(context).size.width, MediaQuery.of(context).size.width,
38, 38.h,
), ),
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
@ -355,12 +355,12 @@ class _StoreOrderPage extends State<StoreOrderPage>
), ),
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
unselectedLabelStyle: TextStyle( unselectedLabelStyle: TextStyle(
fontSize: 15.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp : 15.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
labelStyle: TextStyle( labelStyle: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 18.sp, fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp :18.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
labelColor: Colors.black, labelColor: Colors.black,
@ -477,8 +477,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
right: 15, right: 15,
top: 14, top: 14,
child: RoundButton( child: RoundButton(
width: 17, width: 17.w,
height: 17, height: 17.h,
text: "${count()}", text: "${count()}",
textColor: Colors.white, textColor: Colors.white,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
@ -966,7 +966,7 @@ class _Title extends State<Title> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.only(bottom: 38), margin: EdgeInsets.only(bottom: 38.h),
child: Text( child: Text(
widget.title ?? "", widget.title ?? "",
style: TextStyle( style: TextStyle(

4
lib/store/store_view/store_info.dart
Unescape View File

@ -30,7 +30,7 @@ class _StoreInfoView extends State<StoreInfoView> {
top: 5.h, top: 5.h,
bottom: 6.h, bottom: 6.h,
), ),
height: 154.h, height: MediaQuery.of(context).size.width >= 650 ? 180.h :154.h,
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -123,7 +123,7 @@ class _StoreInfoView extends State<StoreInfoView> {
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(

4
lib/union/union_view/union_coupon.dart
Unescape View File

@ -62,7 +62,7 @@ class _UnionCoupon extends State<UnionCoupon> {
Widget buildCoupon() { Widget buildCoupon() {
return Container( return Container(
height: 109.h, height: 116.h,
child: ListView.builder( child: ListView.builder(
itemCount: (widget.storeInfo != null && widget.storeInfo.couponVOList != null) itemCount: (widget.storeInfo != null && widget.storeInfo.couponVOList != null)
? widget.storeInfo.couponVOList.length ? widget.storeInfo.couponVOList.length
@ -258,7 +258,7 @@ class _UnionCoupon extends State<UnionCoupon> {
? Colors.grey ? Colors.grey
: Color(0xFF32A060), : Color(0xFF32A060),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 8.w, vertical: 4.h), horizontal: 8.w, vertical:2.h),
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),

Write Preview
Loading…
Cancel
Save