diff --git a/assets/svg/lianmeng.svg b/assets/svg/lianmeng.svg index 29d4ed9d..4792864c 100644 --- a/assets/svg/lianmeng.svg +++ b/assets/svg/lianmeng.svg @@ -1,13 +1,19 @@ - 编组 5 + 编组 7 - - - - - - + + + + + + + + + + + + diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 5fbcc9d8..c6397f88 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -103,7 +103,6 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { await apiService.queryInfo().catchError((onError) { _refreshController.refreshFailed(); }); - if (baseDate != null && baseDate.isSuccess) { userInfo = baseDate.data; SharedPreferences.getInstance().then( diff --git a/lib/mine/mine_vip/mine_vip_core.dart b/lib/mine/mine_vip/mine_vip_core.dart index 5845f64b..070b16d0 100644 --- a/lib/mine/mine_vip/mine_vip_core.dart +++ b/lib/mine/mine_vip/mine_vip_core.dart @@ -176,7 +176,6 @@ class _MineVipCore extends State { Column( children: [ SizedBox(height: 40), - Container( child:Row( children: [ @@ -643,8 +642,8 @@ class _MineVipCore extends State { alignment: Alignment.bottomCenter, children: [ MImage( - (vipBenefitList.actived || (vipBenefitList.actived && vipBenefitList.have) ||(vipBenefitList.actived && !vipBenefitList.have))? - (vipBenefitList?.icon ?? ""):(vipBenefitList?.iconGrey ?? ""), + (!vipBenefitList.actived || (!vipBenefitList.actived && !vipBenefitList.have) || (vipBenefitList.actived && !vipBenefitList.have))? + (vipBenefitList?.iconGrey ?? ""):(vipBenefitList?.icon ?? ""), width: 36, height: 36, // fit: BoxFit.cover, diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index 862f0292..51323858 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -101,7 +101,7 @@ class _RechargePage extends State { hintText: "", controller: controller, padding: EdgeInsets.all(20), - errorText: S.of(context).chongzhizuixiaojine(0.1), + errorText: S.of(context).chongzhizuixiaojine(100), titleColor: Color(0xFF727272), errorTextColor: Color(0xFF32A060), radius: 8, @@ -117,7 +117,7 @@ class _RechargePage extends State { onChanged: (value) { if (value != null && value != "" && - double.tryParse(value) < 10) { + double.tryParse(value) < 100) { color = Colors.red; } else { color = Colors.black; @@ -319,7 +319,7 @@ class _RechargePage extends State { } int amount = int.tryParse(money); if (checkIndex == 1) { - if (amount < 0.001) { + if (amount < 100) { SmartDialog.showToast(S.of(context).chongzhizuixiaojine(0.001), alignment: Alignment.center); return; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 8eb3fdb8..ecfed7d2 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -56,15 +56,15 @@ part 'retrofit_api.g.dart'; // const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 -// const base_url = "http://192.168.10.236:8766/app/"; ///费韬 -// const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 +const base_url = "http://192.168.10.236:8766/app/"; ///费韬 +const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 // const base_url = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/"; -const base_url = "http://192.168.10.130:8766/app/";///詹云久 -const baseUrl = "http://192.168.10.130:8766/app/";///詹云久 +// const base_url = "http://192.168.10.130:8766/app/";///詹云久 +// const baseUrl = "http://192.168.10.130:8766/app/";///詹云久 @RestApi(baseUrl: baseUrl) abstract class ApiService { diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 495e870e..1eb48e20 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.130:8766/app/'; + baseUrl ??= 'http://192.168.10.236:8766/app/'; } final Dio _dio; diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index 91ca1a96..3b0a40fe 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -341,7 +341,9 @@ class _SettlementOrderCommodity extends State { ), Container( child: Text( - "已优惠:￥${(widget.minOrderInfo != null) ? (widget.minOrderInfo.discountAmount ?? "0") : (widget.settleOrderInfo.discountAmount ?? "0")}", + "已优惠:￥${(widget.minOrderInfo != null) ? (widget.minOrderInfo.discountAmount ?? "0") : (double.parse(widget.settleOrderInfo.discountAmount ?? "0") + + double.parse(widget?.settleOrderInfo?.benefitDiscountAmount ?? "0")) + }", style: TextStyle( fontSize: 12.sp, color: Color(0xFF7B7B7B), diff --git a/lib/view_widget/invite_success_dialog.dart b/lib/view_widget/invite_success_dialog.dart index 5a7d382e..0f190883 100644 --- a/lib/view_widget/invite_success_dialog.dart +++ b/lib/view_widget/invite_success_dialog.dart @@ -80,7 +80,9 @@ class _InviteSuccessDialog extends State { SizedBox(height: 13,), GestureDetector( onTap: (){ - Navigator.of(context).pop(); + setState(() { + Navigator.of(context).pop(); + }); }, child:RoundButton( text: S.of(context).queren, @@ -92,9 +94,6 @@ class _InviteSuccessDialog extends State { fontWeight: MyFontWeight.semi_bold, backgroup: Color(0xFF32A060), radius: 4.w, - callback: () { - SmartDialog.dismiss(); - }, ), ), SizedBox(height:20), diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 452b80ab..9e35d485 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -217,7 +217,7 @@ class MineVipView extends StatelessWidget { // rank > rankMax // ? S.of(context).dangqiandengji // : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}", - (vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3) + (vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3 || curLevel ==2) ? S.of(context).dangqiandengji : "消费￥${rankMax - (rank ?? 0)}元 ${S.of(context).daoxiayidengji}"), overflow: TextOverflow.ellipsis, diff --git a/lib/view_widget/vip_dialog.dart b/lib/view_widget/vip_dialog.dart index 3d25b7a9..c999d362 100644 --- a/lib/view_widget/vip_dialog.dart +++ b/lib/view_widget/vip_dialog.dart @@ -215,7 +215,8 @@ class _VipDialog extends State { alignment: Alignment.bottomCenter, children: [ MImage( - vipBenefitList?.icon ?? "", + (!vipBenefitList.actived || (!vipBenefitList.actived && !vipBenefitList.have) || (vipBenefitList.actived && !vipBenefitList.have))? + (vipBenefitList?.iconGrey ?? ""):(vipBenefitList?.icon ?? ""), width: 36, height: 36, // fit: BoxFit.cover, @@ -250,7 +251,7 @@ class _VipDialog extends State { ], ), ), - if (!vipBenefitList.actived && !vipBenefitList.have) + if (!vipBenefitList.actived && !vipBenefitList.have || vipBenefitList.actived && !vipBenefitList.have ) Container( decoration: new BoxDecoration( color: Color(0xFFA29E9E),