From 2ac4c3074997e8524aa9e6be463c110b139e9a6f Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 18:19:51 +0800
Subject: [PATCH] submit

---
 pages/contract/index.vue            | 1 -
 pages/mine/index.vue                | 4 ++--
 pages/order-goods/index.vue         | 8 +++++++-
 pages/order-goods/order-details.vue | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index 1839407..f49dce2 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -7,7 +7,6 @@
         </div>
       </template>-->
     </title-block>
-
     <div class="content2">
       <div class="wrap1">合同名称</div>
       <div class="wrap2">合同编号</div>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 16246d1..d4e47d3 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -3,12 +3,12 @@
   <div class="content1">
     <div class="wrap1">
       <div class="wrap1_1">{{orderTotal}}</div>
-      <div class="wrap1_2">当前订单总量</div>
+      <div class="wrap1_2">画作寄存量</div>
     </div>
     <div class="wrap2"></div>
     <div class="wrap3">
       <div class="wrap3_1">{{validContractDays}}</div>
-      <div class="wrap3_2">当前有效合同数</div>
+      <div class="wrap3_2">寄存即将到期画作</div>
     </div>
   </div>
   <div class="content2">
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 9ab6bee..a164255 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -49,7 +49,13 @@
             <div class="wrap1_2_1">{{ item.artworkName }}</div>
 <!--            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>-->
             <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
-            <div class="wrap1_2_4">{{ item.startAt }}-{{ item.endAt }}</div>
+            <div class="wrap1_2_4">
+              <div v-if="item.artworkStatus!==1">
+                {{ item.startAt ||''}}-{{ item.endAt||'' }}
+              </div>
+              <div v-else>{{item.cycleName}} </div>
+
+            </div>
           </div>
           <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
             <div class="wrap1_3_1" v-if="item.artworkStatus===4">
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue
index b712521..3ee96d0 100644
--- a/pages/order-goods/order-details.vue
+++ b/pages/order-goods/order-details.vue
@@ -80,7 +80,7 @@
         <div class="wrap1_1_3" >
           <div class="wrap1_1_3_1" style="position: absolute;display: flex;top: 50%;transform: translateY(-50%);">
             <div class="wrap1_1_3_1_1" style="width: 70rpx;color:#fff;height: 30rpx;background: #76C458;font-size: 16rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{info.cycleName}}</div>
-            <div class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${info.startAt}-${info.endAt}`}}</div>
+            <div v-if="info.artworkStatus!==1" class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${info.startAt || ''}-${info.endAt || ''}`}}</div>
           </div>
         </div>
         <div class="wrap1_1_4">