Browse Source

修改ui

null_safety
fmk 4 years ago
parent
commit
7bb3a6515e
  1. 2
      lib/generated/intl/messages_en.dart
  2. 2
      lib/generated/intl/messages_zh_CN.dart
  3. 2
      lib/generated/intl/messages_zh_TW.dart
  4. 20
      lib/generated/l10n.dart
  5. 101
      lib/home/huixiang_brand_page.dart
  6. 3
      lib/l10n/intl_en.arb
  7. 2
      lib/l10n/intl_zh_CN.arb
  8. 2
      lib/l10n/intl_zh_TW.arb
  9. 1
      lib/retrofit/data/order_info.dart
  10. 1
      lib/setting/about_page.dart
  11. 270
      pubspec.lock

2
lib/generated/intl/messages_en.dart

@ -147,6 +147,7 @@ class MessageLookup extends MessageLookupByLibrary {
"feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用!"), "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用!"),
"ge" : m4, "ge" : m4,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
"jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),

2
lib/generated/intl/messages_zh_CN.dart

@ -147,6 +147,7 @@ class MessageLookup extends MessageLookupByLibrary {
"feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用!"), "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用!"),
"ge" : m4, "ge" : m4,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"),
"jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),

2
lib/generated/intl/messages_zh_TW.dart

@ -147,6 +147,7 @@ class MessageLookup extends MessageLookupByLibrary {
"feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品!"), "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品!"),
"ge" : m4, "ge" : m4,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨幣聯盟會員店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨幣聯盟會員店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
"jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),

20
lib/generated/l10n.dart

@ -3465,6 +3465,26 @@ class S {
); );
} }
/// ``
String get gengduo {
return Intl.message(
'更多',
name: 'gengduo',
desc: '',
args: [],
);
}
/// ``
String get jituanchuangbanren {
return Intl.message(
'集团创办人',
name: 'jituanchuangbanren',
desc: '',
args: [],
);
}
/// `使` /// `使`
String get privacy_policy4 { String get privacy_policy4 {
return Intl.message( return Intl.message(

101
lib/home/huixiang_brand_page.dart

@ -351,51 +351,56 @@ class _BrandPage extends State<BrandPage>
width: 16.w, width: 16.w,
), ),
Expanded( Expanded(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text.rich( children: [
TextSpan(children: [ Text.rich(
TextSpan( TextSpan(children: [
text: brandData == null ? "" : brandData.originator, TextSpan(
style: TextStyle( text:
fontWeight: FontWeight.bold, brandData == null ? "" : brandData.originator,
fontSize: 14, style: TextStyle(
color: Colors.black, fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Colors.black,
),
), ),
), TextSpan(
TextSpan( text: S.of(context).jituanchuangbanren,
text: " 集团创办人", style: TextStyle(
style: TextStyle( fontSize: 10.sp,
fontSize: 10, color: Colors.black,
color: Colors.black, ),
), ),
]),
textDirection: TextDirection.ltr,
),
Text(
brandData == null ? "" : brandData.originDesc,
overflow: isShowMore
? TextOverflow.visible
: TextOverflow.ellipsis,
maxLines: isShowMore ? 10 : 1,
style: TextStyle(
fontSize: 12.sp,
color: Colors.black,
), ),
]), ),
textDirection: TextDirection.ltr, SizedBox(height: 3.h),
), GestureDetector(
Text( onTap: () {
"李旭清女士于1993年创建以「地球公民责任」为企业理念,打造一个与环境共存共荣的永续有机产业的台湾回乡有机集团。" setState(() {
"2018年10月李旭清女士带领20几位台湾核心干部返乡落地武汉,将台湾有机产业成功经验带回湖北家乡," isShowMore = !isShowMore;
"将产业规模涵盖有机生态农业、食品加工、健康餐饮、文旅、电商、金融、信息、地产等领域。", });
softWrap: true, },
overflow: isShowMore?TextOverflow.visible:TextOverflow.ellipsis,
style: TextStyle(fontSize: 12, color: Colors.black),
),
SizedBox(height: 3),
GestureDetector(
onTap: (){
setState(() {
isShowMore=!isShowMore;
});
},
child: Expanded(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.max,
children: [ children: [
Text( Text(
"更多", S.of(context).gengduo,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: Colors.black, color: Colors.black,
@ -411,8 +416,8 @@ class _BrandPage extends State<BrandPage>
], ],
), ),
), ),
), ],
], ),
), ),
flex: 1, flex: 1,
), ),
@ -453,7 +458,7 @@ class _BrandPage extends State<BrandPage>
), ),
), ),
SizedBox( SizedBox(
height: 20.h, height: 20,
), ),
Column( Column(
children: [ children: [
@ -471,7 +476,7 @@ class _BrandPage extends State<BrandPage>
], ],
), ),
SizedBox( SizedBox(
height: 18.h, height: 18,
), ),
// //
// Row( // Row(
@ -510,21 +515,21 @@ class _BrandPage extends State<BrandPage>
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Container( Container(
width: 63.w, width: 63,
height: 63.h, height: 63,
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Align( Align(
child: CircleAvatar( child: CircleAvatar(
child: Image.asset(img), child: Image.asset(img),
radius: 100.w, radius: 100,
), ),
), ),
Text( Text(
text, text,
style: TextStyle( style: TextStyle(
fontSize: 18.sp, fontSize: 18,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
color: Colors.white), color: Colors.white),
) )
@ -545,11 +550,11 @@ class _BrandPage extends State<BrandPage>
// ), // ),
), ),
Container( Container(
width: 73.w, width: 73,
height: 73.h, height: 73,
child: CustomPaint( child: CustomPaint(
painter: MyPainter( painter: MyPainter(
lineColor: Color(0xff32A060), width: 2.w, isDividerRound: true,), lineColor: Color(0xff32A060), width: 2, isDividerRound: true),
), ),
) )
], ],

