合并uniapp更改

lib/mine/mine_view/mine_item.dart

@@ -170,7 +170,7 @@ class _MineItem extends State<MineItem> {
               ),),
               Expanded(child: Text("")),
             ],
-              ),),
+              ),
               Expanded(child:InkWell(
                 onTap: () {
                   Navigator.of(context).pushNamed('/router/qr_share', arguments: {});
@@ -180,8 +180,6 @@ class _MineItem extends State<MineItem> {
                   "assets/image/icon_mine_promotion_code.png",
                 ),
               ),),
-            ],
-          ),
           Row(
             children: [
               Expanded(child:InkWell(
@@ -197,13 +195,13 @@ class _MineItem extends State<MineItem> {
               Expanded(child:Container()),
               Expanded(child:Container())
             ],
+          ),
+            ],
           ),
           // mineItem(
           //   S.of(context).bangzhuyufankui,
           //   "assets/image/icon_mine_feedback.png",
           // ),
-        ],
-      ),
     );
   }
 

lib/retrofit/min_api.dart

@@ -28,8 +28,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 = "https://pos.api.lotus-wallet.com/app/"; ///正式
-const baseUrl = "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

lib/retrofit/retrofit_api.dart

@@ -58,8 +58,8 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-const base_url = "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 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

lib/retrofit/retrofit_api.g.dart

@@ -1189,7 +1189,7 @@ class _ApiService implements ApiService {
   }
 
   @override
-  Future<BaseData<dynamic>> orderCancel(id) async {
+  Future<BaseData<bool>> orderCancel(id) async {
     ArgumentError.checkNotNull(id, 'id');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
@@ -1203,9 +1203,9 @@ class _ApiService implements ApiService {
             extra: _extra,
             baseUrl: baseUrl),
         data: _data);
-    final value = BaseData<dynamic>.fromJson(
+    final value = BaseData<bool>.fromJson(
       _result.data,
-      (json) => json as dynamic,
+      (json) => json as bool,
     );
     return value;
   }

lib/store/store_order.dart

@@ -488,6 +488,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
             ),
           ],
         ),
+      ),
       );
   }