Browse Source

充值页增加推荐门店选择;(废弃原充值列表(rechargeAct),用新接口(rechargeActList),增加门店列表,推荐板块是否显示开关)

更改部分实体类类型解析错误(主要更改个人信息那块,如:粉丝,关注等字段);
更改下单备注,非预约商品,不传“预约门店”文本;
new_revision_app
wurong 2 years ago
parent
commit
f9c2f9af6f
  1. BIN
      assets/image/2x/recharge_z.webp
  2. BIN
      assets/image/3x/recharge_z.webp
  3. BIN
      assets/image/recharge_z.webp
  4. 2
      lib/mine/personal_page.dart
  5. 421
      lib/mine/recharge_page.dart
  6. 24
      lib/retrofit/data/member_Infor.dart
  7. 4
      lib/retrofit/data/miNiDetail.dart
  8. 155
      lib/retrofit/data/rechargeActLists.dart
  9. 6
      lib/retrofit/data/settleOrderInfo.dart
  10. 18
      lib/retrofit/data/social_info.dart
  11. 8
      lib/retrofit/data/user_info.dart
  12. 5
      lib/retrofit/retrofit_api.dart
  13. 14
      lib/retrofit/retrofit_api.g.dart
  14. 74
      lib/settlement/settlement.dart
  15. 8
      lib/view_widget/recharge_details_dialog.dart

BIN
assets/image/2x/recharge_z.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 894 B

BIN
assets/image/3x/recharge_z.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/image/recharge_z.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 658 B

2
lib/mine/personal_page.dart

