充值更改

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';

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();

lib/mine/mine_vip/legal_right_details.dart

@@ -463,9 +463,9 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                   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",
                     ),

lib/mine/mine_vip/mine_vip_core.dart

@@ -66,6 +66,17 @@ class _MineVipCore extends State<MineVipCore> {
       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<MineVipCore> {
         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);
     }

lib/mine/recharge_page.dart

@@ -44,6 +44,17 @@ class _RechargePage extends State<RechargePage> {
       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<RechargePage> {
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: MyFontWeight.regular,
-                                color: Colors.blueAccent,
+                                color:Color(0xff3541C9),
                               ),
                             ),
                             TextSpan(
@@ -304,7 +315,7 @@ class _RechargePage extends State<RechargePage> {
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: MyFontWeight.regular,
-                                color: Colors.blueAccent,
+                                color: Color(0xff3541C9),
                               ),
                             ),TextSpan(
                               text: "元",
@@ -401,17 +412,6 @@ class _RechargePage extends State<RechargePage> {
           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);

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/";

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;

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 {

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;

lib/settlement/settlement.dart

@@ -111,6 +111,11 @@ class _Settlement extends State<Settlement> {
       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<Settlement> {
           timeStamp: int.tryParse(wxPay.timeStamp),
           sign: wxPay.sign,
         );
-        weChatResponseEventHandler.listen((event) async {
-          print("payCallback: ${event.errCode}");
-          toOrderDetails(placeOrderFirst.id);
-        });
       }
     }
     else {