修改ui

lib/generated/intl/messages_en.dart

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

lib/generated/intl/messages_zh_CN.dart

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

lib/generated/intl/messages_zh_TW.dart

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

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 {
     return Intl.message(

lib/home/huixiang_brand_page.dart

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

lib/l10n/intl_en.arb

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

lib/l10n/intl_zh_CN.arb

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

lib/l10n/intl_zh_TW.arb

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

lib/retrofit/data/order_info.dart

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

lib/setting/about_page.dart

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