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 @@ {{item0.deviceTypeName}} 卡号:{{item0.iccidcode}}
- 到期时间:{{getPackageTime(item0.iccidcode)}}(即将到期)
+ {{ item1.deviceTypeName }} 卡号:{{item1.iccidcode}}
- 到期时间:{{getPackageTime(item1.iccidcode)}}(即将到期)
+ +
{{item0.deviceTypeName}} 卡号:{{item0.iccidcode}}
- 到期时间:{{getPackageTime(item0.iccidcode)}}(即将到期)
+ + +
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 }, // 跳转到折线图