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

Merge remote-tracking branch 'origin/wr_2023_activity' into wr_2023_union 

# Conflicts:
#	assets/image/2x/icon_search.webp
#	assets/image/3x/icon_search.webp
#	assets/image/icon_search.webp
dev
huixiang_app 1 year ago
parent
92100c224b 3b355b5425
commit
d8157c49f8
5 changed files with 1166 additions and 417 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      lib/main.dart
  2. 194
      lib/mine/mine_shop_page.dart
  3. 664
      lib/mine/mine_shop_recharge.dart
  4. 2
      lib/mine/mine_view/mine_item.dart
  5. 720
      lib/mine/recharge_page.dart

3
lib/main.dart
Unescape View File

@ -112,6 +112,7 @@ import 'mine/manage_address_page.dart';
import 'mine/mine_greenery.dart'; import 'mine/mine_greenery.dart';
import 'mine/mine_shop_details.dart'; import 'mine/mine_shop_details.dart';
import 'mine/mine_shop_page.dart'; import 'mine/mine_shop_page.dart';
import 'mine/mine_shop_recharge.dart';
import 'mine/mine_view/community_follow.dart'; import 'mine/mine_view/community_follow.dart';
import 'mine/mine_vip/binding_assistant_card.dart'; import 'mine/mine_vip/binding_assistant_card.dart';
import 'mine/mine_vip/legal_right_details.dart'; import 'mine/mine_vip/legal_right_details.dart';
@ -405,6 +406,8 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
MineGreenery(), MineGreenery(),
'/router/mine_shop_page': (context, {arguments}) => '/router/mine_shop_page': (context, {arguments}) =>
MineShopPage(), MineShopPage(),
'/router/mine_shop_recharge': (context, {arguments}) =>
MineShopRecharge(arguments: arguments,),
'/router/mine_shop_details': (context, {arguments}) => '/router/mine_shop_details': (context, {arguments}) =>
MineShopDetails(arguments:arguments,), MineShopDetails(arguments:arguments,),
'/router/coupon_page': (context, {arguments}) => '/router/coupon_page': (context, {arguments}) =>

194
lib/mine/mine_shop_page.dart
Unescape View File