@ -85,6 +85,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
BaseData<MemberInfor> baseData = BaseData<MemberInfor> baseData =
await apiService.memberDetail(id).catchError((error) { await apiService.memberDetail(id).catchError((error) {
refreshController.refreshFailed(); refreshController.refreshFailed();
debugPrint(error);
}); });
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
setState(() { setState(() {
@ -126,6 +127,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
"pageSize": 10, "pageSize": 10,
"searchKey": searchKey ?? "" "searchKey": searchKey ?? ""
}).catchError((error) { }).catchError((error) {
debugPrint(error);
if (searchKey == null) { if (searchKey == null) {
refreshController.refreshFailed(); refreshController.refreshFailed();
refreshController.loadFailed(); refreshController.loadFailed();

421
lib/mine/recharge_page.dart

@ -10,6 +10,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:fluwx/fluwx.dart'; import 'package:fluwx/fluwx.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/rechargeActLists.dart';
import 'package:huixiang/retrofit/data/recharge_list.dart'; import 'package:huixiang/retrofit/data/recharge_list.dart';
import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/data/vip_benefit_list.dart'; import 'package:huixiang/retrofit/data/vip_benefit_list.dart';
@ -42,12 +43,14 @@ class _RechargePage extends State<RechargePage> {
List<VipBenefitList> vipBenefitList = []; List<VipBenefitList> vipBenefitList = [];
Color color = Colors.black; Color color = Colors.black;
double discount = 100; double discount = 100;
List<RechargeList> rechargeA; // List<RechargeList> rechargeA;
int selectIndex = 0; int selectIndex = 0;
UserInfo userInfo; UserInfo userInfo;
String mBalance = "0"; String mBalance = "0";
dynamic payListen; dynamic payListen;
RechargeActLists rechargeActLists;
int selectStoreIndex = 0;
String recommendName;
@override @override
void initState() { void initState() {
@ -58,7 +61,7 @@ class _RechargePage extends State<RechargePage> {
context: context, token: value.getString("token"), pay: true); context: context, token: value.getString("token"), pay: true);
queryBenefitList(); queryBenefitList();
queryRuleDetails(); queryRuleDetails();
queryRechargeList(); queryRechargeActList();
queryUserBalance(); queryUserBalance();
}); });
payListen = weChatResponseEventHandler.listen((event) async { payListen = weChatResponseEventHandler.listen((event) async {
@ -67,8 +70,7 @@ class _RechargePage extends State<RechargePage> {
queryUserBalance(); queryUserBalance();
Navigator.of(context).pop(); Navigator.of(context).pop();
SmartDialog.showToast("充值成功", alignment: Alignment.center); SmartDialog.showToast("充值成功", alignment: Alignment.center);
} } else {
else{
SmartDialog.showToast("充值失败", alignment: Alignment.center); SmartDialog.showToast("充值失败", alignment: Alignment.center);
return; return;
} }
@ -78,8 +80,7 @@ class _RechargePage extends State<RechargePage> {
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
if(payListen!=null) if (payListen != null) payListen.cancel();
payListen.cancel();
} }
/// ///
@ -125,7 +126,7 @@ class _RechargePage extends State<RechargePage> {
} }
/// ///
queryRechargeList() async { queryRechargeActList() async {
if (apiService == null) { if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance(); SharedPreferences value = await SharedPreferences.getInstance();
apiService = ApiService( apiService = ApiService(
@ -134,11 +135,11 @@ class _RechargePage extends State<RechargePage> {
token: value.getString("token"), token: value.getString("token"),
); );
} }
BaseData<List<RechargeList>> baseData = BaseData<RechargeActLists> baseData =
await apiService.rechargeAct().catchError((onError) {}); await apiService.rechargeActList().catchError((onError) {});
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
setState(() { setState(() {
rechargeA = baseData.data; rechargeActLists = baseData.data;
}); });
} }
EasyLoading.dismiss(); EasyLoading.dismiss();
@ -215,7 +216,8 @@ class _RechargePage extends State<RechargePage> {
fontSize: 15.sp, fontSize: 15.sp,
color: Color(0xFF181818), color: Color(0xFF181818),
fontFamily: 'JDZhengHT', fontFamily: 'JDZhengHT',
fontWeight: MyFontWeight.semi_bold), fontWeight:
MyFontWeight.semi_bold),
)), )),
Text.rich( Text.rich(
TextSpan(children: [ TextSpan(children: [
@ -269,11 +271,10 @@ class _RechargePage extends State<RechargePage> {
)), )),
Container( Container(
width: double.infinity, width: double.infinity,
margin: EdgeInsets.only( margin: EdgeInsets.only(left: 16, right: 16),
bottom: 22.h, left: 16, right: 16),
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20.h, top: 20.h,
bottom: 20.h, bottom: 24.h,
), ),
// decoration: BoxDecoration( // decoration: BoxDecoration(
// color: Colors.white, // color: Colors.white,
@ -327,7 +328,7 @@ class _RechargePage extends State<RechargePage> {
], ],
), ),
), ),
SizedBox(height:10.h), SizedBox(height: 10.h),
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
@ -337,9 +338,9 @@ class _RechargePage extends State<RechargePage> {
}, },
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Image.asset( Image.asset(
"assets/image/icon_alipay.webp"), "assets/image/icon_alipay.webp"),
@ -363,6 +364,48 @@ class _RechargePage extends State<RechargePage> {
], ],
), ),
), ),
if((rechargeActLists?.isOpen ?? false) == true)
GestureDetector(
onTap: () {
showRecommendStore();
},
child: Container(
padding: EdgeInsets.only(
left: 14.w,
right: 16.w,
top: 14.h,
bottom: 14.h),
margin: EdgeInsets.only(
bottom: 22.h, left: 14.w, right: 14.w),
decoration: BoxDecoration(
color: Color(0xFFFAFAFA),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
Image.asset(
"assets/image/recharge_z.webp",
width: 16.w,
height: 17.h,
fit: BoxFit.fill,
),
SizedBox(width: 8.w),
Expanded(
child: Text(
recommendName ??"为喜爱门店打call!(可选)",
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: (recommendName != null) ?Color(0xFF32A060):Color(0xFF868686),
),
)),
Icon(
Icons.arrow_forward_ios,
size: 16,
),
],
)),
),
Align( Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: GestureDetector( child: GestureDetector(
@ -508,7 +551,7 @@ class _RechargePage extends State<RechargePage> {
Widget rechargeList() { Widget rechargeList() {
return ListView.builder( return ListView.builder(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
itemCount: rechargeA == null ? 0 : rechargeA.length, itemCount: (rechargeActLists != null && (rechargeActLists?.preferentialList?.length ?? 0) > 0) ? rechargeActLists.preferentialList.length : 0,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
@ -519,22 +562,24 @@ class _RechargePage extends State<RechargePage> {
selectIndex = position; selectIndex = position;
}); });
}, },
child: rechargeItem(rechargeA[position], position)); child: rechargeItem(rechargeActLists.preferentialList[position], position));
}, },
); );
} }
Widget rechargeItem(RechargeList rechargeA, index) { Widget rechargeItem(PreferentialList preferentialList, index) {
return Container( return Container(
width: double.infinity, width: double.infinity,
height: 69.h, height: 69.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
border: Border.all( border: Border.all(
color: selectIndex == index ? Color(0xFF32A060) :Color(0xFFFAFAFA), color:
width: selectIndex == index ? 1 :0, selectIndex == index ? Color(0xFF32A060) : Color(0xFFFAFAFA),
width: selectIndex == index ? 1 : 0,
), ),
color: selectIndex == index ? Color(0XFFF0FAF4) :Color(0xFFFAFAFA)), color:
selectIndex == index ? Color(0XFFF0FAF4) : Color(0xFFFAFAFA)),
margin: EdgeInsets.only(bottom: 14.w), margin: EdgeInsets.only(bottom: 14.w),
padding: EdgeInsets.only(left: 16), padding: EdgeInsets.only(left: 16),
child: Flex( child: Flex(
@ -549,16 +594,20 @@ class _RechargePage extends State<RechargePage> {
text: "储值 ", text: "储值 ",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color:selectIndex == index ? Color(0xFF4D4D4D):Color(0xFF868686), color: selectIndex == index
? Color(0xFF4D4D4D)
: Color(0xFF868686),
fontWeight: MyFontWeight.regular), fontWeight: MyFontWeight.regular),
), ),
TextSpan( TextSpan(
text: text:
"${AppUtils.calculateDouble(double.tryParse(rechargeA.rechargeMoney) ?? 0)}", "${AppUtils.calculateDouble(double.tryParse(preferentialList.rechargeMoney) ?? 0)}",
style: TextStyle( style: TextStyle(
fontSize: 18.sp, fontSize: 18.sp,
fontFamily: 'JDZhengHT', fontFamily: 'JDZhengHT',
color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686), color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.semi_bold), fontWeight: MyFontWeight.semi_bold),
), ),
]), ]),
@ -567,74 +616,81 @@ class _RechargePage extends State<RechargePage> {
Container( Container(
width: 1.w, width: 1.w,
height: 37.h, height: 37.h,
color: selectIndex == index ? Color(0xFF32A060):Color(0xFF979797), color:
selectIndex == index ? Color(0xFF32A060) : Color(0xFF979797),
margin: EdgeInsets.only(right: 16.w, left: 12), margin: EdgeInsets.only(right: 16.w, left: 12),
), ),
Expanded( Expanded(
flex: 2, flex: 2,
child:Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text.rich( Text.rich(
TextSpan(children: [ TextSpan(children: [
TextSpan( TextSpan(
text: "实际到账 ", text: "实际到账 ",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686), color: selectIndex == index
fontWeight: MyFontWeight.regular), ? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.regular),
),
TextSpan(
text:
"${AppUtils.calculateDouble((double.tryParse(preferentialList.rechargeMoney) ?? 0) + (double.tryParse(preferentialList.giftdMoney) ?? 0) + ((double.tryParse(preferentialList.rechargeMoney) ?? 0) - ((double.tryParse(preferentialList.rechargeMoney) ?? 0) * (discount / 100))))}",
style: TextStyle(
fontSize: 18.sp,
fontFamily: 'JDZhengHT',
color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.semi_bold),
),
]),
), ),
TextSpan( SizedBox(
text: height: 4.h,
"${AppUtils.calculateDouble((double.tryParse(rechargeA.rechargeMoney) ?? 0) + (double.tryParse(rechargeA.giftdMoney) ?? 0) + ((double.tryParse(rechargeA.rechargeMoney) ?? 0) - ((double.tryParse(rechargeA.rechargeMoney) ?? 0) * (discount / 100))))}",
style: TextStyle(
fontSize: 18.sp,
fontFamily: 'JDZhengHT',
color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686),
fontWeight: MyFontWeight.semi_bold),
), ),
]), GestureDetector(
), onTap: () {
SizedBox( setState(() {
height: 4.h, if (selectIndex == index) showRecharge(index);
), });
GestureDetector( },
onTap: (){ child: Row(
setState(() { mainAxisAlignment: MainAxisAlignment.start,
if(selectIndex == index) crossAxisAlignment: CrossAxisAlignment.center,
showRecharge(index); children: [
}); Text(
}, "充值说明",
child: Row( style: TextStyle(
mainAxisAlignment: MainAxisAlignment.start, color: selectIndex == index
crossAxisAlignment: CrossAxisAlignment.center, ? Color(0xFF4D4D4D)
children: [ : Color(0xFF868686),
Text( fontSize: 12.sp,
"充值说明", fontWeight: MyFontWeight.regular,
style: TextStyle( ),
color: selectIndex == index ?Color(0xFF4D4D4D) : Color(0xFF868686), ),
fontSize: 12.sp, Icon(
fontWeight: MyFontWeight.regular, Icons.chevron_right,
), size: 20,
), color: selectIndex == index
Icon( ? Color(0xFF353535)
Icons.chevron_right, : Color(0xFF868686),
size: 20, ),
color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686), ],
), )),
], ],
) ))
),
],
))
], ],
)); ));
} }
Widget checkView(var index) { Widget checkView(var index) {
return Container( return Container(
padding: EdgeInsets.only(right: 16.w,left: 46.w), padding: EdgeInsets.only(right: 16.w, left: 46.w),
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
checkIndex != index checkIndex != index
@ -648,15 +704,153 @@ class _RechargePage extends State<RechargePage> {
/// ///
showRecharge(index) { showRecharge(index) {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
builder: (context) { builder: (context) {
return RechargeWidget(rechargeA[index]); return RechargeWidget(rechargeActLists.preferentialList[index]);
}); });
} }
///
showRecommendStore() {
showModalBottomSheet(
context: context,
backgroundColor: Colors.transparent,
builder: (BuildContext context) {
return StatefulBuilder(builder: (
context,
state,
) {
return Container(
height: 321.h,
decoration: BoxDecoration(
color: Color(0xFFFAFAFA),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(6),
topRight: Radius.circular(6),
),
),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Container(
alignment: Alignment.center,
margin: EdgeInsets.symmetric(vertical: 12),
child: Text(
"选择推荐门店",
style: TextStyle(
fontWeight: MyFontWeight.bold,
fontSize: 15.sp,
color: Color(0xFF353535),
),
),
)),
GestureDetector(
onTap: () {
setState(() {
Navigator.of(context).pop();
});
},
child: Icon(
Icons.clear,
color: Colors.black,
size: 18,
),
),
SizedBox(width: 14),
],
),
Container(
height: 1,
color: Color(0xFFF2F2F2),
margin: EdgeInsets.only(bottom: 13.h),
),
Expanded(
child: ListView.builder(
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {
state(() {
selectStoreIndex = position;
});
},
child: recommendStoreItem(position),
);
},
itemCount: rechargeActLists.channels.length ?? 0,
)),
GestureDetector(
onTap: () {
setState(() {
recommendName =
rechargeActLists.channels[selectStoreIndex];
Navigator.of(context).pop();
});
},
child: Container(
width: double.infinity,
height: 40.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xFF32A060),
),
alignment: Alignment.center,
margin: EdgeInsets.only(
top: 14.h, bottom: 30.h, left: 16.w, right: 16.w),
child: Text(
S.of(context).queding,
style: TextStyle(
fontWeight: MyFontWeight.bold,
fontSize: 16.sp,
color: Color(0xFFFFFFFF),
),
),
),
),
],
),
);
});
},);
}
Widget recommendStoreItem(index) {
return Container(
height: 52,
margin: EdgeInsets.only(bottom: 12, left: 14, right: 14),
width: double.infinity,
decoration: BoxDecoration(
borderRadius: new BorderRadius.circular(6),
border: Border.all(
color:
selectStoreIndex == index ? Color(0xFF32A060) : Color(0xFFF7F7F7),
width: selectStoreIndex == index ? 1 : 0,
),
color:
selectStoreIndex == index ? Color(0xFFF0FAF4) : Color(0xFFF7F7F7),
),
alignment: Alignment.centerLeft,
padding: EdgeInsets.only(
left: 12,
),
child: Text(
rechargeActLists?.channels[index] ?? "",
style: TextStyle(
fontWeight: MyFontWeight.bold,
fontSize: 14.sp,
color: selectStoreIndex == index ? Color(0xFF32A060) : Colors.black,
),
),
);
}
///
recharge() async { recharge() async {
// String money = controller.text; // String money = controller.text;
// if (money == null || money == "") { // if (money == null || money == "") {
@ -673,11 +867,12 @@ class _RechargePage extends State<RechargePage> {
// } // }
BaseData<dynamic> baseData = await apiService.recharge({ BaseData<dynamic> baseData = await apiService.recharge({
"amount": 0, "amount": 0,
"rechargeActId": rechargeA[selectIndex].id, "rechargeActId": rechargeActLists.preferentialList[selectIndex].id,
"rechargeType": checkIndex "rechargeType": checkIndex,
"channel": recommendName,
}).catchError((error) {}); }).catchError((error) {});
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
if(checkIndex==2){ if (checkIndex == 2) {
if (Platform.isAndroid) { if (Platform.isAndroid) {
if (!(await Min.isInitialize())) { if (!(await Min.isInitialize())) {
// app的充值支付使用同一个WXPayEntryActivity回调 // app的充值支付使用同一个WXPayEntryActivity回调
@ -701,22 +896,26 @@ class _RechargePage extends State<RechargePage> {
timeStamp: int.tryParse(wxPay.timeStamp), timeStamp: int.tryParse(wxPay.timeStamp),
sign: wxPay.sign, sign: wxPay.sign,
); );
}else{ } else {
tobias.isAliPayInstalled().then((value) => { // tobias.isAliPayInstalled().then((value) => {
if (!value) { //
SmartDialog.showToast("请安装支付宝", alignment: Alignment.center) if (!value)
}else{ {SmartDialog.showToast("请安装支付宝", alignment: Alignment.center)}
tobias.aliPay(baseData.data["body"]).then((payRes) { else
if (payRes['resultStatus'] == 9000 || {
payRes['resultStatus'] == '9000') { tobias.aliPay(baseData.data["body"]).then((payRes) {
SmartDialog.showToast("充值成功", alignment: Alignment.center); if (payRes['resultStatus'] == 9000 ||
Navigator.of(context).pop(); payRes['resultStatus'] == '9000') {
} else { SmartDialog.showToast("充值成功",
SmartDialog.showToast(payRes['memo'], alignment: Alignment.center); alignment: Alignment.center);
} Navigator.of(context).pop();
}) } else {
} SmartDialog.showToast(payRes['memo'],
}); alignment: Alignment.center);
}
})
}
});
} }
} else { } else {
SmartDialog.showToast(baseData.msg, alignment: Alignment.center); SmartDialog.showToast(baseData.msg, alignment: Alignment.center);

24
lib/retrofit/data/member_Infor.dart

@ -31,10 +31,10 @@ class MemberInfor {
int age, int age,
String signature, String signature,
String background, String background,
int follow, String follow,
int fans, String fans,
int trendTotal, String trendTotal,
int gainLikeTotal,}){ String gainLikeTotal,}){
_id = id; _id = id;
_nickname = nickname; _nickname = nickname;
_headimg = headimg; _headimg = headimg;
@ -86,10 +86,10 @@ class MemberInfor {
int _age; int _age;
String _signature; String _signature;
String _background; String _background;
int _follow; String _follow;
int _fans; String _fans;
int _trendTotal; String _trendTotal;
int _gainLikeTotal; String _gainLikeTotal;
String get id => _id; String get id => _id;
String get nickname => _nickname; String get nickname => _nickname;
@ -104,10 +104,10 @@ class MemberInfor {
int get age => _age; int get age => _age;
String get signature => _signature; String get signature => _signature;
String get background => _background; String get background => _background;
int get follow => _follow; String get follow => _follow;
int get fans => _fans; String get fans => _fans;
int get trendTotal => _trendTotal; String get trendTotal => _trendTotal;
int get gainLikeTotal => _gainLikeTotal; String get gainLikeTotal => _gainLikeTotal;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};

4
lib/retrofit/data/miNiDetail.dart

@ -946,8 +946,8 @@ class StoreDTOBean {
String storeName; String storeName;
String nickName; String nickName;
String logo; String logo;
int productCount; dynamic productCount;
int soldNum; dynamic soldNum;
static StoreDTOBean fromJson(Map<String, dynamic> map) { static StoreDTOBean fromJson(Map<String, dynamic> map) {
if (map == null) return null; if (map == null) return null;

155
lib/retrofit/data/rechargeActLists.dart

@ -0,0 +1,155 @@
/// preferentialList : [{"id":"1506553893994102784","rechargeMoney":"100.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-11 10:10:31","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明:<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>","sortValue":1},{"id":"1506553858271215616","rechargeMoney":"300.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":2},{"id":"1506553832157478912","rechargeMoney":"500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:48","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":3},{"id":"1506553759084314624","rechargeMoney":"800.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":4},{"id":"1506553705988620288","rechargeMoney":"1000.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:55","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明:<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":5},{"id":"1506553668529291264","rechargeMoney":"1500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:52","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明:<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":6}]
/// channels : ["海峡","回乡","boom"]
/// isOpen : false
class RechargeActLists {
RechargeActLists({
List<PreferentialList> preferentialList,
List<String> channels,
bool isOpen,}){
_preferentialList = preferentialList;
_channels = channels;
_isOpen = isOpen;
}
RechargeActLists.fromJson(dynamic json) {
if (json['preferentialList'] != null) {
_preferentialList = [];
json['preferentialList'].forEach((v) {
_preferentialList.add(PreferentialList.fromJson(v));
});
}
_channels = json['channels'] != null ? json['channels'].cast<String>() : [];
_isOpen = json['isOpen'];
}
List<PreferentialList> _preferentialList;
List<String> _channels;
bool _isOpen;
RechargeActLists copyWith({ List<PreferentialList> preferentialList,
List<String> channels,
bool isOpen,
}) => RechargeActLists( preferentialList: preferentialList ?? _preferentialList,
channels: channels ?? _channels,
isOpen: isOpen ?? _isOpen,
);
List<PreferentialList> get preferentialList => _preferentialList;
List<String> get channels => _channels;
bool get isOpen => _isOpen;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
if (_preferentialList != null) {
map['preferentialList'] = _preferentialList.map((v) => v.toJson()).toList();
}
map['channels'] = _channels;
map['isOpen'] = _isOpen;
return map;
}
}
/// id : "1506553893994102784"
/// rechargeMoney : "100.00"
/// giftdMoney : "0.00"
/// gitfdCouponId : null
/// tenantCode : "admin"
/// createTime : "2022-11-11 10:10:31"
/// isDeleted : 0
/// rechargeType : 0
/// remark : "<p>充值说明:<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益,即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益,即充值100元账户120元。<br />共创用户享1.3倍充值会员权益,即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用,包含:农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>"
/// sortValue : 1
class PreferentialList {
PreferentialList({
String id,
String rechargeMoney,
String giftdMoney,
dynamic gitfdCouponId,
String tenantCode,
String createTime,
num isDeleted,
num rechargeType,
String remark,
num sortValue,}){
_id = id;
_rechargeMoney = rechargeMoney;
_giftdMoney = giftdMoney;
_gitfdCouponId = gitfdCouponId;
_tenantCode = tenantCode;
_createTime = createTime;
_isDeleted = isDeleted;
_rechargeType = rechargeType;
_remark = remark;
_sortValue = sortValue;
}
PreferentialList.fromJson(dynamic json) {
_id = json['id'];
_rechargeMoney = json['rechargeMoney'];
_giftdMoney = json['giftdMoney'];
_gitfdCouponId = json['gitfdCouponId'];
_tenantCode = json['tenantCode'];
_createTime = json['createTime'];
_isDeleted = json['isDeleted'];
_rechargeType = json['rechargeType'];
_remark = json['remark'];
_sortValue = json['sortValue'];
}
String _id;
String _rechargeMoney;
String _giftdMoney;
dynamic _gitfdCouponId;
String _tenantCode;
String _createTime;
num _isDeleted;
num _rechargeType;
String _remark;
num _sortValue;
PreferentialList copyWith({ String id,
String rechargeMoney,
String giftdMoney,
dynamic gitfdCouponId,
String tenantCode,
String createTime,
num isDeleted,
num rechargeType,
String remark,
num sortValue,
}) => PreferentialList( id: id ?? _id,
rechargeMoney: rechargeMoney ?? _rechargeMoney,
giftdMoney: giftdMoney ?? _giftdMoney,
gitfdCouponId: gitfdCouponId ?? _gitfdCouponId,
tenantCode: tenantCode ?? _tenantCode,
createTime: createTime ?? _createTime,
isDeleted: isDeleted ?? _isDeleted,
rechargeType: rechargeType ?? _rechargeType,
remark: remark ?? _remark,
sortValue: sortValue ?? _sortValue,
);
String get id => _id;
String get rechargeMoney => _rechargeMoney;
String get giftdMoney => _giftdMoney;
dynamic get gitfdCouponId => _gitfdCouponId;
String get tenantCode => _tenantCode;
String get createTime => _createTime;
num get isDeleted => _isDeleted;
num get rechargeType => _rechargeType;
String get remark => _remark;
num get sortValue => _sortValue;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
map['id'] = _id;
map['rechargeMoney'] = _rechargeMoney;
map['giftdMoney'] = _giftdMoney;
map['gitfdCouponId'] = _gitfdCouponId;
map['tenantCode'] = _tenantCode;
map['createTime'] = _createTime;
map['isDeleted'] = _isDeleted;
map['rechargeType'] = _rechargeType;
map['remark'] = _remark;
map['sortValue'] = _sortValue;
return map;
}
}

6
lib/retrofit/data/settleOrderInfo.dart

@ -22,6 +22,8 @@ class SettleOrderInfo {
bool isRaise; bool isRaise;
int selectDiscount; int selectDiscount;
bool useVipPriceSelect = false; bool useVipPriceSelect = false;
String vipDiscountAmount;
static SettleOrderInfo fromJson(Map<String, dynamic> map) { static SettleOrderInfo fromJson(Map<String, dynamic> map) {
if (map == null) return null; if (map == null) return null;
@ -51,6 +53,7 @@ class SettleOrderInfo {
settleOrderInfoBean.usePlateMoney = map['usePlateMoney']; settleOrderInfoBean.usePlateMoney = map['usePlateMoney'];
settleOrderInfoBean.isRaise = map['isRaise']; settleOrderInfoBean.isRaise = map['isRaise'];
settleOrderInfoBean.selectDiscount = map['selectDiscount']; settleOrderInfoBean.selectDiscount = map['selectDiscount'];
settleOrderInfoBean.vipDiscountAmount = map['vipDiscountAmount'];
return settleOrderInfoBean; return settleOrderInfoBean;
} }
@ -73,7 +76,8 @@ class SettleOrderInfo {
"memberCouponId": memberCouponId, "memberCouponId": memberCouponId,
"usePlateMoney":usePlateMoney, "usePlateMoney":usePlateMoney,
"isRaise":isRaise, "isRaise":isRaise,
"selectDiscount":selectDiscount "selectDiscount":selectDiscount,
"vipDiscountAmount":vipDiscountAmount
}; };

18
lib/retrofit/data/social_info.dart

@ -3,9 +3,9 @@
class SocialInfo { class SocialInfo {
SocialInfo({ SocialInfo({
int fans, dynamic fans,
int follow, dynamic follow,
int achievementNumber}){ dynamic achievementNumber}){
_fans = fans; _fans = fans;
_follow = follow; _follow = follow;
_achievementNumber = achievementNumber; _achievementNumber = achievementNumber;
@ -16,13 +16,13 @@ class SocialInfo {
_follow = json['follow']; _follow = json['follow'];
_achievementNumber = json['achievementNumber']; _achievementNumber = json['achievementNumber'];
} }
int _fans; dynamic _fans;
int _follow; dynamic _follow;
int _achievementNumber; dynamic _achievementNumber;
int get fans => _fans; dynamic get fans => _fans;
int get follow => _follow; dynamic get follow => _follow;
int get achievementNumber => _achievementNumber; dynamic get achievementNumber => _achievementNumber;
set fans(int value) { set fans(int value) {

8
lib/retrofit/data/user_info.dart

@ -41,8 +41,8 @@ class UserInfo {
String raiseExpireTime; String raiseExpireTime;
bool isBind; bool isBind;
String masterId; String masterId;
int inviteNumber; dynamic inviteNumber;
int todayInviteNumber; dynamic todayInviteNumber;
String masterCardRankName; String masterCardRankName;
MemberRank memberRankVo; MemberRank memberRankVo;
String inviteCode; String inviteCode;
@ -76,8 +76,8 @@ class UserInfo {
..raiseExpireTime = json['raiseExpireTime'] as String ..raiseExpireTime = json['raiseExpireTime'] as String
..isBind = json['isBind'] as bool ..isBind = json['isBind'] as bool
..masterId = json['masterId'] as String ..masterId = json['masterId'] as String
..inviteNumber = json['inviteNumber'] as int ..inviteNumber = json['inviteNumber'] as dynamic
..todayInviteNumber = json['todayInviteNumber'] as int ..todayInviteNumber = json['todayInviteNumber'] as dynamic
..masterCardRankName = json['masterCardRankName'] as String ..masterCardRankName = json['masterCardRankName'] as String
..inviteCode = json['inviteCode'] as String ..inviteCode = json['inviteCode'] as String
..signature = json['signature'] as String ..signature = json['signature'] as String

5
lib/retrofit/retrofit_api.dart

@ -47,6 +47,7 @@ import 'data/message.dart';
import 'data/msg_stats.dart'; import 'data/msg_stats.dart';
import 'data/page.dart'; import 'data/page.dart';
import 'data/rank.dart'; import 'data/rank.dart';
import 'data/rechargeActLists.dart';
import 'data/recharge_list.dart'; import 'data/recharge_list.dart';
import 'data/second_card_list.dart'; import 'data/second_card_list.dart';
import 'data/sign_info.dart'; import 'data/sign_info.dart';
@ -215,8 +216,8 @@ abstract class ApiService {
Future<BaseData<dynamic>> recharge(@Body() Map<String, dynamic> param); Future<BaseData<dynamic>> recharge(@Body() Map<String, dynamic> param);
/// ///
@GET("/wallet/rechargeAct") @GET("/wallet/rechargeActList")
Future<BaseData<List<RechargeList>>> rechargeAct(); Future<BaseData<RechargeActLists>> rechargeActList();
/// ///
@GET("/coupon/receive?couponId={couponId}") @GET("/coupon/receive?couponId={couponId}")

14
lib/retrofit/retrofit_api.g.dart

@ -301,12 +301,12 @@ class _ApiService implements ApiService {
} }
@override @override
Future<BaseData<List<RechargeList>>> rechargeAct() async { Future<BaseData<RechargeActLists>> rechargeActList() async {
const _extra = <String, dynamic>{}; const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{}; final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{}; final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>( final _result = await _dio.request<Map<String, dynamic>>(
'/wallet/rechargeAct', '/wallet/rechargeActList',
queryParameters: queryParameters, queryParameters: queryParameters,
options: RequestOptions( options: RequestOptions(
method: 'GET', method: 'GET',
@ -314,12 +314,10 @@ class _ApiService implements ApiService {
extra: _extra, extra: _extra,
baseUrl: baseUrl), baseUrl: baseUrl),
data: _data); data: _data);
final value = BaseData<List<RechargeList>>.fromJson( final value = BaseData<RechargeActLists>.fromJson(
_result.data, _result.data,
(json) => (json as List<dynamic>) (json) => RechargeActLists.fromJson(json),
.map<RechargeList>( );
(i) => RechargeList.fromJson(i as Map<String, dynamic>))
.toList());
return value; return value;
} }

74
lib/settlement/settlement.dart

@ -136,13 +136,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
address != null ? address.id : null, address != null ? address.id : null,
selectedBtn, selectedBtn,
null,
0, 0,
widget.arguments["pid"] ?? (productId ?? ""), 0,
widget.arguments["pid"] ?? (productId ?? 0),
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -152,11 +152,11 @@ class _Settlement extends State<Settlement> {
selectedBtn, selectedBtn,
widget.arguments["cid"], widget.arguments["cid"],
0, 0,
productId ?? null, productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -164,13 +164,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
null, null,
selectedBtn, selectedBtn,
null,
0, 0,
productId ?? null, 0,
productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -192,7 +192,7 @@ class _Settlement extends State<Settlement> {
productSkuId, productSkuId,
actProductId, actProductId,
actProductSkuId, actProductSkuId,
useVipPriceSelect, // useVipPriceSelect,
buyNum, buyNum,
payChannel, payChannel,
tableId) async { tableId) async {
@ -208,10 +208,11 @@ class _Settlement extends State<Settlement> {
"productSkuId": productSkuId, "productSkuId": productSkuId,
"actProductId": actProductId, "actProductId": actProductId,
"actProductSkuId": actProductSkuId, "actProductSkuId": actProductSkuId,
"useVipPrice": useVipPriceSelect, // "useVipPrice": useVipPriceSelect,
"buyNum": buyNum, "buyNum": buyNum,
"payChannel": payChannel, "payChannel": payChannel,
"tableId": tableId "tableId": tableId,
"discountType":"AUTO"
}).catchError((error) {}); }).catchError((error) {});
this.promotion = null; this.promotion = null;
promotions = ""; promotions = "";
@ -252,7 +253,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
settleOrderInfo.isRaise ? 7 : payChannel, settleOrderInfo.isRaise ? 7 : payChannel,
tableId); tableId);
@ -329,13 +330,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
address.id, address.id,
selectedBtn, selectedBtn,
null,
0, 0,
productId ?? null, 0,
productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -381,13 +382,13 @@ class _Settlement extends State<Settlement> {
await queryOrderInfo( await queryOrderInfo(
address.id, address.id,
selectedBtn, selectedBtn,
null,
0, 0,
productId ?? null, 0,
productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -409,13 +410,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
address.id, address.id,
selectedBtn, selectedBtn,
null,
0, 0,
productId ?? null, 0,
productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -506,9 +507,9 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.isTakeOut = selectedBtn; placeOrderFirst.isTakeOut = selectedBtn;
placeOrderFirst.notes = remakers + placeOrderFirst.notes = remakers +
(reservationTime ?? "") + (reservationTime ?? "") +
(subscribeParam == null ((subscribeParam?.isEnableSubscribe ?? false) == true
? "" ? "预约门店:${((subscribeParam?.stores?.length ?? 0) == 1 ? (subscribeParam.stores[0]) : (subscribeStoresName ?? ""))}"
: "预约门店:${((subscribeParam?.stores?.length ?? 0) == 1 ? (subscribeParam.stores[0]) : (subscribeStoresName ?? ""))}"); : "");
placeOrderFirst.numberOfPeople = "$numberOfPeople"; placeOrderFirst.numberOfPeople = "$numberOfPeople";
placeOrderFirst.orderSource = 2; placeOrderFirst.orderSource = 2;
placeOrderFirst.orderType = "0"; placeOrderFirst.orderType = "0";
@ -787,11 +788,11 @@ class _Settlement extends State<Settlement> {
isTake, isTake,
memberCouponId, memberCouponId,
orderId, orderId,
promotionId ?? (productId ?? ""), promotionId ?? (productId ?? 0),
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId ?? 0); tableId ?? 0);
@ -942,7 +943,7 @@ class _Settlement extends State<Settlement> {
if (subscribeParam != null && ((subscribeParam.isEnableSubscribe ?? false) == if (subscribeParam != null && ((subscribeParam.isEnableSubscribe ?? false) ==
true) && true) &&
(reservationTime == null || (reservationTime == null ||
subscribeStoresName == null)) { ((subscribeParam.stores.length ==1 ? subscribeParam.stores[0] : subscribeStoresName) == null))) {
SmartDialog.showToast( SmartDialog.showToast(
(reservationTime == null) (reservationTime == null)
? "请选择预约时间" ? "请选择预约时间"
@ -988,7 +989,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -1003,13 +1004,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
address?.id, address?.id,
selectedBtn, selectedBtn,
null,
0, 0,
productId ?? null, 0,
productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -1061,11 +1062,11 @@ class _Settlement extends State<Settlement> {
selectedBtn, selectedBtn,
couponBean?.id, couponBean?.id,
0, 0,
productId ?? null, productId ?? 0,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -1092,13 +1093,13 @@ class _Settlement extends State<Settlement> {
queryOrderInfo( queryOrderInfo(
address?.id, address?.id,
selectedBtn, selectedBtn,
null, 0,
0, 0,
(pro.id ?? "") ?? productId, (pro.id ?? "") ?? productId,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, // useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -1236,8 +1237,7 @@ class _Settlement extends State<Settlement> {
GestureDetector( GestureDetector(
onTap: (){ onTap: (){
setState(() { setState(() {
subscribeStoresName = subscribeStoresName = subscribeParam.stores[storesIndex];
subscribeParam.stores[storesIndex];
}); });
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },

8
lib/view_widget/recharge_details_dialog.dart

@ -11,9 +11,11 @@ import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
import '../retrofit/data/rechargeActLists.dart';
class RechargeWidget extends StatefulWidget { class RechargeWidget extends StatefulWidget {
final RechargeList rechargeA; final PreferentialList preferentialList;
RechargeWidget(this.rechargeA); RechargeWidget(this.preferentialList);
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
return _RechargeWidget(); return _RechargeWidget();
@ -87,7 +89,7 @@ class _RechargeWidget extends State<RechargeWidget> {
child: Container( child: Container(
color: Colors.white, color: Colors.white,
child: Html( child: Html(
data: widget.rechargeA.remark ?? "", data: widget.preferentialList.remark ?? "",
customImageRenders: { customImageRenders: {
networkSourceMatcher(): networkImageRender( networkSourceMatcher(): networkImageRender(
loadingWidget: () { loadingWidget: () {

Loading…
Cancel
Save