Merge branch 'master' into dev

lib/generated/intl/messages_en.dart

@@ -51,7 +51,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(shijian) => "领取时间 ${shijian}";
 
-  static m16(man, jian) => "满${man}立减${jian}代金券";
+  static m16(man, jian) => "满${man}元立减${jian}元代金券";
 
   static m17(yuan) => "满${yuan}可用";
 

lib/generated/intl/messages_zh_CN.dart

@@ -51,7 +51,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(shijian) => "领取时间 ${shijian}";
 
-  static m16(man, jian) => "满${man}立减${jian}代金券";
+  static m16(man, jian) => "满${man}元立减${jian}元代金券";
 
   static m17(yuan) => "满${yuan}可用";
 

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -51,7 +51,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(shijian) => "领取时间 ${shijian}";
 
-  static m16(man, jian) => "满${man}立减${jian}代金券";
+  static m16(man, jian) => "满${man}元立减${jian}元代金券";
 
   static m17(yuan) => "满${yuan}可用";
 

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -51,7 +51,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(shijian) => "領取時間 ${shijian}";
 
-  static m16(man, jian) => "滿${man}立減${jian}代金券";
+  static m16(man, jian) => "滿${man}元立減${jian}元代金券";
 
   static m17(yuan) => "滿${yuan}可用";
 

lib/generated/intl/messages_zh_TW.dart

@@ -51,7 +51,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(shijian) => "領取時間 ${shijian}";
 
-  static m16(man, jian) => "滿${man}立減${jian}代金券";
+  static m16(man, jian) => "滿${man}元立減${jian}元代金券";
 
   static m17(yuan) => "滿${yuan}可用";
 

lib/generated/l10n.dart

@@ -325,10 +325,10 @@ class S {
     );
   }
 
-  /// `满{man}立减{jian}代金券`
+  /// `满{man}元立减{jian}元代金券`
   String manlijiandaijinquan(Object man, Object jian) {
     return Intl.message(
-      '满$man立减$jian代金券',
+      '满$man元立减$jian元代金券',
       name: 'manlijiandaijinquan',
       desc: '',
       args: [man, jian],

lib/integral/integral_page.dart

@@ -43,7 +43,9 @@ class _IntegralPage extends State<IntegralPage> {
           token: value.getString("token"),
           showLoading: false);
       userinfo = UserInfo.fromJson(jsonDecode(value.getString("user")));
-      SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
+      SmartDialog.showLoading(
+          msg: S.of(context).zhengzaijiazai,
+          animationDurationTemp: Duration(seconds: 1));
       querySignInfo();
     });
   }
@@ -81,6 +83,7 @@ class _IntegralPage extends State<IntegralPage> {
         title: S.of(context).jifenxiangqing,
         titleColor: Colors.white,
         titleSize: 16.sp,
+        brightness: Brightness.dark,
         action: Container(
           alignment: Alignment.center,
           margin: EdgeInsets.only(right: 16.w),
@@ -292,7 +295,7 @@ class _IntegralPage extends State<IntegralPage> {
             fontSize: 14.sp,
             fontWeight: FontWeight.bold,
             padding: EdgeInsets.fromLTRB(12.w, 4.h, 12.w, 4.h),
-          )
+          ),
         ],
       ),
     );
@@ -304,7 +307,7 @@ class _IntegralPage extends State<IntegralPage> {
         padding: EdgeInsets.all(6),
         decoration: BoxDecoration(
           color: Color(0xFFF0F0F2),
-          borderRadius: BorderRadius.all(Radius.circular(4)),
+          borderRadius: BorderRadius.circular(4),
         ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -318,9 +321,10 @@ class _IntegralPage extends State<IntegralPage> {
                   Text(
                     "0${position + 1}",
                     style: TextStyle(
-                        color: Color(0xFF353535),
-                        fontSize: 14.sp,
-                        fontWeight: FontWeight.w500,),
+                      color: Color(0xFF353535),
+                      fontSize: 14.sp,
+                      fontWeight: FontWeight.w500,
+                    ),
                   ),
                   SizedBox(
                     height: 10.h,
@@ -438,9 +442,10 @@ class _IntegralPage extends State<IntegralPage> {
           Text(
             S.of(context).qiandaolingjifen,
             style: TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 16.sp,
-                color: Color(0xFF353535),),
+              fontWeight: FontWeight.bold,
+              fontSize: 16.sp,
+              color: Color(0xFF353535),
+            ),
           ),
           SizedBox(
             height: 10.h,
@@ -457,19 +462,20 @@ class _IntegralPage extends State<IntegralPage> {
             height: 32.h,
           ),
           StaggeredGridView.countBuilder(
-              crossAxisCount: 4,
-              shrinkWrap: true,
-              itemCount: 7,
-              mainAxisSpacing: 8.h,
-              crossAxisSpacing: 18.w,
-              padding: EdgeInsets.only(bottom: 32.h),
-              physics: NeverScrollableScrollPhysics(),
-              itemBuilder: (context, position) {
-                return signInItem(position);
-              },
-              staggeredTileBuilder: (position) {
-                return StaggeredTile.count(position == 6 ? 2 : 1, 1.28);
-              }),
+            crossAxisCount: 4,
+            shrinkWrap: true,
+            itemCount: 7,
+            mainAxisSpacing: 8.h,
+            crossAxisSpacing: 18.w,
+            padding: EdgeInsets.only(bottom: 32.h),
+            physics: NeverScrollableScrollPhysics(),
+            itemBuilder: (context, position) {
+              return signInItem(position);
+            },
+            staggeredTileBuilder: (position) {
+              return StaggeredTile.count(position == 6 ? 2 : 1, 1.28);
+            },
+          ),
           InkWell(
             onTap: signIn,
             child: Container(
@@ -490,7 +496,7 @@ class _IntegralPage extends State<IntegralPage> {
                 radius: 4,
               ),
             ),
-          )
+          ),
         ],
       ),
     );