@ -27,28 +27,62 @@ class MineShopPage extends StatefulWidget {
} }
} }
class _MineShopPage extends State<MineShopPage> { class _MineShopPage extends State<MineShopPage> with WidgetsBindingObserver{
List<VipCard> coupons = []; List<VipCard> coupons = [];
ApiService apiService; ApiService apiService;
int current = 1; int current = 1;
RefreshController refreshController ; RefreshController refreshController ;
final TextEditingController editingController = TextEditingController();
int optionIndex = 0;
bool isKeyBoardShow = false;
List<String> hotSearch = [];
List<String> historySearch = [];
FocusNode _focusNode = FocusNode();
bool hasFocus = true;
int priceOrder = 0;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
refreshController = RefreshController(); refreshController = RefreshController();
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
apiService = apiService =
ApiService(Dio(), context: context, token: value.getString("token")); ApiService(Dio(), context: context, token: value.getString("token"));
queryVipCard(); queryVipCard();
}); });
_focusNode.addListener(() {
setState(() {
hasFocus = _focusNode.hasFocus;
});
});
} }
_onRefresh() { @override
current = 1; void didChangeMetrics() {
queryVipCard(); super.didChangeMetrics();
WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() {
print("object: ${MediaQuery.of(context).viewInsets.bottom}");
if (MediaQuery.of(context).viewInsets.bottom == 0) {
if (isKeyBoardShow) {
isKeyBoardShow = false;
//关闭键盘 软键盘关闭了， 清除输入控件的焦点， 否则重新进入页面会导致软键盘再弹出问题
FocusScope.of(context).requestFocus(FocusNode());
}
} else {
isKeyBoardShow = true;
}
});
});
}
///离开页面记着销毁和清除
@override
void dispose() {
_focusNode.unfocus();
refreshController.dispose();
super.dispose();
} }
queryVipCard() async { queryVipCard() async {
@ -69,46 +103,105 @@ class _MineShopPage extends State<MineShopPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return GestureDetector(
appBar: MyAppBar( behavior: HitTestBehavior.opaque,
title: S.of(context).dianpuyue, onTap: (){
titleColor: Colors.black, FocusScope.of(context).requestFocus(FocusNode());
background: Colors.white, },
leadingColor: Colors.black, child: Scaffold(
appBar: MyAppBar(
title: "店铺充值",
titleColor: Colors.black,
background: Colors.white,
leadingColor: Colors.black,
),
body:Column(
children: [
Container(
color: Colors.white,
padding: EdgeInsets.only(top:10.h,bottom:18.h,),
child: searchShopItem(),
),
Expanded(child: SmartRefresher(
enablePullDown: true,
enablePullUp: false,
header: MyHeader(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
),
controller: refreshController,
onRefresh: queryVipCard,
physics: BouncingScrollPhysics(),
child: (coupons != null && coupons.length > 0)
? ListView.builder(
padding: EdgeInsets.symmetric(vertical: 8.h),
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {
Navigator.of(context).pushNamed(
'/router/mine_shop_recharge',
arguments: {"id": coupons[position].id});
},
child: shopItem(coupons[position]),
);
},
itemCount: coupons != null ? coupons.length : 0,
)
: NoDataView(
src: "assets/image/icon_empty.webp",
isShowBtn: false,
text: "还没有会员卡～",
fontSize: 16.sp,
margin: EdgeInsets.only(top: 120.h),
),
),)
],
),
),
);
}
Widget searchShopItem() {
return Container(
height: 36.h,
margin: EdgeInsets.fromLTRB(14.w, 0, 14.w, 0),
padding: EdgeInsets.fromLTRB(0, 6.h, 0, 6.h),
decoration: BoxDecoration(
color: Color(0xFFF5FAF7),
borderRadius: BorderRadius.circular(4),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
),
],
), ),
body: SmartRefresher( child: TextField(
enablePullDown: true, textInputAction: TextInputAction.search,
enablePullUp: false, onEditingComplete: () {
header: MyHeader(), FocusScope.of(context).requestFocus(FocusNode());
footer: CustomFooter( },
builder: (context, mode) { controller: editingController,
return MyFooter(mode); cursorHeight: 25.h,
}, decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: 12.h,
),
hintText: "搜索联盟会员店",
hintStyle: TextStyle(
fontSize: 12.sp,
color: Color(0xFFB3B3B3),
),
prefixIcon:Image.asset(
"assets/image/icon_search.webp",
width: 16,
height: 16,
), ),
controller: refreshController, border: InputBorder.none,
onRefresh: queryVipCard,
physics: BouncingScrollPhysics(),
child: (coupons != null && coupons.length > 0)
? ListView.builder(
padding: EdgeInsets.symmetric(vertical: 8.h),
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {
Navigator.of(context).pushNamed(
'/router/mine_shop_details',
arguments: {"id": coupons[position].id});
},
child: shopItem(coupons[position]),
);
},
itemCount: coupons != null ? coupons.length : 0,
)
: NoDataView(
src: "assets/image/icon_empty.webp",
isShowBtn: false,
text: "还没有会员卡～",
fontSize: 16.sp,
margin: EdgeInsets.only(top: 120.h),
), ),
), ),
); );
@ -218,19 +311,20 @@ class _MineShopPage extends State<MineShopPage> {
), ),
)), )),
Text( Text(
S.of(context).chakanxiangqing, "去充值",
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF262626),
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
), ),
), ),
SizedBox(width: 2,), SizedBox(width: 2,),
Icon( Image.asset(
Icons.chevron_right, "assets/image/icon_right_z.webp",
size: 24, width: 16,
color: Colors.black, height: 16,
), color: Color(0xFF262626),
)
], ],
), ),
], ],

