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

Merge branch 'master' into dev

master
w-R 3 years ago
parent
8352eb4ebb 3c88b9ed4f
commit
356bdcd6a4
17 changed files with 95 additions and 91 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. 2
      lib/generated/intl/messages_en.dart
  2. 2
      lib/generated/intl/messages_zh_CN.dart
  3. 2
      lib/generated/intl/messages_zh_Hans_CN.dart
  4. 2
      lib/generated/intl/messages_zh_Hant_CN.dart
  5. 2
      lib/generated/intl/messages_zh_TW.dart
  6. 4
      lib/generated/l10n.dart
  7. 33
      lib/integral/integral_page.dart
  8. 2
      lib/l10n/intl_en.arb
  9. 2
      lib/l10n/intl_zh_CN.arb
  10. 2
      lib/l10n/intl_zh_Hans_CN.arb
  11. 2
      lib/l10n/intl_zh_Hant_CN.arb
  12. 2
      lib/l10n/intl_zh_TW.arb
  13. 2
      lib/mine/recharge_page.dart
  14. 4
      lib/order/order_detail_page.dart
  15. 17
      lib/union/union_details_page.dart
  16. 1
      lib/view_widget/custom_image.dart
  17. 1
      lib/view_widget/hot_item.dart

2
lib/generated/intl/messages_en.dart
Unescape View File

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

2
lib/generated/intl/messages_zh_CN.dart
Unescape View File

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

2
lib/generated/intl/messages_zh_Hans_CN.dart
Unescape View File

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

2
lib/generated/intl/messages_zh_Hant_CN.dart
Unescape View File

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

2
lib/generated/intl/messages_zh_TW.dart
Unescape View File

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

4
lib/generated/l10n.dart
Unescape View File

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

33
lib/integral/integral_page.dart
Unescape View File

@ -43,7 +43,9 @@ class _IntegralPage extends State<IntegralPage> {
token: value.getString("token"), token: value.getString("token"),
showLoading: false); showLoading: false);
userinfo = UserInfo.fromJson(jsonDecode(value.getString("user"))); 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(); querySignInfo();
}); });
} }
@ -81,6 +83,7 @@ class _IntegralPage extends State<IntegralPage> {
title: S.of(context).jifenxiangqing, title: S.of(context).jifenxiangqing,
titleColor: Colors.white, titleColor: Colors.white,
titleSize: 16.sp, titleSize: 16.sp,
brightness: Brightness.dark,
action: Container( action: Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(right: 16.w), margin: EdgeInsets.only(right: 16.w),
@ -292,7 +295,7 @@ class _IntegralPage extends State<IntegralPage> {
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
padding: EdgeInsets.fromLTRB(12.w, 4.h, 12.w, 4.h), padding: EdgeInsets.fromLTRB(12.w, 4.h, 12.w, 4.h),
) ),
], ],
), ),
); );
@ -304,7 +307,7 @@ class _IntegralPage extends State<IntegralPage> {
padding: EdgeInsets.all(6), padding: EdgeInsets.all(6),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFF0F0F2), color: Color(0xFFF0F0F2),
borderRadius: BorderRadius.all(Radius.circular(4)), borderRadius: BorderRadius.circular(4),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -320,7 +323,8 @@ class _IntegralPage extends State<IntegralPage> {
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF353535),
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w500,), fontWeight: FontWeight.w500,
),
), ),
SizedBox( SizedBox(
height: 10.h, height: 10.h,
@ -440,7 +444,8 @@ class _IntegralPage extends State<IntegralPage> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFF353535),), color: Color(0xFF353535),
),
), ),
SizedBox( SizedBox(
height: 10.h, height: 10.h,
@ -469,7 +474,8 @@ class _IntegralPage extends State<IntegralPage> {
}, },
staggeredTileBuilder: (position) { staggeredTileBuilder: (position) {
return StaggeredTile.count(position == 6 ? 2 : 1, 1.28); return StaggeredTile.count(position == 6 ? 2 : 1, 1.28);
}), },
),
InkWell( InkWell(
onTap: signIn, onTap: signIn,
child: Container( child: Container(
@ -490,7 +496,7 @@ class _IntegralPage extends State<IntegralPage> {
radius: 4, radius: 4,
), ),
), ),
) ),
], ],
), ),
); );
@ -547,7 +553,8 @@ class _IntegralPage extends State<IntegralPage> {
), ),
) )
], ],
)), ),
),
Container( Container(
width: 2.w, width: 2.w,
height: 32.h, height: 32.h,
@ -558,17 +565,17 @@ class _IntegralPage extends State<IntegralPage> {
child: InkWell( child: InkWell(
onTap: () { onTap: () {
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
if (value.getString("token") != null && value.getString("token") != "") { if (value.getString("token") != null &&
value.getString("token") != "") {
Navigator.of(context) Navigator.of(context)
.pushNamed('/router/mine_vip_level_page', arguments: { .pushNamed('/router/mine_vip_level_page', arguments: {
"rankLevel": rankLevel, "rankLevel": rankLevel,
"createTime": "createTime":
(userinfo != null) ? "${userinfo.createTime}" : "", (userinfo != null) ? "${userinfo.createTime}" : "",
"points": "points": (userinfo != null)
(userinfo != null) ? int.tryParse(userinfo.points) : 0, ? int.tryParse(userinfo.points)
: 0,
}); });
} else {
} }
}); });
}, },

2
lib/l10n/intl_en.arb
Unescape View File

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

2
lib/l10n/intl_zh_CN.arb
Unescape View File

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

2
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

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

2
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

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

2
lib/l10n/intl_zh_TW.arb
Unescape View File

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

2
lib/mine/recharge_page.dart
Unescape View File

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

4
lib/order/order_detail_page.dart
Unescape View File

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

17
lib/union/union_details_page.dart
Unescape View File

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

1
lib/view_widget/custom_image.dart
Unescape View File

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

1
lib/view_widget/hot_item.dart
Unescape View File

@ -236,6 +236,7 @@ class _HotArticleItem extends State<HotArticleItem> {
), ),
flex: 1, flex: 1,
), ),
if (widget.isHot != null && widget.isHot)
IconText( IconText(
widget.article != null widget.article != null
? (widget.article.createTime.split(" ")[0]) ? (widget.article.createTime.split(" ")[0])

Write Preview
Loading…
Cancel
Save