Browse Source

Merge branch 'master' into dev

# Conflicts:
#	lib/web/web_view/comment_list.dart
master
w-R 3 years ago
parent
commit
59e3886191
  1. 2
      android/app/src/main/assets/data/dcloud_control.xml
  2. 3
      lib/generated/intl/messages_en.dart
  3. 3
      lib/generated/intl/messages_zh_CN.dart
  4. 3
      lib/generated/intl/messages_zh_Hans_CN.dart
  5. 3
      lib/generated/intl/messages_zh_Hant_CN.dart
  6. 3
      lib/generated/intl/messages_zh_TW.dart
  7. 30
      lib/generated/l10n.dart
  8. 3
      lib/home/huixiang_view/huixiang_banner.dart
  9. 8
      lib/integral/integral_page.dart
  10. 66
      lib/integral/intergra_view/integral_task.dart
  11. 3
      lib/l10n/intl_en.arb
  12. 3
      lib/l10n/intl_zh_CN.arb
  13. 3
      lib/l10n/intl_zh_Hans_CN.arb
  14. 3
      lib/l10n/intl_zh_Hant_CN.arb
  15. 3
      lib/l10n/intl_zh_TW.arb
  16. 3
      lib/mine/mine_page.dart
  17. 3
      lib/mine/mine_view/mine_view.dart
  18. 34
      lib/mine/mine_wallet_page.dart
  19. 996
      lib/order/order_detail_page.dart
  20. 330
      lib/order/order_view/order_address.dart
  21. 378
      lib/order/order_view/order_commodity.dart
  22. 119
      lib/order/order_view/order_info.dart
  23. 198
      lib/order/order_view/order_status.dart
  24. 2
      lib/union/union_details_page.dart
  25. 8
      lib/view_widget/coupon_widget.dart
  26. 8
      lib/view_widget/receive_success.dart
  27. 39
      lib/web/web_view/comment_list.dart

2
android/app/src/main/assets/data/dcloud_control.xml

@ -1,4 +1,4 @@
<hbuilder version="1.9.9.80110" debug="false" syncDebug="true">
<hbuilder version="1.9.9.80110" debug="false" syncDebug="false">
<apps>
<app appid="__UNI__ACD00DA" appver="1.0"/>
<app appid="__UNI__E60E056" appver="1.0"/>

3
lib/generated/intl/messages_en.dart

@ -267,6 +267,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -317,6 +318,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录,请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限,请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限,请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵,请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -585,6 +587,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_CN.dart

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录,请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限,请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限,请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵,请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -583,6 +585,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_Hans_CN.dart

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录,请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限,请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限,请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵,请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -583,6 +585,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_Hant_CN.dart

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄,請點擊去登錄"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限,请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限,请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券,請在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
@ -584,6 +586,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_TW.dart

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄,請點擊去登錄"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限,请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限,请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券,請在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
@ -584,6 +586,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

30
lib/generated/l10n.dart