664
lib/mine/mine_shop_recharge.dart
Unescape View File

@ -0,0 +1,664 @@
import 'package:barcode_widget/barcode_widget.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bmflocation/flutter_bmflocation.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/data/product.dart';
import 'package:huixiang/retrofit/data/user_bill.dart';
import 'package:huixiang/retrofit/data/vip_card.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/store/scan.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/utils/location.dart';
import 'package:huixiang/utils/painter_bg.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../retrofit/data/rechargeActLists.dart';
import '../utils/flutter_utils.dart';
import '../view_widget/no_data_view.dart';
import '../view_widget/recharge_details_dialog.dart';
class MineShopRecharge extends StatefulWidget {
final Map<String, dynamic> arguments;
MineShopRecharge({this.arguments});
@override
State<StatefulWidget> createState() {
return _MineShopRecharge();
}
}
class _MineShopRecharge extends State<MineShopRecharge> {
ApiService apiService;
VipCard vipCard;
RechargeActLists rechargeActLists;
int selectIndex = 0;
double discount = 100;
var checkIndex = 2;
final RefreshController refreshController = RefreshController();
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();
vipDetail("", "");
}
///会员卡详情
vipDetail(latitude, longitude) async {
SharedPreferences value = await SharedPreferences.getInstance();
if (apiService == null)
apiService =
ApiService(Dio(), context: context, token: value.getString("token"));
BaseData<VipCard> baseData = await apiService.vipDetail({
"id": widget.arguments["id"],
"latitude": "$latitude",
"longitude": "$longitude",
}).catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
vipCard = baseData.data;
refreshController.loadComplete();
} else {
refreshController.loadFailed();
}
print("object:object");
setState(() {});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: MyAppBar(
title: "店铺充值",
titleColor: Colors.black,
background: Colors.white,
brightness: Brightness.dark,
leadingColor: Colors.black,
),
body:
Column(
children: [
shopRechargeCard(),
// NoDataView(
// src: "assets/image/xiao_fei.webp",
// isShowBtn: false,
// text: "当前店铺暂无充值套餐~",
// fontSize: 16.sp,
// margin: EdgeInsets.only(top: 120.h, left: 60.w, right: 60.w),
// ),
Expanded(child:ListView.builder(
padding: EdgeInsets.zero,
itemCount: 6,
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {
setState(() {
selectIndex = position;
});
},
child: rechargeItem(position));
},
)),
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 16, right: 16),
padding: EdgeInsets.only(
top: 20.h,
bottom: 24.h,
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(bottom: 16.h),
child: Text(
S.of(context).zhifufangshi,
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
setState(() {
checkIndex = 2;
});
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Image.asset(
"assets/image/icon_we_chat.webp"),
Expanded(
flex: 1,
child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).weixinzhifu,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
),
),
),
),
checkView(2),
],
),
),
SizedBox(height: 10.h),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
setState(() {
checkIndex = 3;
});
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Image.asset(
"assets/image/icon_alipay.webp"),
Expanded(
flex: 1,
child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).zhifubao,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
),
),
),
),
checkView(3),
],
),
),
],
),
),
Align(
alignment: Alignment.bottomCenter,
child: GestureDetector(
onTap: () {
},
child: Container(
height: 56.h,
width: double.infinity,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xFF32A060),
borderRadius: BorderRadius.circular(27),
),
margin: EdgeInsets.only(
top: 12.h, left: 16.w, right: 16.w, bottom: 21.h),
child: Text(
S.of(context).querenchongzhi,
style: TextStyle(
fontSize: 16.sp,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
),
),
)
],
),
);
}
///卡片背景底色
int colorByName(String storeName) {
if (storeName == null) return 0xFF32A060;
if (storeName.contains("百年川椒") || storeName.contains("百年川椒")) {
return 0xFFC30D23;
} else if (storeName.contains("海峡姐妹") || storeName.contains("海峽姐妹")) {
return 0xFFE4C796;
} else if (storeName.contains("前进麦味") || storeName.contains("前進麥味")) {
return 0xFF265782;
}
return 0xFF32A060;
}
///卡片详情
Widget shopRechargeCard() {
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: (){
Navigator.of(context).pushNamed(
'/router/mine_shop_details',
arguments: {"id": widget.arguments["id"]});
},
child: Container(
width: double.infinity,
// height:140.h,
margin: EdgeInsets.only(bottom: 24.h, top: 14.h, left: 14.w, right: 14.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
decoration: BoxDecoration(
borderRadius: new BorderRadius.only(
topLeft: Radius.circular(6),
topRight: Radius.circular(6),
),
color: Color(colorByName(vipCard?.tenantName ?? "")),
),
padding: EdgeInsets.only(left: 12.w),
height: 62.h,
child: Row(
children: [
MImage(
(vipCard?.storeList?.length ?? 0) > 0
? vipCard.storeList[0].logo
: "",
width: 38,
height: 38,
radius: BorderRadius.circular(100),
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.webp",
fadeSrc: "assets/image/default_1.webp",
),
SizedBox(
width: 6,
),
Text(
vipCard != null ? vipCard.tenantName : "",
style: TextStyle(
color: Color(0xFFFFFFFF),
fontSize: 15.sp,
fontWeight: MyFontWeight.medium,
),
),
],
),
),
Container(
decoration: BoxDecoration(
borderRadius: new BorderRadius.only(
bottomRight: Radius.circular(6),
topRight: Radius.circular(6),
),
color: Colors.white,
),
padding: EdgeInsets.all(12.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"店铺余额(元)",
style: TextStyle(
color: Color(0xFF262626),
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
),
),
Text(
"No.${vipCard?.id ?? ""}",
style: TextStyle(
color: Color(0xFF262626),
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
),
),
],
),
SizedBox(
height: 4.h,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Text(
"￥ ${vipCard != null ? vipCard.balance : ""}",
style: TextStyle(
color: Color(0xFF262626),
fontSize: 24.sp,
fontFamily: 'JDZhengHT',
fontWeight: MyFontWeight.medium,
),
),),
Text(
"适用门店",
style: TextStyle(
color: Color(0xFF262626),
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
),
),
SizedBox(width: 2,),
Image.asset(
"assets/image/icon_right_z.webp",
width: 16,
height: 16,
color: Color(0xFF262626),
)
],
),
],
),
),
],
),
),
);
}
///充值item
Widget rechargeItem(index) {
return Container(
width: double.infinity,
height: 69.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
border: Border.all(
color:
selectIndex == index ? Color(0xFF32A060) : Color(0xFFFAFAFA),
width: selectIndex == index ? 1 : 0,
),
color:
selectIndex == index ? Color(0XFFF0FAF4) : Colors.white),
margin: EdgeInsets.only(bottom: 14.h,left: 14.w,right: 14.w),
padding: EdgeInsets.only(left: 16),
child: Flex(
direction: Axis.horizontal,
children: [
Expanded(
flex: 1,
child: Container(
child: Text.rich(
TextSpan(children: [
TextSpan(
text: "储值 ",
style: TextStyle(
fontSize: 12.sp,
color: selectIndex == index
? Color(0xFF4D4D4D)
: Color(0xFF868686),
fontWeight: MyFontWeight.regular),
),
TextSpan(
text:
"555元",
style: TextStyle(
fontSize: 18.sp,
fontFamily: 'JDZhengHT',
color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
)),
Container(
width: 1.w,
height: 37.h,
color:
selectIndex == index ? Color(0xFF32A060) : Color(0xFF979797),
margin: EdgeInsets.only(right: 16.w, left: 12),
),
Expanded(
flex: 2,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "实际到账 ",
style: TextStyle(
fontSize: 12.sp,
color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.regular),
),
TextSpan(
text:
"526元",
style: TextStyle(
fontSize: 18.sp,
fontFamily: 'JDZhengHT',
color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
SizedBox(
height: 4.h,
),
GestureDetector(
onTap: () {
setState(() {
if (selectIndex == index) showRecharge(index);
});
},
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"充值说明",
style: TextStyle(
color: selectIndex == index
? Color(0xFF4D4D4D)
: Color(0xFF868686),
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
),
),
Icon(
Icons.chevron_right,
size: 20,
color: selectIndex == index
? Color(0xFF353535)
: Color(0xFF868686),
),
],
)),
],
))
],
));
}
Widget checkView(var index) {
return Container(
padding: EdgeInsets.only(right: 16.w, left: 46.w),
alignment: Alignment.center,
child: Image.asset(
checkIndex != index
? "assets/image/icon_radio_unselected.webp"
: "assets/image/icon_radio_selected.webp",
width: 15.w,
height: 15.h,
),
);
}
///充值说明底部弹窗
showRecharge(index) {
showModalBottomSheet(
context: context,
backgroundColor: Colors.transparent,
builder: (context) {
return RechargeWidget(rechargeActLists.preferentialList[index]);
});
}
Widget shopItem(StoreListBean store) {
return Container(
decoration: BoxDecoration(
borderRadius: new BorderRadius.circular(6),
color: Colors.white,
),
padding: EdgeInsets.all(12),
margin: EdgeInsets.symmetric(horizontal: 16.w, vertical: 8.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
flex: 1,
child: Text(
(store != null) ? store.storeName : "",
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
color: Colors.black,
),
),
),
GestureDetector(
onTap: () {
// Navigator.of(context).pushNamed('/router/union_detail_page',
// arguments: {"id": store.id});
if (store.posType.code == "NORMALSTORE") {
Scan.toScan(
context,
store.id,
store.tenantCode,
store.storeName,
);
} else {
Navigator.of(context).pushNamed(
'/router/store_order',
arguments: {
"id": store.id,
"tenant": store.tenantCode,
"storeName": store.storeName
},
);
}
},
child: Text(
S.of(context).chakan,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xff32A060),
),
),
),
Icon(
Icons.chevron_right,
color: Color(0xff32A060),
size: 16,
),
],
),
SizedBox(
height: 8.h,
),
Row(
children: [
Text(
"${S.of(context).dizhi}: ",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xff353535),
),
),
Expanded(
child: Text(
store.address,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xff353535),
),
),
flex: 1,
)
],
),
SizedBox(
height: 4.h,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 1,
child: Text(
S.of(context).yingyeshijian((store.openStartTime == null &&
store.openEndTime == null)
? S.of(context).quantian
: "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}"),
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xff353535),
),
),
),
Text(
(store.distance ?? 0) > 1000
? S.of(context).gongli(
((store.distance ?? 0) / 1000 * 100).toInt() / 100.0)
: S
.of(context)
.mi(((store.distance ?? 0) * 100).toInt() / 100.0),
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xff868686),
),
),
],
),
],
),
);
}
}

