From 7a98ad2bd389eca4bf0a3e51e7b7becb816577b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Fri, 11 Jul 2025 17:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/commonVariable.js                     |  2 +-
 pages/timeEnvironment/timeEnvironment.vue | 25 +++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/api/commonVariable.js b/api/commonVariable.js
index 41f43c11..aec16a73 100644
--- a/api/commonVariable.js
+++ b/api/commonVariable.js
@@ -15,7 +15,7 @@ const variable = {
 
     name: "", //应用名字
     whatType: type, //判断当前是哪端
-	// baseUrl: "http://jiaxingtest.a1.luyouxia.net:25762", //本地测试接口的基础路径
+	// baseUrl: "http://jiaxingtest.a1.luyouxia.net:19159", //本地测试接口的基础路径
 		baseUrl: "https://api.lihe-control.com", //线上接口的基础路径
 	
 	
diff --git a/pages/timeEnvironment/timeEnvironment.vue b/pages/timeEnvironment/timeEnvironment.vue
index 2f786c8e..79f2068f 100644
--- a/pages/timeEnvironment/timeEnvironment.vue
+++ b/pages/timeEnvironment/timeEnvironment.vue
@@ -94,7 +94,9 @@
 							<text>{{item0.deviceTypeName}}</text>
 						</view>
 						<view class="iccid"  v-if="validateIccid(item0.iccidcode)">卡号:{{item0.iccidcode}}<br>
-						到期时间:<text :class="getPackageTimeColor(item0.iccidcode)?'color-red':''">{{getPackageTime(item0.iccidcode)}}<text v-if="getPackageTimeColor(item0.iccidcode)">(即将到期)</text></text></view>
+					 <template v-if="getPackageTimeColor(item0.iccidcode)">
+					 	到期时间:<text :class="getPackageTimeColor(item0.iccidcode)?'color-red':''">{{getPackageTime(item0.iccidcode)}}<text v-if="getPackageTimeColor(item0.iccidcode)">({{getTimeTips(item0.iccidcode)}})</text></text>
+					 </template>	</view>
 					</view>
 					<view class="detail">
 						<view class="item" v-for="item,index in item0.equipmentName20ListChild" :key="index"
@@ -126,7 +128,10 @@
 						<text>{{ item1.deviceTypeName }}</text>
 					</view>
 						<view  class="iccid" v-if="validateIccid(item1.iccidcode)">卡号:{{item1.iccidcode}}<br> 
-						到期时间:<text :class="getPackageTimeColor(item1.iccidcode)?'color-red':''">{{getPackageTime(item1.iccidcode)}}<text v-if="getPackageTimeColor(item1.iccidcode)">(即将到期)</text></text></view>
+						<template v-if="getPackageTimeColor(item1.iccidcode)">
+						到期时间:<text :class="getPackageTimeColor(item1.iccidcode)?'color-red':''">{{getPackageTime(item1.iccidcode)}}<text v-if="getPackageTimeColor(item1.iccidcode)">({{getTimeTips(item1.iccidcode)}})</text></text>
+						</template>
+						</view>
 				</view>
 				<view class="detail">
 					<view class="item" v-for="(item2,index2) in item1.childList_mubiao" :key="index2"
@@ -384,7 +389,11 @@
 							<text>{{item0.deviceTypeName}}</text>
 						</view>
 						<view class="iccid" v-if="validateIccid(item0.iccidcode)">卡号:{{item0.iccidcode}}<br> 
-						到期时间:<text :class="getPackageTimeColor(item0.iccidcode)?'color-red':''">{{getPackageTime(item0.iccidcode)}}<text v-if="getPackageTimeColor(item0.iccidcode)">(即将到期)</text></text></view>
+						<template v-if="getPackageTimeColor(item0.iccidcode)">
+						到期时间:<text :class="getPackageTimeColor(item0.iccidcode)?'color-red':''">{{getPackageTime(item0.iccidcode)}}<text v-if="getPackageTimeColor(item0.iccidcode)">({{getTimeTips(item0.iccidcode)}})</text></text>
+						</template>
+						
+						</view>
 					</view>
 					<view class="detail">
 						<view class="item" v-for="item,index in item0.equipmentName40ListChild" :key="index"
@@ -858,6 +867,15 @@
 			  })
 			
 			},
+			  getTimeTips(iccidcode){
+					var item= this.iccidList.find(item=>item?.iccid==iccidcode)
+			    if(item){
+					const currentDate = new Date()
+					const packageDate = new Date(item.packageTime)
+					
+					return currentDate > packageDate ? '已过期'  : '即将到期'
+				}
+			        },
 			  getPackageTime(iccidcode){
 			           var item= this.iccidList.find(item=>item?.iccid==iccidcode)
 			
@@ -865,7 +883,6 @@
 			        },
 			         getPackageTimeColor(iccidcode){
 			           var item= this.iccidList.find(item=> item?.iccid==iccidcode)
-			
 			          return item? item.expired:false
 			        },
 			// 跳转到折线图