From e1ea7f26976a3d4e7915d2b2ccc5c7fe05427a25 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 11:41:01 +0800
Subject: [PATCH] submit

---
 App.vue                              | 4 +++-
 pages/confirm-order/index.vue        | 5 +++++
 pages/consignment-painting/index.vue | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/App.vue b/App.vue
index a638731..4f25d69 100644
--- a/App.vue
+++ b/App.vue
@@ -33,6 +33,8 @@ export default {
   width: 404rpx!important;
   height: 306rpx!important;
 }
-
+.u-transition{
+  z-index: 999!important;
+}
 
 </style>
diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue
index 9e45015..a62bb69 100644
--- a/pages/confirm-order/index.vue
+++ b/pages/confirm-order/index.vue
@@ -112,6 +112,7 @@
       </div>
       <div class="wrap2" @click="signContract">付款</div>
     </div>
+    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在生成订单并付款..."></u-loading-page>
   </div>
 </template>
 <script>
@@ -121,6 +122,7 @@ export default {
   name: "confirm-order",
   data(){
     return{
+      loading:false,
       orderingInfo:uni.getStorageSync('orderingInfo'),
       expectedPayment:'',
       distance:'',
@@ -166,6 +168,7 @@ export default {
   },
   methods: {
   async  signContract(){
+    this.loading=true
     const data1={
       artworkName:this.orderingInfo.info.artworkName,
       artworkNum:this.orderingInfo.info.artworkNum,
@@ -179,6 +182,7 @@ export default {
       artworkSquareSize:Number(this.orderingInfo.info.artworkSquareSize),
       contractTransactionId:this.orderingInfo.transactionId
     }
+
     const res1 = await postDataByParams('/api/warehouse/create',data1)
       if (res1.code===200){
         const res2 = await postDataByParams('/api/warehouse/paid',{
@@ -188,6 +192,7 @@ export default {
           uni.navigateTo({
             url: `/pages/paySuccess/paySuccess?ID=${res1.data.ID}`,
           });
+          this.loading=false
         }
       }
     },
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index c5a621a..d352a4e 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -188,6 +188,7 @@
       </div>
       <div class="wrap2" @click="signContract">确认金额并签署合同</div>
     </div>
+    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在进入法大大签署..."></u-loading-page>
   </div>
 </template>
 <script>
@@ -213,6 +214,7 @@ export default {
       days.push(i)
     }
     return {
+      loading:false,
       fileList1:[],
       dayMoney:'',
       expectedPayment:'',
@@ -333,6 +335,7 @@ export default {
          return
        }
      }
+     this.loading=true
      const data={
        cycleId:this.cycleId,
        warehouseID:this.warehouseID,
@@ -355,6 +358,7 @@ export default {
        uni.navigateTo({
          url: `/pages/signwebview/index`,
        });
+       this.loading=false
      }
 
     },