From 54bc1d1ad15ecb049692e8fc9977155c9101cf1d Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 9 Oct 2023 10:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E5=B1=8B=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E6=9A=96=E6=96=B0=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/Order/detail.vue b/pages/Order/detail.vue
index aa125b8..65e08d6 100644
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@@ -190,8 +190,9 @@
               uploadIcon="plus"
               @afterRead="afterFileRead1"
               @delete="deleteFile1"
+              :disabled="type === 'detail'"
               :deletable="(type !== 'detail')"
-              :maxCount="1"
+              :maxCount="((type === 'create' || type === 'edit'|| type === 'apply')?999:fileList1.length)"
           ></u-upload>
         </u-form-item>
         <u-form-item
@@ -212,9 +213,9 @@
                   uploadIcon="plus"
                   @afterRead="afterFileRead2"
                   @delete="deleteFile2"
-                  :disabled="(type !== 'create')"
+                  :disabled="(type !== 'create' && type !== 'edit')"
                   :deletable="(type === 'create' || type === 'edit')"
-                  :maxCount="((type === 'create')?5:fileList2.length)"
+                  :maxCount="((type === 'create' || type === 'edit')?999:fileList2.length)"
               ></u-upload>
             </view>
           </view>
@@ -222,7 +223,7 @@
       </u-form>
     </u-col>
   </u-row>
-  <view class="foot-button border-box" v-if="(type === 'create' || type === 'edit')">
+  <view class="foot-button border-box" v-if="(type === 'create' || type === 'edit' || type === 'apply')">
     <u-button
         type="primary"
         text="我要兑换"
@@ -380,7 +381,9 @@ export default {
     getDetail(id){
         // let house_id = this.model.order.house_id;
         houseOrderDetail({house_order_id : id}).then(res => {
-          this.model = {order: res.data};
+          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.month = ''+this.model.order.month;
           // this.model.order.month = parseInt(this.model.order.month);
@@ -396,7 +399,7 @@ export default {
       this.fileList1.forEach(item => {
         file1.push(item.url)
       });
-      this.model.order.payment_voucher = file1.join();
+      this.model.order.payment_voucher = file1;
       let file2 = [];
       this.fileList2.forEach(item => {
         file2.push(item.url)
@@ -423,8 +426,7 @@ export default {
       }
       this.$refs.orderForm.validateField(checkedField,(errors) => {
         if(errors.length) {
-          // 如果错误提示方式为toast，则进行提示
-          this.errorType === 'toast' && uni.$u.toast(errors[0].message)
+          uni.$u.toast(errors[0].message)
           return;
         } else {
           submitHouseOrder(this.model.order).then(res => {
@@ -551,7 +553,7 @@ export default {
     if(token && this.type === 'create'){
       this.getUserExtend();
     }
-    if(this.type === 'detail' || this.type === 'edit'){
+    if(this.type === 'detail' || this.type === 'edit' || this.type === 'apply'){
       this.getDetail(this.model.order.house_id);
     }
   }
diff --git a/pages/User/order.vue b/pages/User/order.vue
index a2aa496..df6f2eb 100644
--- a/pages/User/order.vue
+++ b/pages/User/order.vue
@@ -327,8 +327,10 @@ export default {
     },
     getGyStatus(status){
       switch(status){
+        case 0:
+          return {name:'租赁审核中',color:'orange'}
         case 1:
-          return {name:'中途退租',color:'orange'}
+          return {name:'中途退租',color:'red'}
         case 2:
           return {name:'租赁中',color:'blue'}
         case 3:
@@ -339,6 +341,8 @@ export default {
           return {name:'待兑换',color:'orange'}
         case 6:
           return {name:'已兑换',color:'green'}
+        case 7:
+          return {name:'退租兑换审核中',color:'orange'}
         default:
           return {name:'未知',color:'red'}
       }