From f041aa56f569d9f3b156bc6f679d0d0749710bc9 Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Wed, 30 Jun 2021 16:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ui/profile/house/contract_preview_page.dart        |  5 ++++-
 lib/ui/profile/house/download_contract_page.dart       |  2 +-
 lib/ui/profile/house/house_information_check_page.dart | 10 ++--------
 lib/ui/profile/house/upload_contracts_page.dart        |  5 +----
 lib/ui/profile/house/upload_empty_form_page.dart       |  5 ++++-
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/ui/profile/house/contract_preview_page.dart b/lib/ui/profile/house/contract_preview_page.dart
index af2b6b3b..7769e645 100644
--- a/lib/ui/profile/house/contract_preview_page.dart
+++ b/lib/ui/profile/house/contract_preview_page.dart
@@ -98,9 +98,12 @@ class _ContractPreviewPageState extends State<ContractPreviewPage> {
                 String result = await HouseFunc().uploadSignName(_signName!);
                 String path = await HouseFunc()
                     .generateContract(widget.id, widget.url, result);
-                if (path.isNotEmpty)
+                if (path.isNotEmpty) {
+                  Get.back();
+                  Get.back();
                   Get.off(
                       () => DownLoadContractPage(path: path, id: widget.id));
+                }
               } catch (e) {
                 LoggerData.addData(e);
                 print(e);
diff --git a/lib/ui/profile/house/download_contract_page.dart b/lib/ui/profile/house/download_contract_page.dart
index e65d0f7a..4ececadc 100644
--- a/lib/ui/profile/house/download_contract_page.dart
+++ b/lib/ui/profile/house/download_contract_page.dart
@@ -68,7 +68,7 @@ class _DownLoadContractPageState extends State<DownLoadContractPage> {
                     elevation: 0,
                     color: kPrimaryColor,
                     onPressed: () {
-                      Get.to(() => UploadContractsPage(
+                      Get.off(() => UploadContractsPage(
                             id: widget.id,
                           ));
                     },
diff --git a/lib/ui/profile/house/house_information_check_page.dart b/lib/ui/profile/house/house_information_check_page.dart
index 50b2cb44..e44a55a5 100644
--- a/lib/ui/profile/house/house_information_check_page.dart
+++ b/lib/ui/profile/house/house_information_check_page.dart
@@ -64,17 +64,11 @@ class _HouseInformationCheckPageState extends State<HouseInformationCheckPage> {
                 .uploadIdCardBack(_submitModel.idCardBackFile!));
             String result = await HouseFunc().submitLeaseInfo(_submitModel);
             if (result.isNotEmpty) {
-              Get.back();
-              Get.off(() => ContractPreviewPage(
+              Get.to(() => ContractPreviewPage(
                     id: widget.detailModel.id,
                     url: result,
                   ));
-            } else {
-              Get.off(() => ContractPreviewPage(
-                    id: widget.detailModel.id,
-                    url: '',
-                  ));
-            }
+            } 
           } catch (e) {
             LoggerData.addData(e);
           }
diff --git a/lib/ui/profile/house/upload_contracts_page.dart b/lib/ui/profile/house/upload_contracts_page.dart
index 8fac562b..edf5fc06 100644
--- a/lib/ui/profile/house/upload_contracts_page.dart
+++ b/lib/ui/profile/house/upload_contracts_page.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/ui/profile/house/contract_pay_page.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
@@ -105,9 +104,7 @@ class _UploadContractsPageState extends State<UploadContractsPage> {
             bool result =
                 await HouseFunc().submitFormalContract(widget.id, _urls);
             if (result) {
-              Get.to(() => ContractPayPage(
-                    id: widget.id,
-                  ));
+              Get.back();
             }
             cancel();
           },
diff --git a/lib/ui/profile/house/upload_empty_form_page.dart b/lib/ui/profile/house/upload_empty_form_page.dart
index c96a31bf..32ca8f14 100644
--- a/lib/ui/profile/house/upload_empty_form_page.dart
+++ b/lib/ui/profile/house/upload_empty_form_page.dart
@@ -1,3 +1,4 @@
+import 'package:aku_community/painters/contact_manager_painter.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -16,7 +17,9 @@ class _UploadEmptyFormPageState extends State<UploadEmptyFormPage> {
       body: Center(
         child: Column(
           children: [
-            
+            CustomPaint(
+              painter: ContactManagerPainter(),
+            )
           ],
         ),
       ),