@ -4955,6 +4955,36 @@ class S {
);
}
/// ``
String get ninyichenggonglingquyouhuiquan {
return Intl.message(
'您已成功领取优惠劵,请在',
name: 'ninyichenggonglingquyouhuiquan',
desc: '',
args: [],
);
}
/// `-使`
String get kabaokeshiyong {
return Intl.message(
'卡包-可使用',
name: 'kabaokeshiyong',
desc: '',
args: [],
);
}
/// ``
String get zhongchakan {
return Intl.message(
'中查看',
name: 'zhongchakan',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

3
lib/home/huixiang_view/huixiang_banner.dart

@ -65,9 +65,6 @@ class _HuiXiangBanner extends State<HuiXiangBanner> {
/// contentType 0123
bannerClick(BannerData bannerData) async {
switch (bannerData.contentType) {
case 0:
Navigator.of(context).pushNamed('/router/qr_share');
break;
case 1:
Navigator.of(context).pushNamed('/router/integral_store_page',
arguments: {"goodsId": bannerData.content});

8
lib/integral/integral_page.dart

@ -1,5 +1,4 @@
import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
@ -12,6 +11,7 @@ import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/sign_info.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/sign_in_widget.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -45,8 +45,8 @@ class _IntegralPage extends State<IntegralPage> {
);
userInfo = UserInfo.fromJson(jsonDecode(value.getString("user")));
BaseData<List<Rank>> rankData =
await apiService.rankList().catchError((onError) {});
BaseData<List<Rank>> rankData = await apiService.rankList()
.catchError((onError) {});
if (rankData != null && rankData.isSuccess) {
ranks.clear();
ranks.addAll(rankData.data);
@ -110,7 +110,7 @@ class _IntegralPage extends State<IntegralPage> {
style: TextStyle(
color: Colors.white,
fontSize: 16.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
),
),
),

66
lib/integral/intergra_view/integral_task.dart

@ -6,6 +6,7 @@ import 'package:huixiang/retrofit/data/sign_info.dart';
import 'package:huixiang/retrofit/data/task.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/round_button.dart';
class IntegralTask extends StatefulWidget {
@ -60,7 +61,7 @@ class _IntegralTask extends State<IntegralTask> {
Expanded(
child: Container(
child: ListView.builder(
padding: EdgeInsets.only(left: 10.w, top: 20.h),
padding: EdgeInsets.only(left: 10.w, top: 20.h),
physics: NeverScrollableScrollPhysics(),
// loop: false,
// pagination: SwiperPagination(
@ -79,8 +80,8 @@ class _IntegralTask extends State<IntegralTask> {
itemCount: (widget.signInfo != null &&
widget.signInfo.taskList != null &&
widget.signInfo.taskList.length > 0)
? widget.signInfo.taskList.length : 0
),
? widget.signInfo.taskList.length
: 0),
),
flex: 1,
)
@ -182,21 +183,50 @@ class _IntegralTask extends State<IntegralTask> {
],
),
),
RoundButton(
text: task.limitDay == (task.complateNum ?? task.conplateNum)
? S.of(context).yiwancheng
: S.of(context).quwancheng,
textColor: task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFF808080)
: Colors.white,
backgroup: task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFFF5F6FA)
: Color(0xFF32A060),
radius: 12.w,
fontSize: 12.sp,
fontWeight: MyFontWeight.semi_bold,
padding: EdgeInsets.symmetric(vertical: 4.h, horizontal: 12.w),
),
task.limitDay == (task.complateNum ?? task.conplateNum)
? RoundButton(
text: task.limitDay == (task.complateNum ?? task.conplateNum)
? S.of(context).yiwancheng
: S.of(context).quwancheng,
textColor:
task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFF808080)
: Colors.white,
backgroup:
task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFFF5F6FA)
: Color(0xFF32A060),
radius: 12.w,
fontSize: 12.sp,
fontWeight: MyFontWeight.semi_bold,
padding: EdgeInsets.symmetric(
vertical: 4.h,
horizontal: 15.w,
),
)
: RoundButton(
text: "x10",
textColor:
task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFF808080)
: Colors.white,
backgroup:
task.limitDay == (task.complateNum ?? task.conplateNum)
? Color(0xFFF5F6FA)
: Color(0xFF32A060),
icons: Image.asset(
"assets/image/icon_gold_coin.png",
width: 16,
height: 16,
),
radius: 12.w,
fontSize: 12.sp,
fontWeight: MyFontWeight.semi_bold,
padding: EdgeInsets.symmetric(
vertical: 4.h,
horizontal: 14.w,
),
),
],
),
);

3
lib/l10n/intl_en.arb

@ -513,6 +513,9 @@
"saomashibieguanzhugongzonghao": "扫码识别,关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵,请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_CN.arb

@ -515,6 +515,9 @@
"saomashibieguanzhugongzonghao": "扫码识别,关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵,请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_Hans_CN.arb

@ -515,6 +515,9 @@
"saomashibieguanzhugongzonghao": "扫码识别,关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵,请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_Hant_CN.arb

@ -508,6 +508,9 @@
"saomashibieguanzhugongzonghao": "掃碼識別,關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",
"ninyichenggonglingquyouhuiquan": "您已成功領取優惠券,請在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_TW.arb

@ -507,6 +507,9 @@
"saomashibieguanzhugongzonghao": "掃碼識別,關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",
"ninyichenggonglingquyouhuiquan": "您已成功領取優惠券,請在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/mine/mine_page.dart