@@ -522,32 +528,33 @@ class _IntegralPage extends State<IntegralPage> {
       child: Row(
         children: [
           Expanded(
-              flex: 1,
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text(
-                    signInfo != null ? "${signInfo.point}" : "0",
-                    style: TextStyle(
-                      fontWeight: FontWeight.w500,
-                      fontSize: 21.sp,
-                      color: Colors.white,
-                    ),
+            flex: 1,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Text(
+                  signInfo != null ? "${signInfo.point}" : "0",
+                  style: TextStyle(
+                    fontWeight: FontWeight.w500,
+                    fontSize: 21.sp,
+                    color: Colors.white,
                   ),
-                  SizedBox(
-                    height: 6.h,
+                ),
+                SizedBox(
+                  height: 6.h,
+                ),
+                Text(
+                  S.of(context).wodejifenzhi,
+                  style: TextStyle(
+                    fontSize: 12.sp,
+                    fontWeight: FontWeight.w400,
+                    color: Color(0xFFF2F2F2),
                   ),
-                  Text(
-                    S.of(context).wodejifenzhi,
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w400,
-                      color: Color(0xFFF2F2F2),
-                    ),
-                  )
-                ],
-              )),
+                )
+              ],
+            ),
+          ),
           Container(
             width: 2.w,
             height: 32.h,
@@ -558,17 +565,17 @@ class _IntegralPage extends State<IntegralPage> {
             child: InkWell(
               onTap: () {
                 SharedPreferences.getInstance().then((value) {
-                  if (value.getString("token") != null && value.getString("token") != "") {
+                  if (value.getString("token") != null &&
+                      value.getString("token") != "") {
                     Navigator.of(context)
                         .pushNamed('/router/mine_vip_level_page', arguments: {
                       "rankLevel": rankLevel,
                       "createTime":
-                      (userinfo != null) ? "${userinfo.createTime}" : "",
-                      "points":
-                      (userinfo != null) ? int.tryParse(userinfo.points) : 0,
+                          (userinfo != null) ? "${userinfo.createTime}" : "",
+                      "points": (userinfo != null)
+                          ? int.tryParse(userinfo.points)
+                          : 0,
                     });
-                  } else {
-
                   }
                 });
               },

lib/l10n/intl_en.arb

@@ -28,7 +28,7 @@
   "pinpaijieshao": "品牌介绍",
   "jingbilianmenghuiyuandian": "净弼联盟会员店",
   "gongli": "{km}公里",
-  "manlijiandaijinquan": "满{man}立减{jian}代金券",
+  "manlijiandaijinquan": "满{man}元立减{jian}元代金券",
   "ren": "¥{ren}/人",
   "youxiaoqizhi": "有效期至{date}",
   "huodongjinxingzhong": "活动进行中",

lib/l10n/intl_zh_CN.arb

@@ -28,7 +28,7 @@
   "pinpaijieshao": "品牌介绍",
   "jingbilianmenghuiyuandian": "净弼联盟会员店",
   "gongli": "{km}公里",
-  "manlijiandaijinquan": "满{man}立减{jian}代金券",
+  "manlijiandaijinquan": "满{man}元立减{jian}元代金券",
   "ren": "¥{ren}/人",
   "youxiaoqizhi": "有效期至{date}",
   "huodongjinxingzhong": "活动进行中",

lib/l10n/intl_zh_Hans_CN.arb

@@ -28,7 +28,7 @@
   "pinpaijieshao": "品牌介绍",
   "jingbilianmenghuiyuandian": "净弼联盟会员店",
   "gongli": "{km}公里",
-  "manlijiandaijinquan": "满{man}立减{jian}代金券",
+  "manlijiandaijinquan": "满{man}元立减{jian}元代金券",
   "ren": "¥{ren}/人",
   "youxiaoqizhi": "有效期至{date}",
   "huodongjinxingzhong": "活动进行中",

lib/l10n/intl_zh_Hant_CN.arb

@@ -28,7 +28,7 @@
   "pinpaijieshao": "品牌介紹",
   "jingbilianmenghuiyuandian": "净弼聯盟會員店",
   "gongli": "{km}公里",
-  "manlijiandaijinquan": "滿{man}立減{jian}代金券",
+  "manlijiandaijinquan": "滿{man}元立減{jian}元代金券",
   "ren": "¥{ren}/人",
   "youxiaoqizhi": "有效期至{date}",
   "huodongjinxingzhong": "活動進行中",

lib/l10n/intl_zh_TW.arb

@@ -28,7 +28,7 @@
   "pinpaijieshao": "品牌介紹",
   "jingbilianmenghuiyuandian": "净弼聯盟會員店",
   "gongli": "{km}公里",
-  "manlijiandaijinquan": "滿{man}立減{jian}代金券",
+  "manlijiandaijinquan": "滿{man}元立減{jian}元代金券",
   "ren": "¥{ren}/人",
   "youxiaoqizhi": "有效期至{date}",
   "huodongjinxingzhong": "活動進行中",

lib/mine/recharge_page.dart

@@ -67,7 +67,7 @@ class _RechargePage extends State<RechargePage> {
                   fontSize: 27.sp,
                   color: color,
                 ),
-                inputLimit: 12,
+                inputLimit: 6,
                 textInputType: TextInputType.number,
                 textInputFormatter: FilteringTextInputFormatter.digitsOnly,
                 onChanged: (value) {

lib/order/order_detail_page.dart

@@ -125,8 +125,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
                                   : isTakeOut == 1
                                       ? S.of(context).waimai
                                       : S.of(context).kuaidi,
-                              width: 42.w,
-                              height: 20.h,
+                              width: 42.w * AppUtils.textScale(context),
+                              height: 20.h * AppUtils.textScale(context),
                               textColor: Colors.white,
                               fontSize: 12.sp,
                               padding: EdgeInsets.fromLTRB(8.w, 1.h, 8.w, 1.h),

lib/union/union_details_page.dart

@@ -14,6 +14,7 @@ import 'package:huixiang/retrofit/data/store_info.dart';
 import 'package:huixiang/retrofit/data/user_entity.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/min.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
@@ -660,15 +661,11 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
                                 Text(
                                   S.of(context).youxiaoqizhi(
                                         (storeInfo != null &&
-                                                storeInfo.couponVOList !=
-                                                    null &&
-                                                storeInfo.couponVOList[position]
-                                                        .useStartTime !=
-                                                    null &&
-                                                storeInfo.couponVOList[position]
-                                                        .useEndTime !=
-                                                    null)
-                                            ? "${storeInfo.couponVOList[position].useStartTime.replaceAll("-", ".").split(" ")[0]}-${storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
+                                                storeInfo.couponVOList != null &&
+                                                // storeInfo.couponVOList[position].useStartTime != null &&
+                                                storeInfo.couponVOList[position].useEndTime != null)
+                                            // ? "${storeInfo.couponVOList[position].useStartTime.replaceAll("-", ".").split(" ")[0]}-${storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
+                                            ? "${storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
                                             : "",
                                       ),
                                   overflow: TextOverflow.ellipsis,
@@ -1104,7 +1101,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
         .map((e) => Container(
               margin: EdgeInsets.only(right: 8.w),
               child: RoundButton(
-                height: 14.h,
+                height: 14.h * AppUtils.textScale(context),
                 text: "$e",
                 backgroup: Color(0xFFFF7A1A),
                 padding: EdgeInsets.only(

lib/view_widget/custom_image.dart

@@ -35,7 +35,6 @@ class MImage extends StatelessWidget {
         imageUrl = "$src?imageMogr2/thumbnail/${constraints.constrainWidth() * scaleIndex}"
             "x${constraints.constrainHeight() * scaleIndex}/format/webp/blur/1x0/quality/75";
       }
-      print("imageUrl: $imageUrl");
       if (imageUrl == null || imageUrl == "") {
         return Image.asset(
           "assets/image/default_2_1.png",

lib/view_widget/hot_item.dart

@@ -236,19 +236,20 @@ class _HotArticleItem extends State<HotArticleItem> {
               ),
               flex: 1,
             ),
-            IconText(
-              widget.article != null
-                  ? (widget.article.createTime.split(" ")[0])
-                  : "",
-              textStyle: TextStyle(
-                fontSize: 10.sp,
-                fontWeight: FontWeight.w400,
-                color: Color(0xFFB2B2B2),
+            if (widget.isHot != null && widget.isHot)
+              IconText(
+                widget.article != null
+                    ? (widget.article.createTime.split(" ")[0])
+                    : "",
+                textStyle: TextStyle(
+                  fontSize: 10.sp,
+                  fontWeight: FontWeight.w400,
+                  color: Color(0xFFB2B2B2),
+                ),
+                leftIcon: Icons.access_time_rounded,
+                iconSize: 10,
+                iconColor: Color(0xFFB2B2B2),
               ),
-              leftIcon: Icons.access_time_rounded,
-              iconSize: 10,
-              iconColor: Color(0xFFB2B2B2),
-            ),
           ],
         ),
       ],