diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 61011c32..12fc844b 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -55,7 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { static m17(shijian) => "领取时间 ${shijian}"; - static m18(yue) => "绿币余额 ${yue}"; + static m18(yue) => "绿币 ${yue}"; static m19(man, jian) => "满${man}元立减${jian}元代金券"; @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 1d177d14..04986e59 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -55,7 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { static m17(shijian) => "领取时间 ${shijian}"; - static m18(yue) => "绿币余额 ${yue}"; + static m18(yue) => "绿币 ${yue}"; static m19(man, jian) => "满${man}元立减${jian}元代金券"; @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 27ce7f40..1376019c 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -55,7 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { static m17(shijian) => "领取时间 ${shijian}"; - static m18(yue) => "绿币余额 ${yue}"; + static m18(yue) => "绿币 ${yue}"; static m19(man, jian) => "满${man}元立减${jian}元代金券"; @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 7cfab70b..5b9554c1 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -6085,10 +6085,10 @@ class S { ); } - /// `绿币余额 {yue}` + /// `绿币 {yue}` String lvbiyue_(Object yue) { return Intl.message( - '绿币余额 $yue', + '绿币 $yue', name: 'lvbiyue_', desc: '', args: [yue], @@ -6175,13 +6175,13 @@ class S { ); } - /// `平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ` - String pingtaizongyue(Object zongyue, Object huodongyue, Object lvbiyue) { + /// `余额：{zongyue}` + String pingtaizongyue(Object zongyue) { return Intl.message( - '平台总余额：$zongyue（活动余额$huodongyue 绿币余额$lvbiyue） ', + '余额：$zongyue', name: 'pingtaizongyue', desc: '', - args: [zongyue, huodongyue, lvbiyue], + args: [zongyue], ); } diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 99449a22..de5383d1 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -635,7 +635,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", @@ -644,7 +644,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 22d55f92..8cb96b83 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -629,7 +629,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", @@ -638,7 +638,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 4a987f3b..75a43ba3 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -629,7 +629,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", @@ -638,7 +638,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index a5d6b975..90af200c 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -620,7 +620,7 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", - "lvbiyue_": "綠幣餘額 {yue}", + "lvbiyue_": "綠幣 {yue}", "huodongyue_": "活動餘額 {yue}", "lvbiyue": "綠幣餘額", "huixiangqianbao": "回鄉錢包", @@ -632,7 +632,7 @@ "yue__": "餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}", "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", + "pingtaizongyue": "餘額：{zongyue}", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 2bcfb0b0..6421858e 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -622,7 +622,7 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", - "lvbiyue_": "綠幣餘額 {yue}", + "lvbiyue_": "綠幣 {yue}", "huodongyue_": "活動餘額 {yue}", "lvbiyue": "綠幣餘額", "huixiangqianbao": "回鄉錢包", @@ -634,7 +634,7 @@ "yue__": "餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}", "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", + "pingtaizongyue": "餘額：{zongyue}", diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index f1112d07..67bcc0ee 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -1078,69 +1078,70 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { Stack( alignment: Alignment.bottomCenter, children: [ - Container( - alignment: Alignment.center, - width: double.infinity, - height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h, - padding: EdgeInsets.only(left: 16.w, right: 16.w), - decoration: new BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: Column( - children: [ - Padding( - padding: EdgeInsets.only(top: 24.h, bottom: 10.h), - child: Text( - 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, + IntrinsicHeight( + child: Container( + alignment: Alignment.center, + width: double.infinity, + padding: EdgeInsets.only(left: 16.w, right: 16.w), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Column( + children: [ + Padding( + padding: EdgeInsets.only(top: 24.h, bottom: 10.h), + child: Text( + S.of(context).xieyitanchuang, style: TextStyle( - fontWeight: MyFontWeight.medium, - fontSize: 14.sp, - height: 1.2.h, - color: Color(0xff727272), + color: Color(0xff4D4D4D), + fontSize: 18.sp, + fontWeight: FontWeight.bold, ), ), - TextSpan( - text: S.of(context).yinsixieyi, - style: TextStyle( + ), + Text.rich( + TextSpan(children: [ + TextSpan( + text: S.of(context).yinsizhengce1, + style: TextStyle( fontWeight: MyFontWeight.medium, fontSize: 14.sp, - color: Color(0xff32A060)), - recognizer: TapGestureRecognizer() - ..onTap = () { - Navigator.of(context) - .popAndPushNamed('/router/treaty_page'); - }, + height: 1.2.h, + color: Color(0xff727272), + ), + ), + 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( - height: 16.h, - ), - ], + SizedBox( + height: 16.h, + ), + ], + ), ), ), Row( diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 44e9f5bf..c05015f3 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -27,9 +27,9 @@ class MineWalletPage extends StatefulWidget { } class _MineWalletPage extends State { - dynamic mBalance = 0; + dynamic pBalance = 0; //平台总余额 + dynamic mBalance = 0; // 余额 dynamic mgreenMoney = 0; - dynamic tBalance = 0; dynamic activityMoney = 0; @override @@ -48,10 +48,10 @@ class _MineWalletPage extends State { SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); userInfo = UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user'))); - mBalance = double.tryParse(userInfo.money); mgreenMoney = double.tryParse(userInfo.greenMoney); + mBalance = double.tryParse(userInfo.money); + pBalance = mgreenMoney + mBalance; activityMoney = double.tryParse(userInfo.activityMoney); - tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); if (mounted) setState(() {}); String token = sharedPreferences.getString("token"); apiService = ApiService(Dio(), context: context, token: token); @@ -71,7 +71,7 @@ class _MineWalletPage extends State { mgreenMoney = double.tryParse(userInfo.greenMoney); activityMoney = double.tryParse(userInfo.activityMoney); mBalance = double.tryParse(userInfo.money); - tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); + pBalance = mBalance + mgreenMoney; if (mounted) setState(() {}); } } @@ -313,10 +313,7 @@ class _MineWalletPage extends State { Expanded( flex: 7, child: Text( - S.of(context).pingtaizongyue( - userBill.balance, - userBill.surplusActivityMoney, - userBill.surplusGreenMoney), + S.of(context).pingtaizongyue(userBill.balance), style: TextStyle( color: Color(0xFF727272), fontSize: 10.sp, @@ -379,7 +376,7 @@ class _MineWalletPage extends State { double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); double surplusActivity = double.tryParse(surplusActivityMoney ?? "0"); - double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); + // double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); String greenMoney = userBill.greenMoney; String activityMoney = userBill.activityMoney; @@ -395,21 +392,21 @@ class _MineWalletPage extends State { "${userBill.pm == 0 ? '-' : '+'}$activity" ]; } - if (balance > 0) { - return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$balance"]; + if (tbalance > 0) { + return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$tbalance"]; } return []; } else if (index == 1) { - if (activity > 0) { + if (money > 0 && activity > 0) { return [ S.of(context).huodongyue, "${userBill.pm == 0 ? '-' : '+'}$activity" ]; } - if (money > 0 && (balance - money) > 0) { + if (money > 0 && (tbalance - money) > 0) { return [ S.of(context).yue, - "${userBill.pm == 0 ? '-' : '+'}${(balance - money)}" + "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money)}" ]; } else { return []; @@ -418,7 +415,7 @@ class _MineWalletPage extends State { if (activity > 0 && money > 0) { return [ S.of(context).yue, - "${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}" + "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money - activity)}" ]; } else { return []; @@ -468,7 +465,7 @@ class _MineWalletPage extends State { width: 24, ), Text( - "$mBalance", + "$pBalance", style: TextStyle( fontWeight: MyFontWeight.semi_bold, fontSize: 50, @@ -545,7 +542,7 @@ class _MineWalletPage extends State { height: 4, ), Text( - "$tBalance", + "$mBalance", style: TextStyle( fontSize: 18, fontWeight: MyFontWeight.semi_bold, @@ -627,109 +624,109 @@ class _MineWalletPage extends State { ); } - Widget balance1() { - return Container( - width: double.infinity, - margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), - padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(25), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ), - ], - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Stack( - alignment: Alignment.center, - children: [ - Align( - alignment: Alignment.center, - child: Text( - S.of(context).zongzichan, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF353535), - fontSize: 16.sp, - ), - ), - ), - // GestureDetector( - // onTap: () { - // queryUserBalance(); - // }, - // child: Row( - // mainAxisAlignment: MainAxisAlignment.end, - // children: [ - // Icon( - // Icons.refresh, - // size: 20, - // color: Color(0xFF8A8A8A), - // ), - // Text( - // S.of(context).shuaxin, - // style: TextStyle( - // color: Color(0xFF353535), - // fontSize: 12.sp, - // ), - // ), - // ], - // ), - // ), - ], - ), - SizedBox( - height: 16.h, - ), - Text( - "$mBalance", - style: TextStyle( - fontWeight: MyFontWeight.medium, - color: Color(0xFF353535), - fontSize: 50.sp, - ), - ), - // SizedBox( - // height: 4.h, - // ), - // Text( - // S.of(context).keyongyue, - // style: TextStyle( - // color: Color(0xFF20662A), - // fontSize: 16.sp, - // fontWeight: MyFontWeight.regular - // ), - // ), - SizedBox( - height: 24.h, - ), - InkWell( - onTap: () { - toRecharge(); - }, - child: RoundButton( - width: 104.w, - text: S.of(context).lijichongzhi, - textColor: Colors.white, - fontWeight: MyFontWeight.semi_bold, - radius: 15, - backgroup: Color(0xFF32A060), - fontSize: 14.sp, - padding: EdgeInsets.symmetric(vertical: 5.h), - ), - ), - ], - ), - ); - } + // Widget balance1() { + // return Container( + // width: double.infinity, + // margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), + // padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.circular(8), + // boxShadow: [ + // BoxShadow( + // color: Colors.black.withAlpha(25), + // offset: Offset(0, 3), + // blurRadius: 14, + // spreadRadius: 0, + // ), + // ], + // ), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Stack( + // alignment: Alignment.center, + // children: [ + // Align( + // alignment: Alignment.center, + // child: Text( + // S.of(context).zongzichan, + // style: TextStyle( + // fontWeight: MyFontWeight.semi_bold, + // color: Color(0xFF353535), + // fontSize: 16.sp, + // ), + // ), + // ), + // // GestureDetector( + // // onTap: () { + // // queryUserBalance(); + // // }, + // // child: Row( + // // mainAxisAlignment: MainAxisAlignment.end, + // // children: [ + // // Icon( + // // Icons.refresh, + // // size: 20, + // // color: Color(0xFF8A8A8A), + // // ), + // // Text( + // // S.of(context).shuaxin, + // // style: TextStyle( + // // color: Color(0xFF353535), + // // fontSize: 12.sp, + // // ), + // // ), + // // ], + // // ), + // // ), + // ], + // ), + // SizedBox( + // height: 16.h, + // ), + // Text( + // "$mBalance", + // style: TextStyle( + // fontWeight: MyFontWeight.medium, + // color: Color(0xFF353535), + // fontSize: 50.sp, + // ), + // ), + // // SizedBox( + // // height: 4.h, + // // ), + // // Text( + // // S.of(context).keyongyue, + // // style: TextStyle( + // // color: Color(0xFF20662A), + // // fontSize: 16.sp, + // // fontWeight: MyFontWeight.regular + // // ), + // // ), + // SizedBox( + // height: 24.h, + // ), + // InkWell( + // onTap: () { + // toRecharge(); + // }, + // child: RoundButton( + // width: 104.w, + // text: S.of(context).lijichongzhi, + // textColor: Colors.white, + // fontWeight: MyFontWeight.semi_bold, + // radius: 15, + // backgroup: Color(0xFF32A060), + // fontSize: 14.sp, + // padding: EdgeInsets.symmetric(vertical: 5.h), + // ), + // ), + // ], + // ), + // ); + // } toRecharge() async { await Navigator.of(context).pushNamed('/router/recharge_page'); diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f37552cb..1f2a6374 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,18 +26,8 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 - -// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 - -// const base_url = "http://192.168.10.132:8765/app/";///詹云久 - - -// const base_url = "http://192.168.10.236:8765/app/"; ///费韬 - -// const base_url = "http://192.168.10.37:8765/app/"; - -const localBaseUrl = "http://192.168.10.236:8765/app/";///本地 +// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index fabaf924..8f74e4cc 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -61,17 +61,8 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 - -// const base_url = "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.37:8766/app/"; - -// const base_url = "http://192.168.10.132:8766/app/";///詹云久 - -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @RestApi(baseUrl: localBaseUrl)