@ -11,6 +11,7 @@ import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart';
import 'package:huixiang/view_widget/mine_vip_view.dart';
@ -237,7 +238,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
Text(
S.of(context).ninyouyigedingdanyaolingqu,
style: TextStyle(
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
fontSize: 12.sp,
color: Colors.black,
),

3
lib/mine/mine_view/mine_view.dart

@ -23,6 +23,7 @@ class MineView extends StatefulWidget {
}
class _MineView extends State<MineView> {
@override
Widget build(BuildContext context) {
return Column(
@ -35,7 +36,7 @@ class _MineView extends State<MineView> {
children: [
InkWell(
onTap: () {
toScan();
// toScan();
},
child: Container(
padding: EdgeInsets.all(8.h),

34
lib/mine/mine_wallet_page.dart

@ -260,17 +260,19 @@ class _MineWalletPage extends State<MineWalletPage> {
padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8)),
borderRadius: BorderRadius.circular(8),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(25),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
)
),
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Stack(
alignment: Alignment.center,
@ -280,9 +282,9 @@ class _MineWalletPage extends State<MineWalletPage> {
child: Text(
S.of(context).zhanghuyue,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535),
fontSize: 16.sp,
fontSize: 20.sp,
),
),
),
@ -304,7 +306,7 @@ class _MineWalletPage extends State<MineWalletPage> {
color: Color(0xFF353535),
fontSize: 12.sp,
),
)
),
],
),
),
@ -321,17 +323,17 @@ class _MineWalletPage extends State<MineWalletPage> {
fontSize: 50.sp,
),
),
SizedBox(
height: 4.h,
),
Text(
S.of(context).keyongyue,
style: TextStyle(
color: Color(0xFF20662A),
fontSize: 16.sp,
fontWeight: MyFontWeight.regular
),
),
// SizedBox(
// height: 4.h,
// ),
// Text(
// S.of(context).keyongyue,
// style: TextStyle(
// color: Color(0xFF20662A),
// fontSize: 16.sp,
// fontWeight: MyFontWeight.regular
// ),
// ),
SizedBox(
height: 24.h,
),

996
lib/order/order_detail_page.dart

File diff suppressed because it is too large Load Diff

330
lib/order/order_view/order_address.dart

