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

回鄉錢包，UI修改

dart3_last
哈哈哈 2 years ago
parent
6f721d3e15
commit
381b40b572
11 changed files with 181 additions and 183 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. 2
      lib/generated/intl/messages_en.dart
  2. 2
      lib/generated/intl/messages_zh_CN.dart
  3. 2
      lib/generated/intl/messages_zh_Hans_CN.dart
  4. 8
      lib/generated/l10n.dart
  5. 2
      lib/l10n/intl_en.arb
  6. 2
      lib/l10n/intl_zh_CN.arb
  7. 2
      lib/l10n/intl_zh_Hans_CN.arb
  8. 2
      lib/l10n/intl_zh_Hant_CN.arb
  9. 2
      lib/l10n/intl_zh_TW.arb
  10. 113
      lib/login/login_page.dart
  11. 227
      lib/mine/mine_wallet_page.dart

2
lib/generated/intl/messages_en.dart
Unescape View File

@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m23(pinglun) => "评论(${pinglun})"; static m23(pinglun) => "评论(${pinglun})";
static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; static m24(zongyue) => "余额：${zongyue}";
static m25(zhe) => "全场${zhe}折"; static m25(zhe) => "全场${zhe}折";

2
lib/generated/intl/messages_zh_CN.dart
Unescape View File

@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m23(pinglun) => "评论(${pinglun})"; static m23(pinglun) => "评论(${pinglun})";
static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; static m24(zongyue) => "余额：${zongyue}";
static m25(zhe) => "全场${zhe}折"; static m25(zhe) => "全场${zhe}折";

2
lib/generated/intl/messages_zh_Hans_CN.dart
Unescape View File

@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m23(pinglun) => "评论(${pinglun})"; static m23(pinglun) => "评论(${pinglun})";
static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; static m24(zongyue) => "余额：${zongyue}";
static m25(zhe) => "全场${zhe}折"; static m25(zhe) => "全场${zhe}折";

8
lib/generated/l10n.dart
Unescape View File

@ -6175,13 +6175,13 @@ class S {
); );
} }
/// `平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ` /// `余额：{zongyue}`
String pingtaizongyue(Object zongyue, Object huodongyue, Object lvbiyue) { String pingtaizongyue(Object zongyue) {
return Intl.message( return Intl.message(
'平台总余额：$zongyue（活动余额$huodongyue 绿币余额$lvbiyue） ', '余额：$zongyue',
name: 'pingtaizongyue', name: 'pingtaizongyue',
desc: '', desc: '',
args: [zongyue, huodongyue, lvbiyue], args: [zongyue],
); );
} }

2
lib/l10n/intl_en.arb
Unescape View File

@ -644,7 +644,7 @@
"huodongyue": "活动余额", "huodongyue": "活动余额",
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", "pingtaizongyue": "余额：{zongyue}",

2
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -638,7 +638,7 @@
"huodongyue": "活动余额", "huodongyue": "活动余额",
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", "pingtaizongyue": "余额：{zongyue}",

2
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

@ -638,7 +638,7 @@
"huodongyue": "活动余额", "huodongyue": "活动余额",
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", "pingtaizongyue": "余额：{zongyue}",

2
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

@ -632,7 +632,7 @@
"yue__": "餘額 {yue}", "yue__": "餘額 {yue}",
"lvbiyue": "綠幣餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}",
"huodongyue": "活動餘額 {yue}", "huodongyue": "活動餘額 {yue}",
"pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", "pingtaizongyue": "餘額：{zongyue}",

2
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -634,7 +634,7 @@
"yue__": "餘額 {yue}", "yue__": "餘額 {yue}",
"lvbiyue": "綠幣餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}",
"huodongyue": "活動餘額 {yue}", "huodongyue": "活動餘額 {yue}",
"pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", "pingtaizongyue": "餘額：{zongyue}",

113
lib/login/login_page.dart
Unescape View File

