'最后的一点优化'

pages/index/home.vue

@@ -50,8 +50,14 @@
           <view class="content-row">
             <text class="label">下次保养日期</text>
             <text class="value">{{ item.maintenanceDate }}</text>
-            <view v-if="item.maintenanceProject" class="project">
-              {{ item.maintenanceProject }}
+            <view v-if="$utils.calculateDateDifference(item.maintenanceDate) > 0 && $utils.calculateDateDifference(item.maintenanceDate) <= 3" class="project">
+              {{ $utils.calculateDateDifference(item.maintenanceDate) + '天后维保' }}
+            </view>
+            <view v-else-if="$utils.calculateDateDifference(item.maintenanceDate) === -1" class="project">
+              已超出维保时间
+            </view>
+            <view v-else-if="!$utils.calculateDateDifference(item.maintenanceDate)" class="project">
+              当天维修
             </view>
           </view>
         </view>
@@ -194,6 +200,7 @@ export default {
   },
   onLoad(){
     this.getBannerList()
+    
   },
 }
 </script>

subPages/home/RAArecord.vue

@@ -92,7 +92,7 @@
               <text class="label">上传图片</text>
             </view>
             
-            <view class="image-container" v-if="!collapsedStates[index]">
+            <view class="image-container" v-if="!collapsedStates[index] && record.image">
               <image class="uploaded-image" v-for="(value, index) in record.image.split(',')" :key="index" :src="value" mode="aspectFill"></image>
             </view>
             
@@ -126,7 +126,7 @@
             </view>
             
             <!-- 保养前图片 -->
-            <view class="image-container" v-if="!collapsedStates[index]">
+            <view class="image-container" v-if="!collapsedStates[index] && record.stateFrontImage">
               <image 
                 class="uploaded-image" 
                 v-for="(img, imgIndex) in record.stateFrontImage.split(',')" 
@@ -146,7 +146,7 @@
             </view>
             
             <!-- 保养后图片 -->
-            <view class="image-container" v-if="!collapsedStates[index]">
+            <view class="image-container" v-if="!collapsedStates[index] && record.stateBackImage">
               <image 
                 class="uploaded-image" 
                 v-for="(img, imgIndex) in record.stateBackImage.split(',')" 
@@ -170,7 +170,7 @@
           </view>
           
           <!-- 费用详情表格 -->
-          <view class="cost-table" v-if="!collapsedStates[index]">
+          <view class="cost-table" v-if="!collapsedStates[index] && record.exhibitMaintenanceExpenses.length">
             <view class="table-header">
               <text class="header-cell">费用名称</text>
               <text class="header-cell">数量</text>
@@ -221,7 +221,7 @@
             </view>
             
             <!-- 附件图片 -->
-            <view class="image-container" v-if="!collapsedStates[index]">
+            <view class="image-container" v-if="!collapsedStates[index] && record.remarkImage">
               <image class="uploaded-image" v-for="(value, index) in record.remarkImage.split(',')" :src="value" :key="index" mode="aspectFill"></image>
             </view>
             
@@ -242,12 +242,16 @@
             <text class="collapse-icon">{{ collapsedStates[index] ? '▼' : '▲' }}</text>
           </view>
         </view>
-        <uv-loading-icon v-if="loading"></uv-loading-icon>
+        <view v-if="isLoading" style="padding:400rpx 0; ">
+          <uv-loading-icon  text="正在加载中 先喝杯茶吧"></uv-loading-icon>
+        </view>
       </view>
-      <view v-else-if="!loading && !records.length ">
+      <view v-else-if="!isLoading && !list.length ">
         <uv-empty  icon="/static/暂无搜索结果.png" />
       </view>
-      <uv-loading-icon v-else></uv-loading-icon>
+      <view v-else  style="padding:400rpx 0; ">
+        <uv-loading-icon text="正在加载中 先喝杯茶吧"></uv-loading-icon>
+      </view>
     </view>
   </view>
 </template>
