From 1d243513b7ab54f815497c496283517bc8cc669d Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 9 Oct 2023 18:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Order/detail.vue | 7 +++----
 pages/User/order.vue   | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/Order/detail.vue b/pages/Order/detail.vue
index b77b6ff..d04e207 100644
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@@ -360,7 +360,8 @@ export default {
     }
   },
   onLoad(option) {
-      this.model.order.house_order_id  = option.id?option.id:'';
+      this.model.order.house_order_id = option.house_order_id?option.house_order_id:'';
+      this.model.order.house_id  = option.id?option.id:'';
       this.model.order.rent = option.rent?parseFloat(option.rent)+'':'';
       this.type = option.type?option.type:'create';
   },
@@ -389,9 +390,7 @@ export default {
           // this.model.order.month = ''+this.model.order.month;
           // this.model.order.month = parseInt(this.model.order.month);
 
-          this.fileList1 = [{
-            url:res.data.payment_voucher
-          }];
+          this.fileList1 = res.data.payment_voucher;
           this.fileList2 = res.data.lease_agreement;
         })
     },
diff --git a/pages/User/order.vue b/pages/User/order.vue
index 1544d27..cb346af 100644
--- a/pages/User/order.vue
+++ b/pages/User/order.vue
@@ -126,21 +126,21 @@
         <view class="button-group row col">
           <view class="button" v-if="item.status === 3">
             <u-button
-                @click="navTo('/pages/Order/detail?id='+item.id+'&type=edit')"
+                @click="navTo('/pages/Order/detail?house_order_id='+item.id+'&type=edit')"
                 text="重新审核"
                 shape="circle"
                 custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
           </view>
           <view class="button" v-else-if="item.status === 5 || item.status === 1">
             <u-button
-                @click="navTo('/pages/Order/detail?id='+item.id+'&type=apply')"
+                @click="navTo('/pages/Order/detail?house_order_id='+item.id+'&type=apply')"
                 text="申请兑换"
                 shape="circle"
                 custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
           </view>
           <view class="button" v-else>
             <u-button
-                @click="navTo('/pages/Order/detail?id='+item.id+'&type=detail')"
+                @click="navTo('/pages/Order/detail?house_order_id='+item.id+'&type=detail')"
                 text="租房详情"
                 shape="circle"
                 custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>