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

充值更改;

remove_uniapp
w-R 3 years ago
parent
a598480dbf
commit
be9c1e8ce2
7 changed files with 223 additions and 120 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. 6
      lib/message/system_details.dart
  2. 54
      lib/mine/mine_view/wallet_coupon_view.dart
  3. 159
      lib/mine/recharge_page.dart
  4. 78
      lib/retrofit/data/recharge_list.dart
  5. 9
      lib/retrofit/retrofit_api.dart
  6. 23
      lib/retrofit/retrofit_api.g.dart
  7. 14
      lib/utils/flutter_utils.dart

6
lib/message/system_details.dart
Unescape View File

@ -365,10 +365,10 @@ class _SystemDetails extends State<SystemDetails> {
children: [ children: [
Image.asset( Image.asset(
(message.typed == 1) (message.typed == 1)
? "assets/image/icon_system_message.png" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.png" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.png", : "assets/image/c_z.webp",
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
), ),

54
lib/mine/mine_view/wallet_coupon_view.dart
Unescape View File

@ -31,59 +31,7 @@ class _WalletCoupon extends State<WalletCoupon> {
), ),
], ],
), ),
child: (Theme.of(context).platform == TargetPlatform.android) child: Row(
? GestureDetector(
onTap: () {
SharedPreferences.getInstance().then((value) {
if (value.getString("token") == null ||
value.getString("token") == "") {
LoginTipsDialog().show(context);
return;
}
Navigator.of(context).pushNamed('/router/roll_center_page');
});
},
child: Row(
children: [
Image.asset(
"assets/image/icon_mine_invoice_assistant.webp",
width: 48.h,
height: 48.h,
),
SizedBox(
width: 12.w,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).lingquanzhongxin,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 16.sp,
color: Color(0xFF353535),
),
),
SizedBox(
height: 3,
),
Text(
"联盟下单享不停、海量优惠券等你来领！",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 12.sp,
color: Color(0xFF7B7B7B),
),
),
],
),
)
],
))
: Row(
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,

159
lib/mine/recharge_page.dart
Unescape View File

@ -9,10 +9,13 @@ 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/recharge_list.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';
import 'package:huixiang/retrofit/data/vip_rule_details.dart'; import 'package:huixiang/retrofit/data/vip_rule_details.dart';
import 'package:huixiang/retrofit/data/wx_pay.dart'; import 'package:huixiang/retrofit/data/wx_pay.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/utils/min.dart'; import 'package:huixiang/utils/min.dart';
import 'package:huixiang/view_widget/item_input_widget.dart'; import 'package:huixiang/view_widget/item_input_widget.dart';
@ -35,6 +38,10 @@ 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;
int selectIndex = 0;
UserInfo userInfo;
dynamic mBalance;
@override @override
void initState() { void initState() {
@ -45,11 +52,13 @@ 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();
queryUserBalance();
}); });
weChatResponseEventHandler.listen((event) async { weChatResponseEventHandler.listen((event) async {
print("payCallback: ${event.errCode}"); print("payCallback: ${event.errCode}");
if (event.errCode == 0) { if (event.errCode == 0) {
Navigator.of(context).pop(); queryUserBalance();
SmartDialog.showToast("充值成功", alignment: Alignment.center); SmartDialog.showToast("充值成功", alignment: Alignment.center);
} }
// else{ // else{
@ -79,6 +88,16 @@ class _RechargePage extends State<RechargePage> {
EasyLoading.dismiss(); EasyLoading.dismiss();
} }
queryUserBalance() async {
BaseData<UserInfo> baseData =
await apiService.queryInfo().catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
userInfo = baseData.data;
mBalance = double.tryParse(userInfo?.money ?? "0");
if (mounted) setState(() {});
}
}
///会员权益介绍/规则/说明/储值说明 ///会员权益介绍/规则/说明/储值说明
queryRuleDetails() async { queryRuleDetails() async {
BaseData<VipRuleDetails> baseData = BaseData<VipRuleDetails> baseData =
@ -91,6 +110,25 @@ class _RechargePage extends State<RechargePage> {
EasyLoading.dismiss(); EasyLoading.dismiss();
} }
///充值列表
queryRechargeList() async {
if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance();
apiService = ApiService(
Dio(),
context: context,
token: value.getString("token"),
);
}
BaseData<List<RechargeList>> baseData = await apiService.rechargeAct().catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
setState(() {
rechargeA = baseData.data;
});
}
EasyLoading.dismiss();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -168,7 +206,7 @@ class _RechargePage extends State<RechargePage> {
Text.rich( Text.rich(
TextSpan(children: [ TextSpan(children: [
TextSpan( TextSpan(
text: "0.00", text: "$mBalance",
style: TextStyle( style: TextStyle(
fontSize: 26.sp, fontSize: 26.sp,
color: Color(0xFF181818), color: Color(0xFF181818),
@ -199,12 +237,6 @@ class _RechargePage extends State<RechargePage> {
color: Colors.white, color: Colors.white,
child: Html( child: Html(
data: "注意:${vipRuleDetails?.recharge ?? ""}", data: "注意:${vipRuleDetails?.recharge ?? ""}",
style:{
"html":Style(
color: Color(0xFF000000),
fontWeight: MyFontWeight.medium,
)
},
customImageRenders: { customImageRenders: {
networkSourceMatcher(): networkImageRender( networkSourceMatcher(): networkImageRender(
loadingWidget: () { loadingWidget: () {
@ -418,7 +450,7 @@ class _RechargePage extends State<RechargePage> {
Widget rechargeList() { Widget rechargeList() {
return GridView.builder( return GridView.builder(
itemCount: 6, itemCount: rechargeA == null ? 0 : rechargeA.length,
shrinkWrap: true, shrinkWrap: true,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
@ -432,59 +464,64 @@ class _RechargePage extends State<RechargePage> {
), ),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return GestureDetector( return GestureDetector(
onTap: () {}, onTap: () {
child: rechargeItem(), setState(() {
selectIndex = index;
});
},
child: rechargeItem(rechargeA[index],index),
); );
}, },
); );
} }
Widget rechargeItem() { Widget rechargeItem(RechargeList rechargeA,index) {
return Stack( return Container(
child: Stack(
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
children: [ children: [
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
height: 69.h, height: 69.h,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFFAFAFA), color: selectIndex == index ?Color(0x2432A060) : Color(0xFFFAFAFA),
// color: Color(0x2432A060), borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(4), ),
), // margin: EdgeInsets.only(right: 11,bottom: 16),
// margin: EdgeInsets.only(right: 11,bottom: 16), child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ Text(
Text( "${AppUtils.calculateDouble(double.tryParse(rechargeA.rechargeMoney)??0)}元",
"100元", textAlign: TextAlign.center,
textAlign: TextAlign.center, style: TextStyle(
style: TextStyle( color: Color(0xFF868686),
color: Color(0xFF868686), fontWeight: MyFontWeight.medium,
fontWeight: MyFontWeight.medium, fontSize:18.sp,
fontSize: 21.sp, ),
), ),
), SizedBox(height:2,),
SizedBox(height:2,), Text(
Text( "实际到账:${AppUtils.calculateDouble((double.tryParse(rechargeA.rechargeMoney)??0) + (double.tryParse(rechargeA.giftdMoney)??0) +((double.tryParse(rechargeA.rechargeMoney)??0) - ((double.tryParse(rechargeA.rechargeMoney)??0) * (discount/100))))}元",
"实际到账:120元", textAlign: TextAlign.center,
textAlign: TextAlign.center, style: TextStyle(
style: TextStyle( color: Color(0xFF868686),
color: Color(0xFF868686), fontWeight: MyFontWeight.regular,
fontWeight: MyFontWeight.regular, fontSize:10.sp,
fontSize:12.sp, ),
), ),
), ],
], ),
), ),
), if(selectIndex == index)
Image.asset( Image.asset(
"assets/image/recharge.png", "assets/image/recharge.png",
width: 20, width: 20,
height:20, height:20,
), ),
], ],
); ));
} }
Widget checkView(var index) { Widget checkView(var index) {
@ -502,19 +539,19 @@ class _RechargePage extends State<RechargePage> {
} }
recharge() async { recharge() async {
String money = controller.text; // String money = controller.text;
if (money == null || money == "") { // if (money == null || money == "") {
SmartDialog.showToast(S.of(context).qingshuruchongzhijine, // SmartDialog.showToast(S.of(context).qingshuruchongzhijine,
alignment: Alignment.center); // alignment: Alignment.center);
return; // return;
} // }
int amount = int.tryParse(money); // int amount = int.tryParse(money);
if (checkIndex == 1) { // if (checkIndex == 1) {
if (amount < 100) { // if (amount < 100) {
SmartDialog.showToast(S.of(context).chongzhizuixiaojine(100), // SmartDialog.showToast(S.of(context).chongzhizuixiaojine(100),
alignment: Alignment.center); // alignment: Alignment.center);
return; // return;
} // }
if (Platform.isAndroid) { if (Platform.isAndroid) {
if (!(await Min.isInitialize())) { if (!(await Min.isInitialize())) {
@ -526,7 +563,7 @@ class _RechargePage extends State<RechargePage> {
} }
BaseData<dynamic> baseData = await apiService.recharge( BaseData<dynamic> baseData = await apiService.recharge(
{"amount": amount, "rechargeType": 2}).catchError((error) {}); {"amount": 0,"rechargeActId":rechargeA[selectIndex].id, "rechargeType": 2}).catchError((error) {});
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
WxPay wxPay = WxPay.fromJson(baseData.data); WxPay wxPay = WxPay.fromJson(baseData.data);
await registerWxApi( await registerWxApi(
@ -547,5 +584,5 @@ class _RechargePage extends State<RechargePage> {
SmartDialog.showToast(baseData.msg, alignment: Alignment.center); SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
} }
} }
} // }
} }

78
lib/retrofit/data/recharge_list.dart
Unescape View File

@ -0,0 +1,78 @@
/// id : "1494622230208839681"
/// rechargeMoney : "100.00"
/// giftdMoney : "0.00"
/// gitfdCouponId : null
/// tenantCode : "admin"
/// createTime : "2022-03-23 10:53:37"
/// isDeleted : 0
/// rechargeType : 0
/// remark : "充充充"
class RechargeList {
RechargeList({
String id,
String rechargeMoney,
String giftdMoney,
dynamic gitfdCouponId,
String tenantCode,
String createTime,
int isDeleted,
int rechargeType,
String remark,}){
_id = id;
_rechargeMoney = rechargeMoney;
_giftdMoney = giftdMoney;
_gitfdCouponId = gitfdCouponId;
_tenantCode = tenantCode;
_createTime = createTime;
_isDeleted = isDeleted;
_rechargeType = rechargeType;
_remark = remark;
}
RechargeList.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'];
}
String _id;
String _rechargeMoney;
String _giftdMoney;
dynamic _gitfdCouponId;
String _tenantCode;
String _createTime;
int _isDeleted;
int _rechargeType;
String _remark;
String get id => _id;
String get rechargeMoney => _rechargeMoney;
String get giftdMoney => _giftdMoney;
dynamic get gitfdCouponId => _gitfdCouponId;
String get tenantCode => _tenantCode;
String get createTime => _createTime;
int get isDeleted => _isDeleted;
int get rechargeType => _rechargeType;
String get remark => _remark;
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;
return map;
}
}

9
lib/retrofit/retrofit_api.dart
Unescape View File

@ -43,6 +43,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/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';
import 'data/social_info.dart'; import 'data/social_info.dart';
@ -63,8 +64,8 @@ part 'retrofit_api.g.dart';
// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
const base_url = "http://192.168.10.236:8766/app/"; ///费韬 const base_url = "http://192.168.10.236:8776/app/"; ///费韬
const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 const baseUrl = "http://192.168.10.236:8776/app/"; ///费韬
// const base_url = "http://192.168.10.37:8766/app/"; // const base_url = "http://192.168.10.37:8766/app/";
// const baseUrl = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/";
@ -218,6 +219,10 @@ abstract class ApiService {
@POST("/wallet/recharge") @POST("/wallet/recharge")
Future<BaseData<dynamic>> recharge(@Body() Map<String, dynamic> param); Future<BaseData<dynamic>> recharge(@Body() Map<String, dynamic> param);
///充值活动列表
@GET("/wallet/rechargeAct")
Future<BaseData<List<RechargeList>>> rechargeAct();
///领取优惠券 ///领取优惠券
@GET("/coupon/receive?couponId={couponId}") @GET("/coupon/receive?couponId={couponId}")
Future<BaseData> receiveCoupon(@Path("couponId") String couponId); Future<BaseData> receiveCoupon(@Path("couponId") String couponId);

23
lib/retrofit/retrofit_api.g.dart
Unescape View File

@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService { class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) { _ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio'); ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.236:8766/app/'; baseUrl ??= 'http://192.168.10.236:8776/app/';
} }
final Dio _dio; final Dio _dio;
@ -298,6 +298,27 @@ class _ApiService implements ApiService {
return value; return value;
} }
@override
Future<BaseData<List<RechargeList>>> rechargeAct() async {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>('/wallet/rechargeAct',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
headers: <String, dynamic>{},
extra: _extra,
baseUrl: baseUrl),
data: _data);
final value = BaseData<List<RechargeList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<RechargeList>((i) => RechargeList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@override @override
Future<BaseData<dynamic>> receiveCoupon(couponId) async { Future<BaseData<dynamic>> receiveCoupon(couponId) async {
ArgumentError.checkNotNull(couponId, 'couponId'); ArgumentError.checkNotNull(couponId, 'couponId');

14
lib/utils/flutter_utils.dart
Unescape View File

@ -15,6 +15,20 @@ class AppUtils {
return "${numberFormat.format(mi / 1000)}"; return "${numberFormat.format(mi / 1000)}";
} }
static String trimEnd(String resString,String char){
while(resString.endsWith(char)){
resString = resString.substring(0,resString.length - 1);
}
return resString;
}
///金额保留整数/后两位
static String calculateDouble(double res){
String resString = res.toStringAsFixed(2);
resString = trimEnd(resString, "0");
resString = trimEnd(resString, ".");
return resString;
}
static Future<BMFCoordinate> coordConvert(BMFCoordinate latLng) async { static Future<BMFCoordinate> coordConvert(BMFCoordinate latLng) async {
return BMFCalculateUtils.coordConvert( return BMFCalculateUtils.coordConvert(

Write Preview
Loading…
Cancel
Save