Browse Source

更改

master
w-R 3 years ago
parent
commit
ebf59c8e5b
  1. BIN
      assets/image/2x/oeder_cancel.png
  2. BIN
      assets/image/2x/order_ok.png
  3. BIN
      assets/image/2x/oreder_refund.png
  4. BIN
      assets/image/2x/shop_logo.png
  5. BIN
      assets/image/2x/wait_meal.png
  6. BIN
      assets/image/3x/oeder_cancel.png
  7. BIN
      assets/image/3x/order_ok.png
  8. BIN
      assets/image/3x/order_refund.png
  9. BIN
      assets/image/3x/shop_logo.png
  10. BIN
      assets/image/3x/wait_meal.png
  11. BIN
      assets/image/oeder_cancel.png
  12. BIN
      assets/image/order_ok.png
  13. BIN
      assets/image/order_refund.png
  14. BIN
      assets/image/shop_logo.png
  15. BIN
      assets/image/wait_meal.png
  16. 1
      lib/generated/intl/messages_en.dart
  17. 1
      lib/generated/intl/messages_zh_CN.dart
  18. 1
      lib/generated/intl/messages_zh_Hans_CN.dart
  19. 1
      lib/generated/intl/messages_zh_Hant_CN.dart
  20. 1
      lib/generated/intl/messages_zh_TW.dart
  21. 10
      lib/generated/l10n.dart
  22. 1
      lib/l10n/intl_en.arb
  23. 2
      lib/l10n/intl_zh_CN.arb
  24. 1
      lib/l10n/intl_zh_Hans_CN.arb
  25. 1
      lib/l10n/intl_zh_Hant_CN.arb
  26. 1
      lib/l10n/intl_zh_TW.arb
  27. 26
      lib/order/order_view/order_address.dart
  28. 15
      lib/order/order_view/order_info.dart
  29. 4
      lib/store/store_order.dart
  30. 32
      lib/store/store_view/store_info.dart

BIN
assets/image/2x/oeder_cancel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/image/2x/order_ok.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/image/2x/oreder_refund.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
assets/image/2x/shop_logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/image/2x/wait_meal.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
assets/image/3x/oeder_cancel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
assets/image/3x/order_ok.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
assets/image/3x/order_refund.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
assets/image/3x/shop_logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
assets/image/3x/wait_meal.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
assets/image/oeder_cancel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/order_ok.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/order_refund.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/image/shop_logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 826 B

BIN
assets/image/wait_meal.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

1
lib/generated/intl/messages_en.dart

@ -110,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
"bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),

1
lib/generated/intl/messages_zh_CN.dart

@ -110,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
"bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),

1
lib/generated/intl/messages_zh_Hans_CN.dart

@ -110,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
"bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),

1
lib/generated/intl/messages_zh_Hant_CN.dart

@ -110,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"),
"beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
"bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),

1
lib/generated/intl/messages_zh_TW.dart

@ -110,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"),
"beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
"bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),

10
lib/generated/l10n.dart

@ -5085,6 +5085,16 @@ class S {
);
}
/// ``
String get beizhuxinxi {
return Intl.message(
'备注信息',
name: 'beizhuxinxi',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

1
lib/l10n/intl_en.arb

@ -526,6 +526,7 @@
"yuliudianhua": "预留电话",
"tuiguangma": "推广码",
"wodegongju": "我的工具",
"beizhuxinxi": "备注信息",

2
lib/l10n/intl_zh_CN.arb

@ -528,6 +528,8 @@
"yuliudianhua": "预留电话",
"tuiguangma": "推广码",
"wodegongju": "我的工具",
"beizhuxinxi": "备注信息",

1
lib/l10n/intl_zh_Hans_CN.arb

@ -528,6 +528,7 @@
"yuliudianhua": "预留电话",
"tuiguangma": "推广码",
"wodegongju": "我的工具",
"beizhuxinxi": "备注信息",

1
lib/l10n/intl_zh_Hant_CN.arb

@ -521,6 +521,7 @@
"yuliudianhua": "預留電話",
"tuiguangma": "推廣碼",
"wodegongju": "我的工具",
"beizhuxinxi": "備注信息",

1
lib/l10n/intl_zh_TW.arb

@ -520,6 +520,7 @@
"yuliudianhua": "預留電話",
"tuiguangma": "推廣碼",
"wodegongju": "我的工具",
"beizhuxinxi": "備注信息",

26
lib/order/order_view/order_address.dart

@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/order_info.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:huixiang/view_widget/separator.dart';
@ -59,11 +60,13 @@ class _OrderAddress extends State<OrderAddress> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
"assets/image/icon_location_address.png",
width: 28.w,
height: 28.h,
"assets/image/shop_logo.png",
width: 24.w,
height: 24.h,
),
Text(
(widget.orderInfo != null &&
@ -75,8 +78,9 @@ class _OrderAddress extends State<OrderAddress> {
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontSize: 15.sp,
color: Color(0xFF4C4C4C),
fontWeight: MyFontWeight.medium
),
),
SizedBox(
@ -90,28 +94,26 @@ class _OrderAddress extends State<OrderAddress> {
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontSize: 15.sp,
color: Color(0xFF4C4C4C),
fontWeight: MyFontWeight.medium
),
),
),
Icon(
Icons.keyboard_arrow_right,
size: 16,
color: Colors.black,
),
],
),
Container(
margin: EdgeInsets.only(left: 28.w),
margin: EdgeInsets.only(left: 26.w),
child: Text(
(widget.orderInfo != null && widget.orderInfo.addressExt != null)
? (widget.orderInfo.addressExt.address ?? "")
: "",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 10.sp,
fontSize: 12.sp,
color: Color(0xFFA29E9E),
fontWeight: MyFontWeight.regular,
),
),
),