@ -1078,69 +1078,70 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Stack( Stack(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
children: [ children: [
Container( IntrinsicHeight(
alignment: Alignment.center, child: Container(
width: double.infinity, alignment: Alignment.center,
height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h, width: double.infinity,
padding: EdgeInsets.only(left: 16.w, right: 16.w), padding: EdgeInsets.only(left: 16.w, right: 16.w),
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(top: 24.h, bottom: 10.h), padding: EdgeInsets.only(top: 24.h, bottom: 10.h),
child: Text( child: Text(
S.of(context).xieyitanchuang, S.of(context).xieyitanchuang,
style: TextStyle(
color: Color(0xff4D4D4D),
fontSize: 18.sp,
fontWeight: FontWeight.bold,
),
),
),
Text.rich(
TextSpan(children: [
TextSpan(
text: S.of(context).yinsizhengce1,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.medium, color: Color(0xff4D4D4D),
fontSize: 14.sp, fontSize: 18.sp,
height: 1.2.h, fontWeight: FontWeight.bold,
color: Color(0xff727272),
), ),
), ),
TextSpan( ),
text: S.of(context).yinsixieyi, Text.rich(
style: TextStyle( TextSpan(children: [
TextSpan(
text: S.of(context).yinsizhengce1,
style: TextStyle(
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xff32A060)), height: 1.2.h,
recognizer: TapGestureRecognizer() color: Color(0xff727272),
..onTap = () { ),
Navigator.of(context) ),
.popAndPushNamed('/router/treaty_page'); TextSpan(
}, text: S.of(context).yinsixieyi,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 14.sp,
color: Color(0xff32A060)),
recognizer: TapGestureRecognizer()
..onTap = () {
Navigator.of(context)
.popAndPushNamed('/router/treaty_page');
},
),
]),
),
SizedBox(
height: 5.h,
),
Text(
S.of(context).yinsizhengce2,
style: TextStyle(
color: Color(0xff727272),
fontSize: 14.sp,
height: 1.2.h,
fontWeight: MyFontWeight.medium,
), ),
]),
),
SizedBox(
height: 5.h,
),
Text(
S.of(context).yinsizhengce2,
style: TextStyle(
color: Color(0xff727272),
fontSize: 14.sp,
height: 1.2.h,
fontWeight: MyFontWeight.medium,
), ),
), SizedBox(
SizedBox( height: 16.h,
height: 16.h, ),
), ],
], ),
), ),
), ),
Row( Row(

227
lib/mine/mine_wallet_page.dart
Unescape View File

@ -27,9 +27,9 @@ class MineWalletPage extends StatefulWidget {
} }
class _MineWalletPage extends State<MineWalletPage> { class _MineWalletPage extends State<MineWalletPage> {
dynamic mBalance = 0; dynamic pBalance = 0; //平台总余额
dynamic mBalance = 0; // 余额
dynamic mgreenMoney = 0; dynamic mgreenMoney = 0;
dynamic tBalance = 0;
dynamic activityMoney = 0; dynamic activityMoney = 0;
@override @override
@ -48,10 +48,10 @@ class _MineWalletPage extends State<MineWalletPage> {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
userInfo = userInfo =
UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user'))); UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user')));
mBalance = double.tryParse(userInfo.money);
mgreenMoney = double.tryParse(userInfo.greenMoney); mgreenMoney = double.tryParse(userInfo.greenMoney);
mBalance = double.tryParse(userInfo.money);
pBalance = mgreenMoney + mBalance;
activityMoney = double.tryParse(userInfo.activityMoney); activityMoney = double.tryParse(userInfo.activityMoney);
tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0);
if (mounted) setState(() {}); if (mounted) setState(() {});
String token = sharedPreferences.getString("token"); String token = sharedPreferences.getString("token");
apiService = ApiService(Dio(), context: context, token: token); apiService = ApiService(Dio(), context: context, token: token);
@ -70,8 +70,8 @@ class _MineWalletPage extends State<MineWalletPage> {
userInfo = baseData.data; userInfo = baseData.data;
mgreenMoney = double.tryParse(userInfo.greenMoney); mgreenMoney = double.tryParse(userInfo.greenMoney);
activityMoney = double.tryParse(userInfo.activityMoney); activityMoney = double.tryParse(userInfo.activityMoney);
mBalance = double.tryParse(userInfo.money); mBalance = double.tryParse(userInfo.money) + mgreenMoney;
tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); pBalance = mBalance + mgreenMoney;
if (mounted) setState(() {}); if (mounted) setState(() {});
} }
} }
@ -313,10 +313,7 @@ class _MineWalletPage extends State<MineWalletPage> {
Expanded( Expanded(
flex: 7, flex: 7,
child: Text( child: Text(
S.of(context).pingtaizongyue( S.of(context).pingtaizongyue(userBill.balance),
userBill.balance,
userBill.surplusActivityMoney,
userBill.surplusGreenMoney),
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), color: Color(0xFF727272),
fontSize: 10.sp, fontSize: 10.sp,
@ -468,7 +465,7 @@ class _MineWalletPage extends State<MineWalletPage> {
width: 24, width: 24,
), ),
Text( Text(
"$mBalance", "$pBalance",
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 50, fontSize: 50,
@ -545,7 +542,7 @@ class _MineWalletPage extends State<MineWalletPage> {
height: 4, height: 4,
), ),
Text( Text(
"$tBalance", "$mBalance",
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
@ -627,109 +624,109 @@ class _MineWalletPage extends State<MineWalletPage> {
); );
} }
Widget balance1() { // Widget balance1() {
return Container( // return Container(
width: double.infinity, // width: double.infinity,
margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), // margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h),
padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), // padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h),
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.white, // color: Colors.white,
borderRadius: BorderRadius.circular(8), // borderRadius: BorderRadius.circular(8),
boxShadow: [ // boxShadow: [
BoxShadow( // BoxShadow(
color: Colors.black.withAlpha(25), // color: Colors.black.withAlpha(25),
offset: Offset(0, 3), // offset: Offset(0, 3),
blurRadius: 14, // blurRadius: 14,
spreadRadius: 0, // spreadRadius: 0,
), // ),
], // ],
), // ),
child: Column( // child: Column(
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ // children: [
Stack( // Stack(
alignment: Alignment.center, // alignment: Alignment.center,
children: [ // children: [
Align( // Align(
alignment: Alignment.center, // alignment: Alignment.center,
child: Text( // child: Text(
S.of(context).zongzichan, // S.of(context).zongzichan,
style: TextStyle( // style: TextStyle(
fontWeight: MyFontWeight.semi_bold, // fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535), // color: Color(0xFF353535),
fontSize: 16.sp, // fontSize: 16.sp,
), // ),
), // ),
), // ),
// GestureDetector( // // GestureDetector(
// onTap: () { // // onTap: () {
// queryUserBalance(); // // queryUserBalance();
// }, // // },
// child: Row( // // child: Row(
// mainAxisAlignment: MainAxisAlignment.end, // // mainAxisAlignment: MainAxisAlignment.end,
// children: [ // // children: [
// Icon( // // Icon(
// Icons.refresh, // // Icons.refresh,
// size: 20, // // size: 20,
// color: Color(0xFF8A8A8A), // // color: Color(0xFF8A8A8A),
// ), // // ),
// Text( // // Text(
// S.of(context).shuaxin, // // S.of(context).shuaxin,
// style: TextStyle( // // style: TextStyle(
// color: Color(0xFF353535), // // color: Color(0xFF353535),
// fontSize: 12.sp, // // fontSize: 12.sp,
// ), // // ),
// ), // // ),
// ], // // ],
// ), // // ),
// ), // // ),
], // ],
), // ),
SizedBox( // SizedBox(
height: 16.h, // height: 16.h,
), // ),
Text( // Text(
"$mBalance", // "$mBalance",
style: TextStyle( // style: TextStyle(
fontWeight: MyFontWeight.medium, // fontWeight: MyFontWeight.medium,
color: Color(0xFF353535), // color: Color(0xFF353535),
fontSize: 50.sp, // fontSize: 50.sp,
), // ),
), // ),
// SizedBox( // // SizedBox(
// height: 4.h, // // height: 4.h,
// ), // // ),
// Text( // // Text(
// S.of(context).keyongyue, // // S.of(context).keyongyue,
// style: TextStyle( // // style: TextStyle(
// color: Color(0xFF20662A), // // color: Color(0xFF20662A),
// fontSize: 16.sp, // // fontSize: 16.sp,
// fontWeight: MyFontWeight.regular // // fontWeight: MyFontWeight.regular
// ), // // ),
// ), // // ),
SizedBox( // SizedBox(
height: 24.h, // height: 24.h,
), // ),
InkWell( // InkWell(
onTap: () { // onTap: () {
toRecharge(); // toRecharge();
}, // },
child: RoundButton( // child: RoundButton(
width: 104.w, // width: 104.w,
text: S.of(context).lijichongzhi, // text: S.of(context).lijichongzhi,
textColor: Colors.white, // textColor: Colors.white,
fontWeight: MyFontWeight.semi_bold, // fontWeight: MyFontWeight.semi_bold,
radius: 15, // radius: 15,
backgroup: Color(0xFF32A060), // backgroup: Color(0xFF32A060),
fontSize: 14.sp, // fontSize: 14.sp,
padding: EdgeInsets.symmetric(vertical: 5.h), // padding: EdgeInsets.symmetric(vertical: 5.h),
), // ),
), // ),
], // ],
), // ),
); // );
} // }
toRecharge() async { toRecharge() async {
await Navigator.of(context).pushNamed('/router/recharge_page'); await Navigator.of(context).pushNamed('/router/recharge_page');

Write Preview
Loading…
Cancel
Save