08/07

lib/pages/ChoosePay.dart

@@ -12,6 +12,7 @@ import 'package:fluwx/fluwx.dart' as fluwx;
 import 'package:get_ip/get_ip.dart';
 import 'package:dio/dio.dart';
 import 'dart:convert';
+import '../widget/Dialog.dart';
 
 class ChoosePay extends StatefulWidget {
   ChoosePay(this.type, this.chooseProduct);
@@ -88,6 +89,7 @@ class _ChoosePayState extends State<ChoosePay> with WidgetsBindingObserver {
           textColor: Colors.white,
           child: Text('立即支付'),
           onPressed: () async {
+            // return;
             String ipAddress = await GetIp.ipAddress;
             print(ipAddress);
             final Result res = await HttpManager.get('lyf/appUnifiedOrder', data: {
@@ -96,15 +98,25 @@ class _ChoosePayState extends State<ChoosePay> with WidgetsBindingObserver {
               'ip': ipAddress,
               'productId': widget.chooseProduct.id
             });
-            print( StoreProvider.of<AppState>(context).state.userInfo.id);
+            print(StoreProvider.of<AppState>(context).state.userInfo.id);
             if (res.success) {
-                fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd",path:"page/component/confirm/index?data="+res.data);
-            }
+              fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd", path: "page/component/confirm/index?data=" + res.data["data"]);
 
-         
-            
-          //  String str= 'eyJhbW91bnQiOiIxIiwiYXR0YWNoIjoie1widG90YWxcIjoxLFwicHJvZHVjdElkXCI6XCIxXCIsXCJ1c2VySWRcIjpcIjg0NzA1XCIsXCJjYXNoXCI6MTB9IiwiYm9keSI6IjHpl6jnpagiLCJtY2hfaWQiOiIxMDAwMDAwODM1NDEiLCJub25jZV9zdHIiOiI1MjM2OGU0NjRkNDI0MTYwODdjZmZjNzVjODg0MDljZCIsIm5vdGlmeV91cmwiOiJodHRwOi8vMTIzLjU4LjI0MC4xMzg6OTAwMC8iLCJvdXRfdHJhZGVfbm8iOiIxNTY0NzM5OTc0MTM4ODE4OTQyOSIsInBheW1lbnRfdHlwZSI6InRyYWRlLndlaXhpbi5hcHAiLCJyZXR1cm5fdXJsIjoiaHR0cDovLzEyMy41OC4yNDAuMTM4OjkwMDAvbHlmL25vdGlmeSIsInNpZ24iOiIyN2RjMTY2OTE4YzRkY2E0NjAyOWQ4YzllNDhhYjdmMiIsInNpZ25fdHlwZSI6Ik1ENSIsInNwYmlsbF9jcmVhdGVfaXAiOiIxMjcuMC4wLjEifQ==';
+              MyDialog.showDialog(context, '已经成功调起微信支付', submitText: '支付完成', isCancel: true, onsubmit: () async {
+                final Result res2 = await HttpManager.get('wxpayTemp/getWxpayTemp', data: {'id': res.data["id"]});
+                if (res2.success && res2.data!=new Map()) {
+                  if (res2.data['resultCode'] == 'NOT_PAY') {
+                    Toast.show(context, '支付取消', 1500, 'info');
+                  } else {
+                    Toast.show(context, '购买成功', 1500, 'success');
+                    getUserInfo();
+                    Navigator.of(context).pop();
+                  }
+                }
+              });
+            }
 
+            //  String str= 'eyJhbW91bnQiOiIxIiwiYXR0YWNoIjoie1widG90YWxcIjoxLFwicHJvZHVjdElkXCI6XCIxXCIsXCJ1c2VySWRcIjpcIjg0NzA1XCIsXCJjYXNoXCI6MTB9IiwiYm9keSI6IjHpl6jnpagiLCJtY2hfaWQiOiIxMDAwMDAwODM1NDEiLCJub25jZV9zdHIiOiI1ZmM3NWVlZmY0MjA0MGEwYmEwMWQwZDE2NGJhYmU2YyIsIm5vdGlmeV91cmwiOiJodHRwOi8vMTIzLjU4LjI0MC4xMzg6OTAwMC8iLCJvdXRfdHJhZGVfbm8iOiIxNTY0OTkzMjYwNDc0NjQxNTcyNyIsInBheW1lbnRfdHlwZSI6InRyYWRlLndlaXhpbi5hcHAiLCJyZXR1cm5fdXJsIjoiaHR0cDovLzEyMy41OC4yNDAuMTM4OjkwMDAvbHlmL25vdGlmeSIsInNpZ24iOiIxYjg0NWE4ZjNmYWI0OTA1NTViYWE5MGZkYzFkODc1MyIsInNpZ25fdHlwZSI6Ik1ENSIsInNwYmlsbF9jcmVhdGVfaXAiOiIxMTkuMTM3LjU1LjE4OSJ9';            fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd",path:"page/component/confirm/index?data="+str);
             // fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd",path:"page/component/confirm/index?data="+str);
             // Toast.show(context, '加载中', -1, 'loading');
             // final Result res = await HttpManager.post('productInfo/buy', data: {

lib/widget/Dialog.dart

@@ -71,12 +71,12 @@ class LoadingDialog extends Dialog {
                                   children: <Widget>[
                                     Container(
                                       width: 100,
-                                      child: RaisedButton(
-                                        color: Color(0xFF3A3D5C),
-                                        highlightColor: Color(0xFF3A3D5C).withOpacity(0.8),
-                                        textColor: Colors.white,
-                                        child: Text('取消'),
-                                        onPressed: () {
+                                      child: LinearButton(
+                                        btntext: '取消',
+                                        btnHeight: 36.0,
+                                        colorList: [Colors.white, Colors.white],
+                                        textColor: Color(0xFF252532),
+                                        onTapHomeMenu: () {
                                           Navigator.of(context).pop();
                                           oncancel();
                                         },