Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

lib/home/welfare_page.dart

@@ -704,7 +704,7 @@ class _WelfarePage extends State<WelfarePage> {
                 "assets/image/welfare_spread.webp",
                 width:double.infinity,
                 fit: BoxFit.fill,
-                height:100.h,
+                height:80.h,
               ),
               borderRadius: BorderRadius.circular(6.w),
             ),

lib/integral/integral_page.dart

@@ -81,7 +81,9 @@ class _IntegralPage extends State<IntegralPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
+    return Container(
+      color: Colors.white,
+      child: Stack(
         children: [
           // Positioned(
           //   child: Container(
@@ -179,6 +181,7 @@ class _IntegralPage extends State<IntegralPage> {
             ),
           ),
         ],
+      ),
     );
   }
 

lib/main.dart

@@ -163,6 +163,7 @@ class MyApp extends StatelessWidget {
         child: ScreenUtilInit(
           designSize: Size(375, 812),
           builder: () => MaterialApp(
+            title: "",
             debugShowCheckedModeBanner: false,
             theme: ThemeData(
               primarySwatch: Colors.blue,

lib/order/order_detail_page.dart

@@ -121,7 +121,9 @@ class _OrderDetailPage extends State<OrderDetailPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
+    return Container(
+      color: Colors.white,
+      child: Stack(
         children: [
           Container(
             // height: (orderStatus >= 4 ? 118.h : 118.h) +
@@ -199,6 +201,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
             ),
           )
         ],
+      ),
     );
   }
 

lib/setting/account_security_page.dart

@@ -85,7 +85,7 @@ class _AccountSecurityPage extends State<AccountSecurityPage> {
           children: [
             GestureDetector(
               onTap: () {
-                Navigator.of(context).popAndPushNamed('/router/platform_code_page',arguments:{"userInfo":userInfo});
+                Navigator.of(context).pushReplacementNamed('/router/platform_code_page',arguments:{"userInfo":userInfo});
               },
               child: Container(
                 padding: EdgeInsets.all(15),

lib/setting/platform_code_page.dart

@@ -77,7 +77,7 @@ class _PlatformCodePage extends State<PlatformCodePage> {
       "smsCode": smsCode,
     }).catchError((error) {});
     if (baseData != null && baseData.isSuccess) {
-      Navigator.of(context).popAndPushNamed(
+      Navigator.of(context).pushReplacementNamed(
           '/router/platform_pay_code',
           arguments: {
             "inputText": inputText,

lib/setting/platform_pay_code.dart

@@ -1,17 +1,10 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/generated/l10n.dart';
-import 'package:huixiang/retrofit/data/base_data.dart';
-import 'package:huixiang/retrofit/data/user_info.dart';
-import 'package:huixiang/retrofit/retrofit_api.dart';
-import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:huixiang/view_widget/pay_selected_dialog.dart';
 import 'package:pin_input_text_field/pin_input_text_field.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class PlatformPayCode extends StatefulWidget {
   final Map<String, dynamic> arguments;
@@ -120,7 +113,7 @@ class _PlatformPayCode extends State<PlatformPayCode> {
             onTap: (){
               setState(() {
                 if(inputCode.length == 6){
-                  Navigator.of(context).popAndPushNamed('/router/platform_pay_code_success',arguments:{
+                  Navigator.of(context).pushReplacementNamed('/router/platform_pay_code_success',arguments:{
                     "inputCode":inputCode,
                     "inputText":widget.arguments["inputText"]
                   });

lib/setting/setting_page.dart

@@ -9,7 +9,6 @@ import 'package:huixiang/utils/event_type.dart';
 import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/utils/min.dart';
-import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';

lib/settlement/settlement.dart

@@ -642,7 +642,7 @@ class _Settlement extends State<Settlement> {
   }
 
   toOrderDetails(String orderId) {
-    Navigator.of(context).popAndPushNamed(
+    Navigator.of(context).pushReplacementNamed(
       '/router/order_details',
       arguments: {
         "id": orderId,
@@ -654,7 +654,7 @@ class _Settlement extends State<Settlement> {
   ///去砍价详情页面
   toBargain() async {
     await Navigator.of(context)
-        .popAndPushNamed('/router/bargain_details', arguments: {
+        .pushReplacementNamed('/router/bargain_details', arguments: {
       "actRecordId": launchJoinAct.actRecordId,
       // "limitNumber": limitNumber,
       "storeInfo": storeInfo,
@@ -663,7 +663,9 @@ class _Settlement extends State<Settlement> {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
+    return Container(
+      color: Colors.white,
+      child: Stack(
         children: [
           Container(
             // height: 175.h,
@@ -729,6 +731,7 @@ class _Settlement extends State<Settlement> {
                               // ),
 
                               ///订单商品
+                              if(settleOrderInfo != null || minOrderInfo != null)
                               SettlementOrderCommodity(
                                 selectedBtn,
                                 settleOrderInfo,
@@ -851,6 +854,7 @@ class _Settlement extends State<Settlement> {
             ),
           )
         ],
+      ),
     );
   }
 

lib/store/shopping/shopping_home/bargain_details.dart

@@ -128,7 +128,7 @@ class _BargainDetails extends State<BargainDetails> {
 
   ///直接购买去下单结算页面
   toOrder() async {
-    await Navigator.of(context).popAndPushNamed(
+    await Navigator.of(context).pushReplacementNamed(
       '/router/settlement',
       arguments: {
         "storeInfo": storeInfo,

lib/store/store_view/product_sku.dart

@@ -306,7 +306,7 @@ class _ProductSku extends State<ProductSku> {
                   children: [
                     Expanded(child: GestureDetector(
                       onTap: (){
-                        Navigator.of(context).popAndPushNamed('/router/group_details');
+                        Navigator.of(context).pushReplacementNamed('/router/group_details');
                       },
                       child: Container(
                         alignment: Alignment.center,

pubspec.yaml

@@ -3,7 +3,7 @@ description: 一心回乡.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 2.0.29+17
+version: 2.0.30+18
 
 environment:
   sdk: ">=2.7.0 <3.0.0"