@ -0,0 +1,330 @@
import 'package:flutter/material.dart';
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/view_widget/border_text.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:huixiang/view_widget/separator.dart';
import 'package:huixiang/view_widget/text_image_dialog.dart';
import 'package:url_launcher/url_launcher.dart';
class OrderAddress extends StatefulWidget {
final int orderStatus;
final int isTakeOut;
final int sendStatus;
final int payStatus;
final int refundStatus;
final String title;
final String center;
final Function orderCancel;
final OrderInfo orderInfo;
OrderAddress(this.orderStatus, this.isTakeOut, this.sendStatus, this.payStatus, this.refundStatus, this.title, this.center, this.orderCancel, this.orderInfo);
@override
State<StatefulWidget> createState() {
return _OrderAddress();
}
}
class _OrderAddress extends State<OrderAddress> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 20.h, bottom: 2.h),
padding: EdgeInsets.all(20),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
),
],
borderRadius: BorderRadius.circular(8),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Image.asset(
"assets/image/icon_location_address.png",
width: 28.w,
height: 28.h,
),
Text(
(widget.orderInfo != null && widget.orderInfo.addressExt != null)
? ((widget.isTakeOut == 0
? widget.orderInfo.storeName
: widget.orderInfo.addressExt.recName) ??
"")
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF4C4C4C),
),
),
SizedBox(
width: 12.w,
),
Expanded(
child: Text(
(widget.orderInfo != null && widget.orderInfo.addressExt != null)
? (widget.orderInfo.addressExt.recMobile ?? "")
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF4C4C4C),
),
),
),
Icon(
Icons.keyboard_arrow_right,
size: 16,
color: Colors.black,
),
],
),
Container(
margin: EdgeInsets.only(left: 28.w),
child: Text(
(widget.orderInfo != null && widget.orderInfo.addressExt != null)
? (widget.orderInfo.addressExt.address ?? "")
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFFA29E9E),
),
),
),
Visibility(
visible: widget.orderStatus < 5 && widget.refundStatus == 0,
child: Container(
margin: EdgeInsets.only(top: 20.h, bottom: 16.h),
child: MySeparator(
width: 5.w,
height: 1.h,
color: Color(0xFFA29E9E),
),
),
),
Visibility(
visible: widget.orderStatus < 5 && widget.refundStatus == 0,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
InkWell(
onTap: () {
if (widget.payStatus == 0) {
widget.orderCancel();
} else if (widget.payStatus < 4) {
SmartDialog.show(
widget: TextImageWidget(
"assets/image/icon_empty.png",
S.of(context).ruxutuikuanqingyumendianlianxi,
"",
S.of(context).zhidianmendian,
(open) {
if (open) {
String mobile = (widget.orderInfo != null &&
widget.orderInfo.storeVO != null)
? (widget.orderInfo.storeVO.mobile ?? "")
: "";
if (mobile != "") {
callMobile(mobile);
}
}
SmartDialog.dismiss();
},
leftText: S.of(context).quxiao,
width: MediaQuery.of(context).size.width - 30.w,
heightRatioWithWidth: 0.9,
),
);
}
},
child: Container(
padding: EdgeInsets.all(5),
child: Column(
children: [
Image.asset(
widget.payStatus == 0
? "assets/image/icon_order_cancel.png"
: "assets/image/icon_request_refund.png",
width: 24.w,
height: 24.h,
fit: BoxFit.contain,
),
SizedBox(
height: 8.h,
),
Text(
widget.payStatus == 0
? S.of(context).quxiaodingdan
: S.of(context).shenqingtuikuan,
style: TextStyle(
color: Color(0xFF353535),
fontSize: 12.sp,
),
),
],
),
),
),
GestureDetector(
onTap: () {
if (widget.payStatus == 0) {
carryOnPay();
} else {
String storeId =
(widget.orderInfo != null && widget.orderInfo.storeVO != null)
? (widget.orderInfo.storeVO.id ?? "")
: "";
String storeName =
(widget.orderInfo != null && widget.orderInfo.storeVO != null)
? (widget.orderInfo.storeVO.storeName ?? "")
: "";
aginOrder(storeId, storeName);
}
},
child: Container(
padding: EdgeInsets.all(5),
child: Column(
children: [
Image.asset(
widget.payStatus == 0
? "assets/image/icon_order_renminbi.png"
: "assets/image/icon_order_agin.png",
width: 24.w,
height: 24.h,
fit: BoxFit.contain,
),
SizedBox(
height: 8.h,
),
Text(
widget.payStatus == 0
? S.of(context).jixuzhifu
: S.of(context).zailaiyidan,
style: TextStyle(
color: Color(0xFF32A060),
fontSize: 12.sp,
),
),
],
),
),
),
],
),
),
],
),
);
}
callMobile(mobile) async {
String url = "tel:$mobile";
if (await canLaunch(url)) {
await launch(url);
} else {
throw 'Could not launch $url';
}
}
aginOrder(storeId, storeName) {
Navigator.of(context).pushNamed('/router/union_detail_page',
arguments: {"id": storeId, "storeName": storeName});
}
carryOnPay() async {
showDialog(
context: context,
builder: (context) {
return AlertDialog(
content: Container(
width: MediaQuery.of(context).size.width - 84.w,
height: 140.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"app暂不支持支付,\n请前往对应小程序处理",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
height: 30.h,
),
Row(
children: [
Expanded(
child: InkWell(
child: BorderText(
text: "取消",
textColor: Color(0xFF32A060),
fontSize: 16.sp,
fontWeight: FontWeight.bold,
borderColor: Color(0xFF32A060),
radius: 4,
padding: EdgeInsets.all(12),
borderWidth: 1,
),
onTap: () {
Navigator.of(context).pop();
},
),
flex: 1,
),
SizedBox(
width: 16.w,
),
Expanded(
child: InkWell(
child: RoundButton(
text: "好的",
textColor: Colors.white,
radius: 4,
padding: EdgeInsets.all(12),
backgroup: Color(0xFF32A060),
fontSize: 16.sp,
fontWeight: FontWeight.bold,
),
onTap: () {
Navigator.of(context).pop();
},
),
flex: 1,
),
],
),
],
),
),
);
},
);
}
}

378
lib/order/order_view/order_commodity.dart

