From f4f62516fa9b0a7d14b0f395bc1cd240e8c28054 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 9 Oct 2023 14:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js            | 9 +++++++++
 pages/Order/detail.vue | 7 ++++---
 pages/User/order.vue   | 2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api/user.js b/api/user.js
index 559afc0..6c68ae6 100644
--- a/api/user.js
+++ b/api/user.js
@@ -126,6 +126,15 @@ export function submitHouseOrder(data) {
 		data
 	});
 }
+
+export function submitApplyHouseOrder(data) {
+
+	return request({
+		url: `${host}/user/houseorder-exchange`,
+		method: "post",
+		data
+	});
+}
 export function submitGoodsOrder(data) {
 
 	return request({
diff --git a/pages/Order/detail.vue b/pages/Order/detail.vue
index 142cee1..b77b6ff 100644
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@@ -270,6 +270,7 @@ export default {
       type:'create',
       model: {
         order: {
+          house_order_id:'',
           house_id: '',
           name: '',
           id_card: '',
@@ -359,7 +360,7 @@ export default {
     }
   },
   onLoad(option) {
-      this.model.order.house_id = option.id?option.id:'';
+      this.model.order.house_order_id  = option.id?option.id:'';
       this.model.order.rent = option.rent?parseFloat(option.rent)+'':'';
       this.type = option.type?option.type:'create';
   },
@@ -384,7 +385,7 @@ export default {
           let data = res.data;
           data.end_time = uni.$u.timeFormat(data.end_time,'yyyy-mm-dd')
           this.model = {order: data};
-          // this.model.order.house_id  = house_id;
+          this.model.order.house_order_id  = id;
           // this.model.order.month = ''+this.model.order.month;
           // this.model.order.month = parseInt(this.model.order.month);
 
@@ -584,7 +585,7 @@ export default {
       this.getUserExtend();
     }
     if(this.type === 'detail' || this.type === 'edit' || this.type === 'apply'){
-      this.getDetail(this.model.order.house_id);
+      this.getDetail(this.model.order.house_order_id );
     }
   }
 }
diff --git a/pages/User/order.vue b/pages/User/order.vue
index df6f2eb..1544d27 100644
--- a/pages/User/order.vue
+++ b/pages/User/order.vue
@@ -131,7 +131,7 @@
                 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">
+          <view class="button" v-else-if="item.status === 5 || item.status === 1">
             <u-button
                 @click="navTo('/pages/Order/detail?id='+item.id+'&type=apply')"
                 text="申请兑换"