From 176f7c22ab1906167a91dd4d8eb21b4ec73e4073 Mon Sep 17 00:00:00 2001 From: fmk Date: Tue, 13 Jul 2021 14:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 44 ++- lib/generated/intl/messages_zh_CN.dart | 44 ++- lib/generated/intl/messages_zh_TW.dart | 44 ++- lib/home/founder_story_page.dart | 400 ++++++++++++++----------- lib/login/login_page.dart | 12 +- lib/main.dart | 68 ----- lib/view_widget/new_coupon_widget.dart | 2 +- pubspec.yaml | 2 +- 8 files changed, 302 insertions(+), 314 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 4d236c8d..05ac7bc5 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -57,27 +57,25 @@ class MessageLookup extends MessageLookupByLibrary { static m18(jifen) => "实付积分 ${jifen}积分"; - static m19(date) => "使用日期${date}"; + static m19(sui) => "${sui}岁"; - static m20(sui) => "${sui}岁"; + static m20(num) => "完成${num}"; - static m21(num) => "完成${num}"; + static m21(time) => "下单时间${time}"; - static m22(time) => "下单时间${time}"; + static m22(time) => "下单时间:${time}"; - static m23(time) => "下单时间:${time}"; + static m23(jian) => "已兑换${jian}件"; - static m24(jian) => "已兑换${jian}件"; + static m24(time) => "营业时间: ${time}"; - static m25(time) => "营业时间: ${time}"; + static m25(date) => "有效期至${date}"; - static m26(date) => "有效期至${date}"; + static m26(yuan) => "${yuan}元"; - static m27(yuan) => "${yuan}元"; + static m27(yue) => "余额${yue}"; - static m28(yue) => "余额${yue}"; - - static m29(zuozhe) => "作者${zuozhe}"; + static m28(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -280,7 +278,7 @@ class MessageLookup extends MessageLookupByLibrary { "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), - "shiyongriqi" : m19, + "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"), "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收货地址"), @@ -291,7 +289,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m20, + "sui" : m19, "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tixian" : MessageLookupByLibrary.simpleMessage("提现"), @@ -302,7 +300,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m21, + "wancheng_" : m20, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -320,8 +318,8 @@ class MessageLookup extends MessageLookupByLibrary { "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), - "xiadanshijian" : m22, - "xiadanshijian_" : m23, + "xiadanshijian" : m21, + "xiadanshijian_" : m22, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"), @@ -336,11 +334,11 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m23, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), - "yingyeshijian" : m25, + "yingyeshijian" : m24, "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), "yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"), @@ -358,10 +356,10 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("优惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), - "youxiaoqizhi" : m26, - "yuan" : m27, + "youxiaoqizhi" : m25, + "yuan" : m26, "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m28, + "yue_" : m27, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"), @@ -382,6 +380,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m29 + "zuozhe" : m28 }; } diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index fe50a1b9..fb57a8e5 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -57,27 +57,25 @@ class MessageLookup extends MessageLookupByLibrary { static m18(jifen) => "实付积分 ${jifen}积分"; - static m19(date) => "使用日期${date}"; + static m19(sui) => "${sui}岁"; - static m20(sui) => "${sui}岁"; + static m20(num) => "完成${num}"; - static m21(num) => "完成${num}"; + static m21(time) => "下单时间${time}"; - static m22(time) => "下单时间${time}"; + static m22(time) => "下单时间:${time}"; - static m23(time) => "下单时间:${time}"; + static m23(jian) => "已兑换${jian}件"; - static m24(jian) => "已兑换${jian}件"; + static m24(time) => "营业时间: ${time}"; - static m25(time) => "营业时间: ${time}"; + static m25(date) => "有效期至${date}"; - static m26(date) => "有效期至${date}"; + static m26(yuan) => "${yuan}元"; - static m27(yuan) => "${yuan}元"; + static m27(yue) => "余额${yue}"; - static m28(yue) => "余额${yue}"; - - static m29(zuozhe) => "作者${zuozhe}"; + static m28(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -280,7 +278,7 @@ class MessageLookup extends MessageLookupByLibrary { "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), - "shiyongriqi" : m19, + "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"), "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收货地址"), @@ -291,7 +289,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m20, + "sui" : m19, "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tixian" : MessageLookupByLibrary.simpleMessage("提现"), @@ -302,7 +300,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m21, + "wancheng_" : m20, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -320,8 +318,8 @@ class MessageLookup extends MessageLookupByLibrary { "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), - "xiadanshijian" : m22, - "xiadanshijian_" : m23, + "xiadanshijian" : m21, + "xiadanshijian_" : m22, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"), @@ -336,11 +334,11 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m23, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), - "yingyeshijian" : m25, + "yingyeshijian" : m24, "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), "yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"), @@ -358,10 +356,10 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("优惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), - "youxiaoqizhi" : m26, - "yuan" : m27, + "youxiaoqizhi" : m25, + "yuan" : m26, "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m28, + "yue_" : m27, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"), @@ -382,6 +380,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m29 + "zuozhe" : m28 }; } diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 13d4da1b..02b9ef72 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -57,27 +57,25 @@ class MessageLookup extends MessageLookupByLibrary { static m18(jifen) => "實付積分 ${jifen}積分"; - static m19(date) => "使用日期${date}"; + static m19(sui) => "${sui}嵗"; - static m20(sui) => "${sui}嵗"; + static m20(num) => "完成${num}"; - static m21(num) => "完成${num}"; + static m21(time) => "下單時間${time}"; - static m22(time) => "下單時間${time}"; + static m22(time) => "下單時間:${time}"; - static m23(time) => "下單時間:${time}"; + static m23(jian) => "已兌換${jian}件"; - static m24(jian) => "已兌換${jian}件"; + static m24(time) => "營業時間: ${time}"; - static m25(time) => "營業時間: ${time}"; + static m25(date) => "有效期至${date}"; - static m26(date) => "有效期至${date}"; + static m26(yuan) => "${yuan}元"; - static m27(yuan) => "${yuan}元"; + static m27(yue) => "餘額${yue}"; - static m28(yue) => "餘額${yue}"; - - static m29(zuozhe) => "作者${zuozhe}"; + static m28(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -280,7 +278,7 @@ class MessageLookup extends MessageLookupByLibrary { "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), - "shiyongriqi" : m19, + "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"), "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收貨地址"), @@ -291,7 +289,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新餘額"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), - "sui" : m20, + "sui" : m19, "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), "tixian" : MessageLookupByLibrary.simpleMessage("提現"), @@ -302,7 +300,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m21, + "wancheng_" : m20, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), @@ -320,8 +318,8 @@ class MessageLookup extends MessageLookupByLibrary { "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), - "xiadanshijian" : m22, - "xiadanshijian_" : m23, + "xiadanshijian" : m21, + "xiadanshijian_" : m22, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以在使用過程中進行分享，希望您使用HISAPP時讓我們使用相機功能 "), @@ -336,11 +334,11 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m23, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), - "yingyeshijian" : m25, + "yingyeshijian" : m24, "yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), "yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"), @@ -358,10 +356,10 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("優惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"), - "youxiaoqizhi" : m26, - "yuan" : m27, + "youxiaoqizhi" : m25, + "yuan" : m26, "yue" : MessageLookupByLibrary.simpleMessage("餘額"), - "yue_" : m28, + "yue_" : m27, "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yuyan" : MessageLookupByLibrary.simpleMessage("語言"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"), @@ -382,6 +380,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), - "zuozhe" : m29 + "zuozhe" : m28 }; } diff --git a/lib/home/founder_story_page.dart b/lib/home/founder_story_page.dart index 8494829a..2eb596db 100644 --- a/lib/home/founder_story_page.dart +++ b/lib/home/founder_story_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/utils/MyPainter.dart'; import 'package:huixiang/view_widget/separator.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class FounderStoryPage extends StatefulWidget { @override @@ -27,7 +27,7 @@ class _FounderStoryPage extends State { }, child: Container( alignment: Alignment.centerRight, - margin: EdgeInsets.only(left: 10), + margin: EdgeInsets.only(left: 10.w), padding: EdgeInsets.all(6), child: Icon( Icons.arrow_back_ios, @@ -36,8 +36,8 @@ class _FounderStoryPage extends State { ), ), ), - titleSpacing: 2, - leadingWidth: 56, + titleSpacing: 2.w, + leadingWidth: 56.w, automaticallyImplyLeading: true, ), body: Container( @@ -47,7 +47,7 @@ class _FounderStoryPage extends State { children: [ Container( margin: EdgeInsets.only(bottom: 20), - padding: EdgeInsets.only(left: 32,right: 32,top: 24), + padding: EdgeInsets.only(left: 32, right: 32, top: 24), decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -62,74 +62,101 @@ class _FounderStoryPage extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset("assets/image/icon_story_bj.png",alignment: Alignment.center,), + Image.asset( + "assets/image/icon_story_bj.png", + alignment: Alignment.center, + ), SizedBox( height: 16, ), Text("关于创始人", - style: TextStyle( - fontSize: 24, - color: Color(0xff565656))), + style: + TextStyle(fontSize: 24, color: Color(0xff565656))), SizedBox( height: 18, ), - Container( - width: double.infinity, - child:Stack( - children: [ - RichText( - textAlign: TextAlign.start, - text: TextSpan( - text: "1993年，台胞李旭清在台湾创建“一心回乡”团队，吸引包括蔡三益在内的30余位伙伴加入。" - "他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。", - style: TextStyle(color:Color(0xFF1A1A1A), fontSize: 12,height: 1.5), - )), - Padding(padding: EdgeInsets.only(top: 50),child: Align( - alignment: Alignment.bottomRight, - child:Image.asset("assets/image/icon_story_1.png",width: 222,height: 52,), - ),), - ], + Container( + width: double.infinity, + child: Stack( + children: [ + RichText( + textAlign: TextAlign.start, + text: TextSpan( + text: + "1993年，台胞李旭清在台湾创建“一心回乡”团队，吸引包括蔡三益在内的30余位伙伴加入。" + "他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。", + style: TextStyle( + color: Color(0xFF1A1A1A), + fontSize: 12, + height: 1.5), + )), + Padding( + padding: EdgeInsets.only(top: 50), + child: Align( + alignment: Alignment.bottomRight, + child: Image.asset( + "assets/image/icon_story_1.png", + width: 222, + height: 52, + ), + ), ), - ), + ], + ), + ), SizedBox( height: 16, ), RichText( text: TextSpan( - text: "2018年在台湾生活了五十七年的李旭清女士决定回到父亲的家乡湖北寻根。在这里为了延续台湾回乡的经验，李姐在湖北武汉创立了,与此同行的还有李姐的两个女儿。" - "为了推广更多的好食物，让更多的人参与到环境保护中，一心回乡遇到了知音，在大力支持下，“海峡姐妹餐饮诞生了!", - style: TextStyle(color:Color(0xFF1A1A1A), fontSize: 12,height: 1.5), - )), - Image.asset("assets/image/icon_story_2.png",alignment: Alignment.centerRight,), + text: + "2018年在台湾生活了五十七年的李旭清女士决定回到父亲的家乡湖北寻根。在这里为了延续台湾回乡的经验，李姐在湖北武汉创立了,与此同行的还有李姐的两个女儿。" + "为了推广更多的好食物，让更多的人参与到环境保护中，一心回乡遇到了知音，在大力支持下，“海峡姐妹餐饮诞生了!", + style: TextStyle( + color: Color(0xFF1A1A1A), fontSize: 12, height: 1.5), + )), + Image.asset( + "assets/image/icon_story_2.png", + alignment: Alignment.centerRight, + ), SizedBox( height: 16, ), - Image.asset("assets/image/laoban.png", + Image.asset( + "assets/image/laoban.png", fit: BoxFit.cover, - width: double.infinity, - height: 228,), + width: double.infinity, + height: 228, + ), SizedBox( height: 50, ), - Image.asset("assets/image/icon_story_bj.png",alignment: Alignment.center,), + Image.asset( + "assets/image/icon_story_bj.png", + alignment: Alignment.center, + ), SizedBox( height: 16, ), Text("回乡之路", - style: TextStyle( - fontSize: 24, - color: Color(0xff565656))), + style: + TextStyle(fontSize: 24, color: Color(0xff565656))), SizedBox( height: 20, ), _textWidget("1994年，为推广生机饮食，在台中逢甲大学开台湾第一家「青青小镇」自然蔬食餐厅。"), - _textWidget("1997年，为了实践减碳生活，邀约一群大学应届毕业生共同生活彼此学习，落实自然饮食新生活,开始推动有机小铺与小区讲座的教育推广模式。"), - _textWidget("2000年 为推广自然饮食概念，及照顾有机农民，开始做保价保证，成立「甘露自然蔬食餐厅」。"), - _textWidget("2005年，不忍农村凋零、土地被农药化肥毒化，带领年轻伙伴回乡购地，成立「回乡有机生活农场」，实践自然生态农耕，以复育生态、改良土壤为目的，创造一个与万物和谐共生的农耕模式。"), - Padding(padding: EdgeInsets.only(bottom: 20,left: 18),child:Text("…", - style: TextStyle( - fontSize: 16, - color: Color(0xff565656))),), + _textWidget( + "1997年，为了实践减碳生活，邀约一群大学应届毕业生共同生活彼此学习，落实自然饮食新生活,开始推动有机小铺与小区讲座的教育推广模式。"), + _textWidget( + "2000年 为推广自然饮食概念，及照顾有机农民，开始做保价保证，成立「甘露自然蔬食餐厅」。"), + _textWidget( + "2005年，不忍农村凋零、土地被农药化肥毒化，带领年轻伙伴回乡购地，成立「回乡有机生活农场」，实践自然生态农耕，以复育生态、改良土壤为目的，创造一个与万物和谐共生的农耕模式。"), + Padding( + padding: EdgeInsets.only(bottom: 20, left: 18), + child: Text("…", + style: TextStyle( + fontSize: 16, color: Color(0xff565656))), + ), _textWidget("2019年，在武汉成立湖北海峡姐妹餐饮有限公司。" "成为百年川椒火锅（光谷店）运营方，通过“素食煮义”和“蔬食之力”推广有机永续美好生活，" "打造“新国民火锅”。在“未来之光”和“创意天地”开设的「海峡姐妹」茶吧，坚持纯天然的食材，" @@ -137,26 +164,32 @@ class _FounderStoryPage extends State { _textWidget("2019年，在武汉江夏成立旭清回乡生态农业发展有限公司，" "在山坡街拥有1200亩农业生产基地，" "将台湾实践多年并有成功经验的生态农法, 天然食品加工技术, 农业旅游输出落地。"), - Image.asset("assets/image/icon_story_bj.png",alignment: Alignment.center,), + Image.asset( + "assets/image/icon_story_bj.png", + alignment: Alignment.center, + ), SizedBox( height: 16, ), Text("早期团队", - style: TextStyle( - fontSize: 24, - color: Color(0xff565656))), + style: + TextStyle(fontSize: 24, color: Color(0xff565656))), SizedBox( height: 26, ), - Image.asset("assets/image/icon_story_td.png", + Image.asset( + "assets/image/icon_story_td.png", fit: BoxFit.cover, width: double.infinity, - height: 228,), + height: 228, + ), SizedBox( height: 24, ), Padding( - padding: EdgeInsets.only(top: 10,), + padding: EdgeInsets.only( + top: 10, + ), child: MySeparator( width: 5, height: 2, @@ -179,15 +212,19 @@ class _FounderStoryPage extends State { spreadRadius: 0) ], ), - child:RichText( + child: RichText( text: TextSpan( - text: "回乡有机团队（早期照片），当年，他们也都是企业高管、IT精英、大学毕业生。日出而作，日落而息，结婚生子，" - "子女们一起玩耍，上学读书。转眼间，孩子们都已长大，有些大学毕业后也加入了“回乡”。", - style: TextStyle(color:Colors.white, fontSize: 12,height: 1.5), - )), + text: + "回乡有机团队（早期照片），当年，他们也都是企业高管、IT精英、大学毕业生。日出而作，日落而息，结婚生子，" + "子女们一起玩耍，上学读书。转眼间，孩子们都已长大，有些大学毕业后也加入了“回乡”。", + style: TextStyle( + color: Colors.white, fontSize: 12, height: 1.5), + )), ), Padding( - padding: EdgeInsets.only(top: 10,), + padding: EdgeInsets.only( + top: 10, + ), child: MySeparator( width: 5, height: 2, @@ -198,17 +235,19 @@ class _FounderStoryPage extends State { height: 27, ), Text("传递理念", - style: TextStyle( - fontSize: 24, - color: Color(0xff565656))), + style: + TextStyle(fontSize: 24, color: Color(0xff565656))), SizedBox( height: 20, ), Row( children: [ - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), ], ), SizedBox( @@ -216,9 +255,12 @@ class _FounderStoryPage extends State { ), Row( children: [ - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), - _ideaWidget("友爱", "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), + _ideaWidget("友爱", + "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), ], ), SizedBox( @@ -244,11 +286,14 @@ class _FounderStoryPage extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding(padding: EdgeInsets.all(16),child:Text("评论 (58) 喜欢 (58)", - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.bold, - color: Color(0xff1A1A1A))),), + Padding( + padding: EdgeInsets.all(16), + child: Text("评论 (58) 喜欢 (58)", + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + color: Color(0xff1A1A1A))), + ), SizedBox( height: 600, child: ListView.builder( @@ -257,11 +302,9 @@ class _FounderStoryPage extends State { physics: BouncingScrollPhysics(), itemBuilder: (context, position) { return _commentItem(position); - }, ), ), - ], ), ), @@ -335,122 +378,141 @@ class _FounderStoryPage extends State { ); } - Widget _textWidget(var text){ - return Padding(padding: EdgeInsets.only(bottom: 20),child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("●",style: TextStyle(fontSize: 10,color: Color(0xff32A060)),), - SizedBox( - width: 5, - ), - Expanded(child: Text(text,style: TextStyle(fontSize: 12,color: Colors.black))), - ], - ),); + Widget _textWidget(var text) { + return Padding( + padding: EdgeInsets.only(bottom: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "●", + style: TextStyle(fontSize: 10, color: Color(0xff32A060)), + ), + SizedBox( + width: 5, + ), + Expanded( + child: Text(text, + style: TextStyle(fontSize: 12, color: Colors.black))), + ], + ), + ); } - Widget _ideaWidget(var text,var img){ + Widget _ideaWidget(var text, var img) { return Expanded( flex: 1, child: Stack( - alignment: Alignment.center, - children: [ - Container( - width: 63, - height: 63, - child:CircleAvatar( - radius: 100, - backgroundImage: NetworkImage(img), - child: Container( - alignment: Alignment.center, - child: Text(text,style: TextStyle(fontSize:18,fontWeight: FontWeight.w300,color: Colors.white),) + alignment: Alignment.center, + children: [ + Container( + width: 63, + height: 63, + child: CircleAvatar( + radius: 100, + backgroundImage: NetworkImage(img), + child: Container( + alignment: Alignment.center, + child: Text( + text, + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.w300, + color: Colors.white), + )), ), ), - ), - Container( - width: 73, - height: 73, - child: CustomPaint( - painter:MyPainter(lineColor: Color(0xff32A060),width:2,isDividerRound:true), - ), - ) - ], - ),); + Container( + width: 73, + height: 73, + child: CustomPaint( + painter: MyPainter( + lineColor: Color(0xff32A060), width: 2, isDividerRound: true), + ), + ) + ], + ), + ); } Widget _commentItem(var position) { return Container( child: Column( children: [ - Padding(padding: EdgeInsets.all(16),child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - ClipOval( - child: Image.network( - "https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF", - fit: BoxFit.cover, - width: 40, - height: 40, + Padding( + padding: EdgeInsets.all(16), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + ClipOval( + child: Image.network( + "https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF", + fit: BoxFit.cover, + width: 40, + height: 40, + ), + clipBehavior: Clip.hardEdge, ), - clipBehavior: Clip.hardEdge, - ), - SizedBox( - width: 12, - ), - Expanded( - child: Container( - height: 60, - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text.rich( - TextSpan(children: [ - TextSpan( - text: "张三", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14, - color: Colors.black), + SizedBox( + width: 12, + ), + Expanded( + child: Container( + height: 60, + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text.rich( + TextSpan(children: [ + TextSpan( + text: "张三", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14, + color: Colors.black), + ), + ]), + textDirection: TextDirection.ltr, + ), + Text( + "2021.04.12 12:12", + overflow: TextOverflow.ellipsis, + maxLines: 2, + style: TextStyle( + fontSize: 12, + color: Color(0xff808080), ), - ]), - textDirection: TextDirection.ltr, + ), + ], + ), + ), + flex: 1, + ), + Container( + alignment: Alignment.topRight, + child: Row( + children: [ + Image.asset( + "assets/image/icon_like.png", + width: 16, + height: 16, ), Text( - "2021.04.12 12:12", - overflow: TextOverflow.ellipsis, - maxLines: 2, - style: TextStyle( - fontSize: 12, - color: Color(0xff808080), - ), + "58", + style: + TextStyle(fontSize: 12, color: Color(0xff1A1A1A)), ), ], ), ), - flex: 1, - ), - Container( - alignment: Alignment.topRight, - child: Row( - children: [ - Image.asset( - "assets/image/icon_like.png", - width: 16, - height: 16, - ), - Text( - "58", - style: TextStyle(fontSize: 12, color: Color(0xff1A1A1A)), - ), - ], - ), - ), - ], - ),), + ], + ), + ), Padding( - padding: EdgeInsets.only(left: 68,right: 16), + padding: EdgeInsets.only(left: 68, right: 16), child: Text( "文本，是指书面语言的表现形式，从文学角度说，通常是具有完整、系统含义（Mess…", style: TextStyle(fontSize: 14, color: Color(0xff1A1A1A)), @@ -461,7 +523,7 @@ class _FounderStoryPage extends State { ), Container( width: double.infinity, - margin: EdgeInsets.only(left: 68,right: 16), + margin: EdgeInsets.only(left: 68, right: 16), decoration: new BoxDecoration( color: Color(0xffF2F2F2), borderRadius: BorderRadius.circular(2.0), diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index c80517f7..e3fa6bce 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -15,7 +15,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:dio/dio.dart'; import 'package:huixiang/view_widget/loading_view.dart'; -// import 'package:photo_view/photo_view.dart'; +import 'package:photo_view/photo_view.dart'; import 'package:shared_preferences/shared_preferences.dart'; class LoginPage extends StatefulWidget { @@ -375,11 +375,11 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { child: Stack( alignment: Alignment.center, children: [ - // PhotoView( - // imageProvider: AssetImage("assets/image/laoban.png"), - // initialScale: Platform.isAndroid ? 1.02 : 1.2, - // basePosition: alignmentProgress, - // ), + PhotoView( + imageProvider: AssetImage("assets/image/laoban.png"), + initialScale: Platform.isAndroid ? 1.02 : 1.2, + basePosition: alignmentProgress, + ), Container( decoration: BoxDecoration( color: Color(0xFF32A060).withAlpha(changeAlpha), diff --git a/lib/main.dart b/lib/main.dart index 09d24939..51da1687 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -217,71 +217,3 @@ Map routers = { // '/router/hot_article_details_page': (context, {arguments}) => HotArticleDetailsPage(), // '/router/ui_test': (context, {arguments}) => UITest(), }; - -EventBus eventBus = EventBus(sync: true); - -class MyApp extends StatelessWidget { - @override - Widget build(BuildContext context) { - return ScreenUtilInit( - designSize: Size(375, 812), - builder: () => MaterialApp( - debugShowCheckedModeBanner: false, - theme: ThemeData( - primarySwatch: Colors.blue, - textTheme: TextTheme( - button: TextStyle(fontSize: 24.sp), - bodyText1: TextStyle(fontSize: 12.sp), - bodyText2: TextStyle(fontSize: 16.sp), - ), - ), - // locale: locale, - localeResolutionCallback: (locale, supportedLocales) { - print("locale: $locale"); - print("supportedLocales: $supportedLocales"); - - // Localizations.maybeLocaleOf(context) - - return Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW'); - }, - localizationsDelegates: [ - GlobalMaterialLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - S.delegate - ], - supportedLocales: S.delegate.supportedLocales, - home: LoginPage(), - onGenerateRoute: (settings) { - final String name = settings.name; - final Function pageContentBuilder = routers[name]; - if (pageContentBuilder != null) { - final Route route = MaterialPageRoute( - builder: (context) { - return pageContentBuilder(context, - arguments: settings.arguments); - }, - settings: settings, - ); - return route; - } - return MaterialPageRoute( - //未找到页面配置进入登录页 - builder: (context) { - return LoginPage(); - }, - settings: settings, - ); - }, - ), - ); - } -} - - -// 地区: 台湾 语言：简体中文 zh_Hans_TW -// 地区: 台湾 语言：繁体中文 zh_Hant_TW -// 地区: 香港 语言：繁体中文 zh_Hant_HK -// 地区: 中国 语言：繁体中文 zh_Hant_CN -// 地区: 中国 语言：简体中文 zh_Hans_CN -// 地区: 台湾 语言：英文 en_TW \ No newline at end of file diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 5993018a..4b630cb2 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -173,7 +173,7 @@ class NewCouponWidget extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - S.of(context).shiyongriqi(""), + S.of(context).shiyongriqi, style: TextStyle( color: Color(0xFF353535), fontSize: 10.sp, diff --git a/pubspec.yaml b/pubspec.yaml index 0c56ad25..2c608663 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -71,7 +71,7 @@ dependencies: cached_network_image: ^2.0.0 flutter_html: ^1.3.0 #2.1.0 -# photo_view: ^0.11.1 + photo_view: ^0.11.1 chewie: ^0.12.2 video_player: ^1.0.1