@ -0,0 +1,378 @@
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/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/separator.dart';
class OrderCommodity extends StatefulWidget {
final OrderInfo orderInfo;
OrderCommodity(this.orderInfo);
@override
State<StatefulWidget> createState() {
return _OrderCommodity();
}
}
class _OrderCommodity extends State<OrderCommodity> {
@override
Widget build(BuildContext context) {
return Stack(
alignment: Alignment.centerRight,
children: [
Container(
margin: EdgeInsets.only(
left: 16.w,
right: 16.w,
top: 16.h,
bottom: 8.h,
),
padding: EdgeInsets.only(
left: 20.w,
right: 20.w,
top: 12.h,
bottom: 12.h,
),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 1),
blurRadius: 12,
spreadRadius: 0,
),
],
borderRadius: BorderRadius.circular(8),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: commodityList(),
),
),
Visibility(
child: buildQrCode(),
visible: false,
),
],
);
}
List<Widget> commodityList() {
if (widget.orderInfo == null) return [];
List<Widget> widgets = [];
if (widget.orderInfo.productList != null) {
widgets
.addAll(widget.orderInfo.productList.map((e) => commodityItem(e)).toList());
}
widgets.add(SizedBox(height: 20.h));
if (widget.orderInfo.isTakeOut != 0) {
//
widgets.add(discountItem(
Color(0xFFFF7A1A),
widget.orderInfo.isTakeOut == 1
? S.of(context).peisongfei
: S.of(context).yunfei,
"",
"+${widget.orderInfo.postFee}"));
}
if (widget.orderInfo.orderDetail != null &&
widget.orderInfo.orderDetail.couponDTO != null) {
//
widgets.add(discountItem(
Color(0xFF32A060),
S.of(context).youhuiquan,
widget.orderInfo.orderDetail.couponDTO.name,
widget.orderInfo.orderDetail.couponDTO.money));
}
if (widget.orderInfo.storeVO != null && widget.orderInfo.storeVO.couponVO != null) {
// widgets.add(discountItem(Color(0xFF32A060),
// orderInfo.storeVO.couponVO.storeName,
// S.of(context).huodongjianmianpeisongfei(orderInfo.storeVO.couponVO.discountAmount),
// orderInfo.storeVO.couponVO.f));
// Color(0xFFFF7A1A)
}
widgets.add(Container(
margin: EdgeInsets.only(
top: 24.h,
bottom: 4.h,
),
child: MySeparator(
height: 1,
width: 5.w,
color: Colors.grey,
),
));
widgets.add(buildTotalPrice());
return widgets;
}
Widget commodityItem(ProductList productList) {
return Container(
margin: EdgeInsets.only(top: 8.h, bottom: 8.h),
child: Row(
children: [
MImage(
productList.skuImg,
width: 44.w,
height: 44,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
),
Expanded(
flex: 1,
child: Container(
margin: EdgeInsets.only(
left: 16.w,
),
height: 44.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
productList.productName,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Color(0xFF353535),
),
),
Text(
"x${productList.buyNum}",
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF727272),
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 1,
child: Text(
productList.weight != null
? "${productList.weight}kg"
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFFA29E9E),
),
),
),
Text(
S.of(context).yuan_(productList.sellPrice),
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12.sp,
color: Color(0xFF4C4C4C),
),
)
],
),
],
),
),
),
],
),
);
}
Widget discountItem(Color color, textName, condition, amount) {
return Container(
margin: EdgeInsets.only(top: 9.h, bottom: 9.h),
child: Row(
children: [
Container(
padding: EdgeInsets.fromLTRB(4.w, 2.h, 4.w, 2.h),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2)),
border: Border.all(
width: 1,
color: color,
style: BorderStyle.solid,
),
),
child: Text(
textName,
style: TextStyle(
fontSize: 10.sp,
color: color,
),
),
),
SizedBox(
width: 27.w,
),
Expanded(
child: Text(
condition ?? "",
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFFA29E9E),
),
),
flex: 1,
),
Text(
S.of(context).yuan_("$amount"),
style: TextStyle(
fontSize: 12.sp,
color: color,
),
),
],
),
);
}
Widget buildQrCode() {
return Container(
margin: EdgeInsets.only(right: 16.w),
child: Stack(
children: [
Container(
width: 94.w,
height: 33.h,
margin: EdgeInsets.only(left: 12.w),
padding: EdgeInsets.only(left: 16.w),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(25),
offset: Offset(0, 1),
blurRadius: 12,
spreadRadius: 0,
)
],
borderRadius: BorderRadius.only(
topLeft: Radius.circular(2),
bottomLeft: Radius.circular(2),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
S.of(context).qujianma,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12.sp,
color: Colors.black,
),
),
Icon(
Icons.keyboard_arrow_right,
color: Colors.black,
size: 16,
)
],
),
),
Container(
margin: EdgeInsets.only(top: 6.h, bottom: 6.h),
// padding: EdgeInsets.all(2),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(25),
offset: Offset(0, 1),
blurRadius: 12,
spreadRadius: 0,
)
],
borderRadius: BorderRadius.circular(2),
),
child: Icon(
Icons.qr_code,
size: 20,
color: Color(0xFF32A060),
),
),
],
),
);
}
Widget buildTotalPrice() {
return Container(
margin: EdgeInsets.only(top: 7.h, bottom: 11.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
Expanded(
child: Text(
S.of(context).gongjijianshangpin(
(widget.orderInfo != null && widget.orderInfo.productList != null)
? widget.orderInfo.productList.length
: "0"),
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFFA29E9E),
),
),
flex: 1,
),
Container(
child: Text(
S.of(context).jiesuanjine,
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF353535),
),
),
),
SizedBox(
width: 5.w,
),
Text(
totalPrice(),
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 30.sp,
color: Color(0xFF32A060),
),
)
],
),
);
}
String totalPrice() {
if (widget.orderInfo == null) return "";
double totalPrice = (double.tryParse(widget.orderInfo.orderSum) +
double.tryParse(widget.orderInfo.postFee));
if (widget.orderInfo.orderDetail != null &&
widget.orderInfo.orderDetail.couponDTO != null) {
totalPrice -= double.tryParse(widget.orderInfo.orderDetail.couponDTO.money);
}
return "$totalPrice";
}
}

