diff --git a/assets/image/2x/activity_q.png b/assets/image/2x/activity_q.png index 98422818..3b30e5d3 100644 Binary files a/assets/image/2x/activity_q.png and b/assets/image/2x/activity_q.png differ diff --git a/assets/image/3x/activity_q.png b/assets/image/3x/activity_q.png index abd4589d..5d82dfa7 100644 Binary files a/assets/image/3x/activity_q.png and b/assets/image/3x/activity_q.png differ diff --git a/assets/image/activity_q.png b/assets/image/activity_q.png index 46742d63..31b4621a 100644 Binary files a/assets/image/activity_q.png and b/assets/image/activity_q.png differ diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 8eb7af46..1e4e1d6e 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -1,5 +1,4 @@ import 'dart:convert'; - import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/main.dart b/lib/main.dart index cdb186a8..c05021fb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -111,7 +111,7 @@ void main() async { runApp(MyApp(locale, isFirst)); // FlutterBugly.postCatchedException((){ // }); - // FlutterBugly.init(androidAppId: "204f207673",iOSAppId: "8bb92ba0f6"); + // FlutterBugly.init(androidAppId: "85ed24e0ec",iOSAppId: "b8a258b0bc"); } final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin(); diff --git a/lib/mine/mine_vip/legal_right_details.dart b/lib/mine/mine_vip/legal_right_details.dart index 709c4e13..21a2ae9d 100644 --- a/lib/mine/mine_vip/legal_right_details.dart +++ b/lib/mine/mine_vip/legal_right_details.dart @@ -463,9 +463,9 @@ class _LegalRightDetails extends State { children: [ MImage( vipBenefitList?.icon ?? "", - width: 50, - height: 50, - // fit: BoxFit.cover, + width:51, + height: 51, + isCircle: true, errorSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png", ), diff --git a/lib/mine/mine_vip/mine_vip_core.dart b/lib/mine/mine_vip/mine_vip_core.dart index 94bcaf5b..5e357a41 100644 --- a/lib/mine/mine_vip/mine_vip_core.dart +++ b/lib/mine/mine_vip/mine_vip_core.dart @@ -66,6 +66,17 @@ class _MineVipCore extends State { queryBenefitList(); queryRuleDetails(); }); + weChatResponseEventHandler.listen((event) async { + print("payCallback: ${event.errCode}"); + if (event.errCode == 0) { + widget.arguments["rankLevel"] = ranks[checkIndex].level; + queryVipLevel(); + showAlertDialog(ranks[checkIndex].rankName); + } else { + SmartDialog.showToast("支付失败", alignment: Alignment.center); + return; + } + }); } queryVipLevel() async { @@ -134,17 +145,6 @@ class _MineVipCore extends State { timeStamp: int.tryParse(wxPay.timeStamp), sign: wxPay.sign, ); - weChatResponseEventHandler.listen((event) async { - print("payCallback: ${event.errCode}"); - if (event.errCode == 0) { - widget.arguments["rankLevel"] = ranks[checkIndex].level; - queryVipLevel(); - showAlertDialog(ranks[checkIndex].rankName); - } else { - SmartDialog.showToast("支付失败", alignment: Alignment.center); - return; - } - }); } else { SmartDialog.showToast(baseData.msg, alignment: Alignment.center); } diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index fa6854aa..17af36a4 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -44,6 +44,17 @@ class _RechargePage extends State { queryBenefitList(); queryRuleDetails(); }); + weChatResponseEventHandler.listen((event) async { + print("payCallback: ${event.errCode}"); + if(event.errCode == 0){ + Navigator.of(context).pop(); + SmartDialog.showToast("充值成功", alignment: Alignment.center); + } + else{ + SmartDialog.showToast("充值失败", alignment: Alignment.center); + return; + } + }); } @@ -288,7 +299,7 @@ class _RechargePage extends State { style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, - color: Colors.blueAccent, + color:Color(0xff3541C9), ), ), TextSpan( @@ -304,7 +315,7 @@ class _RechargePage extends State { style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, - color: Colors.blueAccent, + color: Color(0xff3541C9), ), ),TextSpan( text: "元", @@ -401,17 +412,6 @@ class _RechargePage extends State { timeStamp: int.tryParse(wxPay.timeStamp), sign: wxPay.sign, ); - weChatResponseEventHandler.listen((event) async { - print("payCallback: ${event.errCode}"); - if(event.errCode == 0){ - Navigator.of(context).pop(); - SmartDialog.showToast("充值成功", alignment: Alignment.center); - } - else{ - SmartDialog.showToast("充值失败", alignment: Alignment.center); - return; - } - }); } else{ SmartDialog.showToast(baseData.msg, alignment: Alignment.center); diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 901bc3f1..823d1620 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -21,8 +21,8 @@ import 'data/shoppingCart.dart'; part 'min_api.g.dart'; -// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 -// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式 +const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 +const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 @@ -32,8 +32,8 @@ part 'min_api.g.dart'; // const baseUrl = "http://192.168.10.236:8765/app/";///费韬 -const base_url = "http://192.168.10.88:8765/app/";///詹云久 -const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 +// const base_url = "http://192.168.10.88:8765/app/";///詹云久 +// const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 // const base_url = "http://192.168.10.37:8766/app/"; diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart index 856ae6e1..02d9988a 100644 --- a/lib/retrofit/min_api.g.dart +++ b/lib/retrofit/min_api.g.dart @@ -9,7 +9,7 @@ part of 'min_api.dart'; class _MinApiService implements MinApiService { _MinApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.88:8765/app/'; + baseUrl ??= 'https://pos.api.lotus-wallet.com/app/'; } final Dio _dio; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index b95d48d0..adc8711d 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -54,8 +54,8 @@ import 'data/wx_pay.dart'; 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 = "https://pos.platform.lotus-wallet.com/app/"; ///正式 +const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 @@ -70,8 +70,8 @@ part 'retrofit_api.g.dart'; // const baseUrl = "http://192.168.10.37:8766/app/"; -const base_url = "http://192.168.10.88:8766/app/";///詹云久 -const baseUrl = "http://192.168.10.142:8766/app/";///詹云久 +// const base_url = "http://192.168.10.88:8766/app/";///詹云久 +// const baseUrl = "http://192.168.10.88: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 527cc52a..5735110a 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.88:8766/app/'; + baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/'; } final Dio _dio; diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 123a61ce..4b7331e1 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -111,6 +111,11 @@ class _Settlement extends State { else queryOrderInfo(null, selectedBtn, null, 0, null); }); + + weChatResponseEventHandler.listen((event) async { + print("payCallback: ${event.errCode}"); + toOrderDetails(placeOrderFirst.id); + }); } ///订单结算信息 @@ -355,10 +360,6 @@ class _Settlement extends State { timeStamp: int.tryParse(wxPay.timeStamp), sign: wxPay.sign, ); - weChatResponseEventHandler.listen((event) async { - print("payCallback: ${event.errCode}"); - toOrderDetails(placeOrderFirst.id); - }); } } else {