15
lib/order/order_view/order_info.dart

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/order_info.dart';
import 'package:huixiang/utils/font_weight.dart';
class OrderInfoView extends StatefulWidget {
@ -45,8 +46,9 @@ class _OrderInfoView extends State<OrderInfoView> {
orderInfoItem(S.of(context).xiadanshijian,
widget.orderInfo != null ? widget.orderInfo.createTime : ""),
// orderInfoItem(S.of(context).peisongfangshi, orderInfo != null ? orderInfo.createTime : ""),
orderInfoItem(S.of(context).peisongfangshi,"美团配送"),
orderInfoItem(
S.of(context).beizhu,
S.of(context).beizhuxinxi,
widget.orderInfo != null
? widget.orderInfo.notes ?? S.of(context).qingshurubeizhuyaoqiu
: S.of(context).qingshurubeizhuyaoqiu),
@ -94,9 +96,9 @@ class _OrderInfoView extends State<OrderInfoView> {
Text(
leftText,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12.sp,
color: Color(0xFF727272),
fontWeight:MyFontWeight.regular,
fontSize: 14.sp,
color: Color(0xFF353535),
),
),
Expanded(
@ -104,8 +106,9 @@ class _OrderInfoView extends State<OrderInfoView> {
rightText,
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF353535),
fontSize: 14.sp,
color: Color(0xFF4C4C4C),
fontWeight: MyFontWeight.semi_bold
),
),
flex: 1,

4
lib/store/store_order.dart

@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/activity.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
@ -15,7 +14,6 @@ import 'package:huixiang/union/union_view/union_coupon.dart';
import 'package:huixiang/union/union_view/vip.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_tab.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
@ -309,7 +307,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
});
},
child: Image.asset(
"assets/image/icon_shop.png",
"assets/image/shopp.png",
width: 88,
height: 88,
fit: BoxFit.fitWidth,

32
lib/store/store_view/store_info.dart

@ -4,6 +4,7 @@ import 'package:huixiang/retrofit/data/store_info.dart';
import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/round_button.dart';
class StoreInfoView extends StatefulWidget {
@ -67,7 +68,9 @@ class _StoreInfoView extends State<StoreInfoView> {
Row(
children: [
Text(
S.of(context).ren("1"),
S.of(context).ren(widget.storeInfo != null
? widget.storeInfo.perCapitaConsumption
: "",),
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
@ -78,10 +81,12 @@ class _StoreInfoView extends State<StoreInfoView> {
SizedBox(
width: 20.w,
),
]..addAll(itemServer("11,22")),
]..addAll(itemServer(widget.storeInfo != null
? widget.storeInfo.businessService
: "")),
),
Text(
"地址:武昌区楚河汉界第一街区万达总部国际C座对面",
widget.storeInfo != null ? widget.storeInfo.address : "",
maxLines: 2,
textAlign: TextAlign.justify,
style: TextStyle(
@ -95,11 +100,14 @@ class _StoreInfoView extends State<StoreInfoView> {
crossAxisAlignment: CrossAxisAlignment.start,
),
),
Image.asset(
"assets/image/icon_vip_name.png",
width: 70.w,
height: 70.w,
)
MImage(
widget.storeInfo != null ? widget.storeInfo.logo : "",
width: 70,
height:70,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
),
],
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
@ -112,7 +120,13 @@ class _StoreInfoView extends State<StoreInfoView> {
children: [
Expanded(
child: Text(
S.of(context).yingyeshijian("10:00-22:00"),
S.of(context).yingyeshijian(widget.storeInfo == null
? "" : (widget.storeInfo.openStartTime == null &&
widget.storeInfo.openEndTime == null)
? S.of(context).quantian
: "${widget.storeInfo.openStartTime.substring(0, widget.storeInfo.openStartTime.lastIndexOf(":"))} "
"- ${widget.storeInfo.openEndTime.substring(0, widget.storeInfo.openEndTime.lastIndexOf(":"))}"
),
style: TextStyle(
color: Color(0xFF353535),
fontWeight: MyFontWeight.regular,

Loading…
Cancel
Save