119
lib/order/order_view/order_info.dart

@ -0,0 +1,119 @@
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';
class OrderInfoView extends StatefulWidget {
final OrderInfo orderInfo;
OrderInfoView(this.orderInfo);
@override
State<StatefulWidget> createState() {
return _OrderInfoView();
}
}
class _OrderInfoView extends State<OrderInfoView> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom: 8.h),
padding:
EdgeInsets.only(left: 20.w, right: 20.w, top: 12.h, bottom: 12.h),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 1),
blurRadius: 12,
spreadRadius: 0,
)
],
borderRadius: BorderRadius.circular(8),
),
child: Column(
children: [
orderInfoItem(
S.of(context).dingdanhao, widget.orderInfo != null ? widget.orderInfo.id : ""),
orderInfoItem(S.of(context).xiadanshijian,
widget.orderInfo != null ? widget.orderInfo.createTime : ""),
// orderInfoItem(S.of(context).peisongfangshi, orderInfo != null ? orderInfo.createTime : ""),
orderInfoItem(
S.of(context).beizhu,
widget.orderInfo != null
? widget.orderInfo.notes ?? S.of(context).qingshurubeizhuyaoqiu
: S.of(context).qingshurubeizhuyaoqiu),
orderInfoItem(S.of(context).zhifufangshi,
widget.orderInfo != null ? payChannel() : S.of(context).yue),
],
),
);
}
String payChannel() {
switch (widget.orderInfo.payChannel) {
case 0:
return "现金支付";
case 1:
return "微信支付";
case 2:
return "支付宝支付";
case 3:
return "商户会员余额支付";
case 4:
return "平台会员余额支付";
case 5:
return "美团买单";
case 6:
return "饿了么支付";
case 7:
return "扫呗支付";
case 8:
return "微生活";
case 9:
return "银联支付";
}
return S.of(context).yue;
}
Widget orderInfoItem(leftText, rightText) {
return Container(
margin: EdgeInsets.only(top: 8.h, bottom: 8.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
leftText,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12.sp,
color: Color(0xFF727272),
),
),
Expanded(
child: Text(
rightText,
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF353535),
),
),
flex: 1,
),
],
),
);
}
}

198
lib/order/order_view/order_status.dart