3
lib/l10n/intl_en.arb

@ -359,6 +359,9 @@
"weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", "weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息",
"dengdaishangjiaqueren": "等待商家确认", "dengdaishangjiaqueren": "等待商家确认",
"dingdandaifahuo": "订单待发货", "dingdandaifahuo": "订单待发货",
"gengduo": "更多",
"jituanchuangbanren": "集团创办人",

2
lib/l10n/intl_zh_CN.arb

@ -361,6 +361,8 @@
"weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", "weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息",
"dengdaishangjiaqueren": "等待商家确认", "dengdaishangjiaqueren": "等待商家确认",
"dingdandaifahuo": "订单待发货", "dingdandaifahuo": "订单待发货",
"gengduo": "更多",
"jituanchuangbanren": " 集团创办人",

2
lib/l10n/intl_zh_TW.arb

@ -353,6 +353,8 @@
"weilexiangnintuijianfujindemendianxinxi": "為了向您推薦附近的門店信息,推薦您在使用期間讓我們使用位置信息", "weilexiangnintuijianfujindemendianxinxi": "為了向您推薦附近的門店信息,推薦您在使用期間讓我們使用位置信息",
"dengdaishangjiaqueren": "等待商家確認", "dengdaishangjiaqueren": "等待商家確認",
"dingdandaifahuo": "訂單待發貨", "dingdandaifahuo": "訂單待發貨",
"gengduo": "更多",
"jituanchuangbanren": "集团创办人",

1
lib/retrofit/data/order_info.dart

@ -1,4 +1,3 @@
import 'package:huixiang/retrofit/data/coupon_vo.dart';
/// id : "1408358257373741056" /// id : "1408358257373741056"
/// createTime : "2021-06-25 17:35:49" /// createTime : "2021-06-25 17:35:49"

1
lib/setting/about_page.dart

@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/separator.dart';
import 'package:package_info/package_info.dart'; import 'package:package_info/package_info.dart';
class AboutPage extends StatefulWidget { class AboutPage extends StatefulWidget {

270
pubspec.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save