2
lib/mine/mine_view/mine_item.dart
Unescape View File

@ -182,7 +182,7 @@ class _MineItem extends State<MineItem> {
}); });
}, },
child: mineItem( child: mineItem(
S.of(context).dianpuyue, "店铺充值",
"assets/image/shop_yue.webp", "assets/image/shop_yue.webp",
), ),
),), ),),

720
lib/mine/recharge_page.dart
Unescape View File

@ -150,386 +150,374 @@ class _RechargePage extends State<RechargePage> {
body: Container( body: Container(
color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
child: SingleChildScrollView( child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Container( child: Container(
child: Stack( child: Column(
children: [ children: [
Column( Container(
children: [ margin: EdgeInsets.only(left: 16, right: 16),
SingleChildScrollView( child: Column(
physics: BouncingScrollPhysics(), crossAxisAlignment: CrossAxisAlignment.start,
child: Container( mainAxisAlignment: MainAxisAlignment.start,
child: Column( children: [
// ItemInputWidget(
// S.of(context).qingshuruchongzhijine,
// hintText: "",
// controller: controller,
// padding: EdgeInsets.all(20),
// errorText: S.of(context).chongzhizuixiaojine(100),
// titleColor: Color(0xFF727272),
// errorTextColor: Color(0xFF32A060),
// radius: 8,
// discount: discount / 10,
// style: TextStyle(
// fontWeight: FontWeight.bold,
// fontSize: 27.sp,
// color: color,
// ),
// inputLimit: 6,
// textInputType: TextInputType.number,
// textInputFormatter:
// FilteringTextInputFormatter.digitsOnly,
// onChanged: (value) {
// if (value != null &&
// value != "" &&
// double.tryParse(value) < 100) {
// color = Colors.red;
// } else {
// color = Colors.black;
// }
// setState(() {});
// },
// ),
SizedBox(
height: 20,
),
Row(
children: [ children: [
Container( Expanded(
margin: EdgeInsets.only(left: 16, right: 16), child: Text(
child: Column( S.of(context).zhanghuyue,
crossAxisAlignment: CrossAxisAlignment.start, style: TextStyle(
mainAxisAlignment: MainAxisAlignment.start, fontSize: 15.sp,
children: [ color: Color(0xFF181818),
// ItemInputWidget( fontFamily: 'JDZhengHT',
// S.of(context).qingshuruchongzhijine, fontWeight:
// hintText: "", MyFontWeight.semi_bold),
// controller: controller,
// padding: EdgeInsets.all(20),
// errorText: S.of(context).chongzhizuixiaojine(100),
// titleColor: Color(0xFF727272),
// errorTextColor: Color(0xFF32A060),
// radius: 8,
// discount: discount / 10,
// style: TextStyle(
// fontWeight: FontWeight.bold,
// fontSize: 27.sp,
// color: color,
// ),
// inputLimit: 6,
// textInputType: TextInputType.number,
// textInputFormatter:
// FilteringTextInputFormatter.digitsOnly,
// onChanged: (value) {
// if (value != null &&
// value != "" &&
// double.tryParse(value) < 100) {
// color = Colors.red;
// } else {
// color = Colors.black;
// }
// setState(() {});
// },
// ),
SizedBox(
height: 20,
),
Row(
children: [
Expanded(
child: Text(
S.of(context).zhanghuyue,
style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontFamily: 'JDZhengHT',
fontWeight:
MyFontWeight.semi_bold),
)),
Text.rich(
TextSpan(children: [
TextSpan(
text: "$mBalance",
style: TextStyle(
fontSize: 26.sp,
fontFamily: 'JDZhengHT',
color: Color(0xFF181818),
fontWeight:
MyFontWeight.semi_bold),
),
TextSpan(
text: "元",
style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontWeight:
MyFontWeight.semi_bold),
),
]),
),
],
),
SizedBox(height: 28),
rechargeList(),
// Row(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: [
// if (vipRuleDetails?.recharge != null &&
// vipRuleDetails.recharge != "")
// Expanded(
// child: Container(
// color: Colors.white,
// child: Html(
// data: "注意:${vipRuleDetails?.recharge ?? ""}",
// customImageRenders: {
// networkSourceMatcher(): networkImageRender(
// loadingWidget: () {
// return Container();
// },
// ),
// },
// ),
// ),
// )
// ],
// ),
],
)), )),
Container( Text.rich(
width: double.infinity, TextSpan(children: [
margin: EdgeInsets.only(left: 16, right: 16), TextSpan(
padding: EdgeInsets.only( text: "$mBalance",
top: 20.h, style: TextStyle(
bottom: 24.h, fontSize: 26.sp,
), fontFamily: 'JDZhengHT',
// decoration: BoxDecoration( color: Color(0xFF181818),
// color: Colors.white, fontWeight:
// borderRadius: BorderRadius.circular(4), MyFontWeight.semi_bold),
// ), ),
child: Column( TextSpan(
mainAxisAlignment: text: "元",
MainAxisAlignment.spaceAround, style: TextStyle(
crossAxisAlignment: CrossAxisAlignment.start, fontSize: 15.sp,
children: [ color: Color(0xFF181818),
Padding( fontWeight:
padding: EdgeInsets.only(bottom: 16.h), MyFontWeight.semi_bold),
child: Text( ),
S.of(context).zhifufangshi, ]),
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
setState(() {
checkIndex = 2;
});
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Image.asset(
"assets/image/icon_we_chat.webp"),
Expanded(
flex: 1,
child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).weixinzhifu,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
),
),
),
),
checkView(2),
],
),
),
SizedBox(height: 10.h),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
setState(() {
checkIndex = 3;
});
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Image.asset(
"assets/image/icon_alipay.webp"),
Expanded(
flex: 1,
child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).zhifubao,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
),
),
),
),
checkView(3),
],
),
),
],
),
), ),
if((rechargeActLists?.isOpen ?? false) == true) ],
GestureDetector( ),
onTap: () { SizedBox(height: 28),
showRecommendStore(); rechargeList(),
}, // Row(
child: Container( // crossAxisAlignment: CrossAxisAlignment.start,
padding: EdgeInsets.only( // mainAxisAlignment: MainAxisAlignment.spaceAround,
left: 14.w, // children: [
right: 16.w, // if (vipRuleDetails?.recharge != null &&
top: 14.h, // vipRuleDetails.recharge != "")
bottom: 14.h), // Expanded(
margin: EdgeInsets.only( // child: Container(
bottom: 22.h, left: 14.w, right: 14.w), // color: Colors.white,
decoration: BoxDecoration( // child: Html(
color: Color(0xFFFAFAFA), // data: "注意:${vipRuleDetails?.recharge ?? ""}",
borderRadius: BorderRadius.circular(4), // customImageRenders: {
// networkSourceMatcher(): networkImageRender(
// loadingWidget: () {
// return Container();
// },
// ),
// },
// ),
// ),
// )
// ],
// ),
],
)),
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 16, right: 16),
padding: EdgeInsets.only(
top: 20.h,
bottom: 24.h,
),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.circular(4),
// ),
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(bottom: 16.h),
child: Text(
S.of(context).zhifufangshi,
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
setState(() {
checkIndex = 2;
});
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Image.asset(
"assets/image/icon_we_chat.webp"),
Expanded(
flex: 1,
child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).weixinzhifu,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
), ),
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( checkView(2),
alignment: Alignment.bottomCenter, ],
child: GestureDetector( ),
onTap: () { ),
recharge(); SizedBox(height: 10.h),
}, GestureDetector(
child: Container( behavior: HitTestBehavior.opaque,
height: 56.h, onTap: () {
width: double.infinity, setState(() {
alignment: Alignment.center, checkIndex = 3;
decoration: BoxDecoration( });
color: Color(0xFF32A060), },
borderRadius: BorderRadius.circular(27), child: Row(
), mainAxisAlignment:
margin: EdgeInsets.only( MainAxisAlignment.start,
left: 16, right: 16, bottom: 21), crossAxisAlignment:
child: Text( CrossAxisAlignment.start,
S.of(context).querenchongzhi, children: [
style: TextStyle( Image.asset(
fontSize: 16.sp, "assets/image/icon_alipay.webp"),
fontWeight: MyFontWeight.medium, Expanded(
color: Colors.white, flex: 1,
), child: Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).zhifubao,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
), ),
), ),
), ),
),
// Container( checkView(3),
// height: 56.h,
// color: Colors.white,
// child: Row(
// children: [
// Expanded(child:Container(
// padding:EdgeInsets.only(top: 7.h,left:16),
// child:Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Row(
// children: [
// Text(
// S.of(context).heji,
// style: TextStyle(
// fontSize: 14.sp,
// fontWeight: MyFontWeight.regular,
// color: Colors.black,
// ),
// ),
// Text(
// controller.text,
// style: TextStyle(
// fontSize: 16.sp,
// fontWeight: MyFontWeight.medium,
// color: Color(0xFF32A060),
// ),
// ),
// ],
// ),
// if(controller.text != "")
// Text.rich(
// TextSpan(
// children: [
// TextSpan(
// text: "充值",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// TextSpan(
// text:"¥${controller.text}",
// style: TextStyle(
// fontSize: 12.sp,
// fontWeight: MyFontWeight.regular,
// color:Color(0xff3541C9),
// ),
// ),
// TextSpan(
// text: "赠送",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// TextSpan(
// text:"￥${((double.tryParse(controller.text)??0) - ((double.tryParse(controller.text)??0) * (discount/100))).toStringAsFixed(2)}",
// style: TextStyle(
// fontSize: 12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xff3541C9),
// ),
// ),TextSpan(
// text: "元",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// ],
// ),
// ),
// ],
// ))
// ),
// GestureDetector(
// onTap: () {
// recharge();
// },
// child: RoundButton(
// width: 103.w,
// height: 54.h,
// text: S.of(context).chongzhi,
// textColor: Colors.white,
// fontWeight: MyFontWeight.regular,
// backgroup: Color(0xFF32A060),
// radius: 0,
// fontSize: 16.sp,
// padding: EdgeInsets.symmetric(vertical: 5.h),
// ),
// ),
// ],
// ),
// )
)
], ],
), ),
), ),
) ],
], ),
), ),
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(
alignment: Alignment.bottomCenter,
child: GestureDetector(
onTap: () {
recharge();
},
child: Container(
height: 56.h,
width: double.infinity,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xFF32A060),
borderRadius: BorderRadius.circular(27),
),
margin: EdgeInsets.only(
left: 16, right: 16, bottom: 21),
child: Text(
S.of(context).querenchongzhi,
style: TextStyle(
fontSize: 16.sp,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
),
),
// Container(
// height: 56.h,
// color: Colors.white,
// child: Row(
// children: [
// Expanded(child:Container(
// padding:EdgeInsets.only(top: 7.h,left:16),
// child:Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Row(
// children: [
// Text(
// S.of(context).heji,
// style: TextStyle(
// fontSize: 14.sp,
// fontWeight: MyFontWeight.regular,
// color: Colors.black,
// ),
// ),
// Text(
// controller.text,
// style: TextStyle(
// fontSize: 16.sp,
// fontWeight: MyFontWeight.medium,
// color: Color(0xFF32A060),
// ),
// ),
// ],
// ),
// if(controller.text != "")
// Text.rich(
// TextSpan(
// children: [
// TextSpan(
// text: "充值",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// TextSpan(
// text:"¥${controller.text}",
// style: TextStyle(
// fontSize: 12.sp,
// fontWeight: MyFontWeight.regular,
// color:Color(0xff3541C9),
// ),
// ),
// TextSpan(
// text: "赠送",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// TextSpan(
// text:"￥${((double.tryParse(controller.text)??0) - ((double.tryParse(controller.text)??0) * (discount/100))).toStringAsFixed(2)}",
// style: TextStyle(
// fontSize: 12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xff3541C9),
// ),
// ),TextSpan(
// text: "元",
// style: TextStyle(
// fontSize:12.sp,
// fontWeight: MyFontWeight.regular,
// color: Color(0xFFADADAD),
// ),
// ),
// ],
// ),
// ),
// ],
// ))
// ),
// GestureDetector(
// onTap: () {
// recharge();
// },
// child: RoundButton(
// width: 103.w,
// height: 54.h,
// text: S.of(context).chongzhi,
// textColor: Colors.white,
// fontWeight: MyFontWeight.regular,
// backgroup: Color(0xFF32A060),
// radius: 0,
// fontSize: 16.sp,
// padding: EdgeInsets.symmetric(vertical: 5.h),
// ),
// ),
// ],
// ),
// )
)
], ],
), ),
), ),

Write Preview
Loading…
Cancel
Save