@ -0,0 +1,198 @@
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/flutter_utils.dart';
import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/round_button.dart';
class OrderStatus extends StatefulWidget {
final int orderStatus;
final int isTakeOut;
final int sendStatus;
final int payStatus;
final int refundStatus;
final String title;
final String center;
final OrderInfo orderInfo;
OrderStatus(this.orderStatus, this.isTakeOut, this.sendStatus, this.payStatus, this.refundStatus, this.title, this.center, this.orderInfo);
@override
State<StatefulWidget> createState() {
return _OrderStatus();
}
}
class _OrderStatus extends State<OrderStatus> {
@override
Widget build(BuildContext context) {
return Container(
height: widget.orderStatus >= 4 ? 118.h : 118.h,
padding: EdgeInsets.fromLTRB(16.w, 0, 16.w, 10.h),
child: Column(
children: [
Visibility(
visible: widget.center != null && widget.center != "",
child: Container(
child: IconText(
(widget.center != null && widget.center != "") ? widget.center : "",
leftImage: "assets/image/icon_order_ok.png",
iconSize: 40.w,
textStyle: TextStyle(
fontSize: 24.sp,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
),
Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
RoundButton(
text: widget.isTakeOut == 0
? S.of(context).ziqu
: widget.isTakeOut == 1
? S.of(context).waimai
: S.of(context).kuaidi,
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),
backgroup: Color(0xFF32A060),
radius: 15.w,
),
Text(
widget.title,
style: TextStyle(
color: Colors.white,
fontSize: 12.sp,
),
),
],
),
flex: 1,
),
Visibility(
child: Container(
height: 33.h,
child: Row(
mainAxisSize: MainAxisSize.min,
children: timeWidget(),
),
),
visible: (widget.orderStatus >= 4 || widget.isTakeOut == 2)
? false
: (widget.isTakeOut == 0)
? !(widget.payStatus == 1)
: (widget.isTakeOut == 1)
? !(widget.payStatus == 1 &&
(widget.sendStatus != 2 &&
widget.sendStatus != 3))
: !(widget.payStatus == 1 &&
(widget.sendStatus != 1)),
),
],
),
flex: 1,
),
],
),
);
}
List<Widget> timeWidget() {
if (widget.orderInfo == null) return [];
String hour = "";
String minute = "";
if (widget.payStatus == 0) {
String hourMinute = AppUtils.getHourMinuteAfter30mByString(
(widget.orderInfo != null) ? widget.orderInfo.createTime : "");
var hourMinutes = hourMinute.split(":");
hour = hourMinutes[0];
minute = hourMinutes[1];
} else {
if (widget.isTakeOut == 0) {
} else if (widget.isTakeOut == 1) {
if (widget.sendStatus == 2 || widget.sendStatus == 3) {
String hourMinute = AppUtils.getHourMinuteByString(
(widget.orderInfo != null && widget.orderInfo.orderDetail != null)
? widget.orderInfo.orderDetail.predictTime
: "");
var hourMinutes = hourMinute.split(":");
hour = hourMinutes[0];
minute = hourMinutes[1];
}
} else if (widget.isTakeOut == 2) {
// if (sendStatus == 1) {
// String hourMinute = AppUtils.getHourMinuteByString(
// (orderInfo != null && orderInfo.orderDetail != null)
// ? orderInfo.orderDetail.predictTime
// : "");
// var hourMinutes = hourMinute.split(":");
// hour = hourMinutes[0];
// minute = hourMinutes[1];
// }
}
}
return [
AspectRatio(
aspectRatio: 1,
child: BorderText(
text: hour,
textColor: Colors.white,
fontSize: 21.sp,
fontWeight: FontWeight.bold,
borderColor: Colors.white,
borderWidth: 1,
padding: EdgeInsets.all(2),
),
),
SizedBox(
width: 8.w,
),
Text(
":",
style: TextStyle(
color: Colors.white,
fontSize: 21.sp,
),
),
SizedBox(
width: 8.w,
),
AspectRatio(
aspectRatio: 1,
child: BorderText(
text: minute,
textColor: Colors.white,
fontSize: 21.sp,
fontWeight: FontWeight.bold,
borderColor: Colors.white,
borderWidth: 1,
padding: EdgeInsets.all(2),
),
),
];
}
}

2
lib/union/union_details_page.dart

@ -44,6 +44,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
@override
void dispose() {
SmartDialog.dismiss();
EasyLoading.dismiss();
super.dispose();
refreshController.dispose();
}

8
lib/view_widget/coupon_widget.dart