@@ -265,7 +269,8 @@ export default {
       activeFilter: 0, // 当前激活的筛选器
       collapsedStates: [], // 控制每个记录项的展开/收起状态
       afterUpdateDataFn(list) {
-        this.collapsedStates = new Array(list.length).fill(true)
+        // 改为新增加的数组部分 为true 原来的 状态保留
+        this.collapsedStates.push(...new Array(8).fill(true))
       },
       filterOptions: [
         { name: '时间' },
@@ -315,6 +320,7 @@ export default {
       this.mixinListApi = this.activeMainTab === 'repair' ? 'exhibit.queryRepairList' : 'exhibit.queryMaintenanceList'
       this.onFilterChange()
       this.initPage()
+      this.list = []
       this.getList(true)
       // this.initCollapsedStates()
     },

subPages/home/maintainanceSubmit.vue

@@ -458,7 +458,9 @@ export default {
         remark: this.remark,
         showpieceId: this.showpieceId
       }
-      
+      if (formData.isExpend === '0'){
+        delete formData.expenseList
+      }
       
       this.submiting = true
       try{
@@ -481,6 +483,8 @@ export default {
   },
   onLoad(options) {
     this.showpieceId = options.id
+    
+    
   }
 }
 </script>

subPages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login-container">
 		<!-- 背景图 -->
-		<image class="bg-image" src="@/subPages/static/登录_背景图.png" mode="aspectFill"></image>
+		<image class="bg-image" src="@/subPages/static/登录背景.png" mode="aspectFill"></image>
 		
 		<!-- 主要内容 -->
 		<view class="content">
@@ -152,7 +152,7 @@ export default {
 		top: 0;
 		left: 0;
 		width: 100%;
-		height: 100%;
+		height: 33%;
 		z-index: 1;
 	}
 	

subPages/repair/maintainSubmit.vue

@@ -540,7 +540,7 @@ export default {
         delete tempData.expenseList
       }
       const submitRes = await this.$api.exhibit.addRepair({
-        id: this.showpieceId,
+        showpieceId: this.showpieceId,
         ...tempData,
         amount: this.amount
       })

utils/common.js

@@ -54,6 +54,8 @@ const checkPhone = (phone) => {
 }
 
 // 转换时间戳为yyyy-mm-dd
+// params： 时间戳
+// return yyyy-mmm-dd
 const formatTime = (time) => {
   if (!time) {
     return '时间格式错误，需要传入时间戳'
@@ -65,9 +67,36 @@ const formatTime = (time) => {
   return `${year}-${month}-${day}`
 }
 
+// 计算yyyy-mm-dd与当前时间的差值
+// params： yyyy-mm-dd格式的字符串
+// return： 差值（天）
+const calculateDateDifference = (dateString) => {
+  if (!dateString) {
+    return '时间格式错误，需要传入yyyy-mm-dd格式的字符串'
+  }
+  // 传入值为yyyy-mm-dd格式的字符串
+  const inputDate = new Date(dateString)
+  // 化为时间戳
+  // const inputTime = inputDate.getTime()
+  const currentDate = new Date()
+  const timeDifference = inputDate - currentDate  
+  
+  if (!(currentDate.setHours(0, 0, 0, 0) - inputDate.setHours(0, 0, 0, 0))) {
+    return 0
+  }
+  // 如果为负 返回-1
+  if (timeDifference < 0) {
+    return -1
+  }
+  // 计算天数
+  const dayDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24))
+  
+  return dayDifference
+}
 
 export {
   authorize,
   checkPhone,
-  formatTime
+  formatTime,
+  calculateDateDifference
 }

utils/index.js

@@ -1,7 +1,8 @@
 import {
   authorize,
   checkPhone,
-  formatTime
+  formatTime,
+  calculateDateDifference
 } from '@/utils/common'
 
 import {
@@ -14,6 +15,7 @@ export default {
   authorize,
   checkPhone,
   formatTime,
+  calculateDateDifference,
   uploadImage,
   chooseAndUpload,
   getFileExtension