日期问题修改
This commit is contained in:
		
							parent
							
								
									a2615e8914
								
							
						
					
					
						commit
						7a98ad2bd3
					
				@ -15,7 +15,7 @@ const variable = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    name: "", //应用名字
 | 
					    name: "", //应用名字
 | 
				
			||||||
    whatType: type, //判断当前是哪端
 | 
					    whatType: type, //判断当前是哪端
 | 
				
			||||||
	// baseUrl: "http://jiaxingtest.a1.luyouxia.net:25762", //本地测试接口的基础路径
 | 
						// baseUrl: "http://jiaxingtest.a1.luyouxia.net:19159", //本地测试接口的基础路径
 | 
				
			||||||
		baseUrl: "https://api.lihe-control.com", //线上接口的基础路径
 | 
							baseUrl: "https://api.lihe-control.com", //线上接口的基础路径
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 | 
				
			|||||||
@ -94,7 +94,9 @@
 | 
				
			|||||||
							<text>{{item0.deviceTypeName}}</text>
 | 
												<text>{{item0.deviceTypeName}}</text>
 | 
				
			||||||
						</view>
 | 
											</view>
 | 
				
			||||||
						<view class="iccid"  v-if="validateIccid(item0.iccidcode)">卡号:{{item0.iccidcode}}<br>
 | 
											<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>
 | 
				
			||||||
					<view class="detail">
 | 
										<view class="detail">
 | 
				
			||||||
						<view class="item" v-for="item,index in item0.equipmentName20ListChild" :key="index"
 | 
											<view class="item" v-for="item,index in item0.equipmentName20ListChild" :key="index"
 | 
				
			||||||
@ -126,7 +128,10 @@
 | 
				
			|||||||
						<text>{{ item1.deviceTypeName }}</text>
 | 
											<text>{{ item1.deviceTypeName }}</text>
 | 
				
			||||||
					</view>
 | 
										</view>
 | 
				
			||||||
						<view  class="iccid" v-if="validateIccid(item1.iccidcode)">卡号:{{item1.iccidcode}}<br> 
 | 
											<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>
 | 
				
			||||||
				<view class="detail">
 | 
									<view class="detail">
 | 
				
			||||||
					<view class="item" v-for="(item2,index2) in item1.childList_mubiao" :key="index2"
 | 
										<view class="item" v-for="(item2,index2) in item1.childList_mubiao" :key="index2"
 | 
				
			||||||
@ -384,7 +389,11 @@
 | 
				
			|||||||
							<text>{{item0.deviceTypeName}}</text>
 | 
												<text>{{item0.deviceTypeName}}</text>
 | 
				
			||||||
						</view>
 | 
											</view>
 | 
				
			||||||
						<view class="iccid" v-if="validateIccid(item0.iccidcode)">卡号:{{item0.iccidcode}}<br> 
 | 
											<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>
 | 
				
			||||||
					<view class="detail">
 | 
										<view class="detail">
 | 
				
			||||||
						<view class="item" v-for="item,index in item0.equipmentName40ListChild" :key="index"
 | 
											<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){
 | 
								  getPackageTime(iccidcode){
 | 
				
			||||||
			           var item= this.iccidList.find(item=>item?.iccid==iccidcode)
 | 
								           var item= this.iccidList.find(item=>item?.iccid==iccidcode)
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
@ -865,7 +883,6 @@
 | 
				
			|||||||
			        },
 | 
								        },
 | 
				
			||||||
			         getPackageTimeColor(iccidcode){
 | 
								         getPackageTimeColor(iccidcode){
 | 
				
			||||||
			           var item= this.iccidList.find(item=> item?.iccid==iccidcode)
 | 
								           var item= this.iccidList.find(item=> item?.iccid==iccidcode)
 | 
				
			||||||
			
 | 
					 | 
				
			||||||
			          return item? item.expired:false
 | 
								          return item? item.expired:false
 | 
				
			||||||
			        },
 | 
								        },
 | 
				
			||||||
			// 跳转到折线图
 | 
								// 跳转到折线图
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user