@ -254,7 +254,7 @@ class CouponWidget extends StatelessWidget {
Padding(
padding: EdgeInsets.only(top: 50, bottom: 19),
child: Text(
"领取成功",
S.of(context).lingquchenggong,
style: TextStyle(
color: Color(0xff353535),
fontSize: 16.sp,
@ -262,7 +262,7 @@ class CouponWidget extends StatelessWidget {
),
),
Text(
"您已成功领取优惠劵,请在",
S.of(context).ninyichenggonglingquyouhuiquan,
style: TextStyle(
color: Color(0xff353535), fontSize: 14.sp),
),
@ -271,7 +271,7 @@ class CouponWidget extends StatelessWidget {
children: [
GestureDetector(
child: Text(
"卡包-可使用",
S.of(context).kabaokeshiyong,
style: TextStyle(
color: Color(0xffFF7A1A),
fontSize: 14.sp,
@ -280,7 +280,7 @@ class CouponWidget extends StatelessWidget {
onTap: callback,
),
Text(
"中查看",
S.of(context).zhongchakan,
style: TextStyle(
color: Color(0xff353535), fontSize: 14.sp),
),

8
lib/view_widget/receive_success.dart

@ -31,7 +31,7 @@ class ReceiveSuccess extends StatelessWidget {
Padding(
padding: EdgeInsets.only(top: 50.h, bottom: 19.h),
child: Text(
"领取成功",
S.of(context).lingquchenggong,
style: TextStyle(
color: Color(0xff353535),
fontSize: 16.sp,
@ -40,7 +40,7 @@ class ReceiveSuccess extends StatelessWidget {
),
),
Text(
"您已成功领取优惠劵,请在",
S.of(context).ninyichenggonglingquyouhuiquan,
style: TextStyle(
color: Color(0xff353535),
fontSize: 14.sp,
@ -53,7 +53,7 @@ class ReceiveSuccess extends StatelessWidget {
child: Text(
S.of(context).kaquan,
style: TextStyle(
color: Color(0xffFF7A1A),
color: Color(0xFFFF7A1A),
fontSize: 14.sp,
fontWeight: FontWeight.bold,
),
@ -64,7 +64,7 @@ class ReceiveSuccess extends StatelessWidget {
},
),
Text(
"中查看",
S.of(context).zhongchakan,
style: TextStyle(
color: Color(0xff353535),
fontSize: 14.sp,

39
lib/web/web_view/comment_list.dart

@ -9,6 +9,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/member_comment_list.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/comment_menu.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart';
@ -22,7 +23,6 @@ class CommentList extends StatefulWidget {
final bool isKeyBoardShow;
final Function reply;
final Function delCommentTips;
final double fontSize;
CommentList(
Key key,
@ -32,7 +32,6 @@ class CommentList extends StatefulWidget {
this.isKeyBoardShow,
this.reply,
this.delCommentTips,
this.fontSize
) : super(key: key);
@override
@ -72,6 +71,7 @@ class _CommentList extends State<CommentList> {
@override
void initState() {
super.initState();
queryMemberCommentList();
}
@ -102,8 +102,8 @@ class _CommentList extends State<CommentList> {
Text(
S.of(context).pinglun_(commentTotal.toString()),
style: TextStyle(
fontSize:widget.fontSize+4,
fontWeight: FontWeight.bold,
fontSize: 16.sp,
fontWeight: MyFontWeight.bold,
color: Color(0xff1A1A1A),
),
),
@ -112,10 +112,10 @@ class _CommentList extends State<CommentList> {
),
Text(
S.of(context).xihuan_(
"${widget.article?.likes ?? widget.activity?.likes ?? "0"}"),
"${(widget.article?.likes ?? widget.activity?.likes) ?? "0"}"),
style: TextStyle(
fontSize:widget.fontSize+4,
fontWeight: FontWeight.bold,
fontSize: 16.sp,
fontWeight: MyFontWeight.bold,
color: Color(0xff1A1A1A),
),
),
@ -161,7 +161,7 @@ class _CommentList extends State<CommentList> {
child: Text(
S.of(context).yixiansquanbupinglun,
style: TextStyle(
fontSize:widget.fontSize+2,
fontSize: 14.sp,
color: Color(0xff353535),
),
),
@ -179,8 +179,8 @@ class _CommentList extends State<CommentList> {
child: Text(
S.of(context).zanwupinglun,
style: TextStyle(
fontSize:widget.fontSize+2,
fontWeight: FontWeight.bold,
fontSize: 14.sp,
fontWeight: MyFontWeight.bold,
color: Color(0xFFA0A0A0),
),
),
@ -277,7 +277,7 @@ class _CommentList extends State<CommentList> {
),
Expanded(
child: Container(
// height: 60.h,
height: 60.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
@ -288,8 +288,8 @@ class _CommentList extends State<CommentList> {
TextSpan(
text: memberList.username,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize:widget.fontSize+2,
fontWeight: MyFontWeight.bold,
fontSize: 14.sp,
color: Colors.black,
),
),
@ -297,15 +297,12 @@ class _CommentList extends State<CommentList> {
),
textDirection: TextDirection.ltr,
),
SizedBox(
height: 3.h,
),
Text(
memberList.createTime,
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize:widget.fontSize,
fontSize: 12.sp,
color: Color(0xff808080),
),
),
@ -356,7 +353,7 @@ class _CommentList extends State<CommentList> {
text,
style: TextStyle(
color: Color(0xFF1A1A1A),
fontSize:widget.fontSize,
fontSize: 12.sp,
),
);
},
@ -378,7 +375,7 @@ class _CommentList extends State<CommentList> {
child: Text(
memberList.content,
style: TextStyle(
fontSize:widget.fontSize+2,
fontSize: 14.sp,
color: Color(0xff1A1A1A),
),
),
@ -403,7 +400,7 @@ class _CommentList extends State<CommentList> {
Text(
"${memberList.parentUserName}:" ?? "",
style: TextStyle(
fontSize: widget.fontSize,
fontSize: 12.sp,
color: Color(0xff808080),
),
),
@ -412,7 +409,7 @@ class _CommentList extends State<CommentList> {
child: Text(
memberList.parentContent ?? "",
style: TextStyle(
fontSize:widget.fontSize,
fontSize: 12.sp,
color: Color(0xff808080),
),
),

Loading…
Cancel
Save