From c003de83bdf4e4c1d21520c482138d4a1af8f74d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 30 Dec 2024 17:25:02 +0800
Subject: [PATCH] up

---
 packages/change/change.vue | 88 +++++++++++++++++++++++++++++++++++++-
 packages/order/order.vue   |  3 --
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/packages/change/change.vue b/packages/change/change.vue
index d2beee8..2ae06d9 100644
--- a/packages/change/change.vue
+++ b/packages/change/change.vue
@@ -24,6 +24,18 @@
 				</u-form>
 				<u-button class="formitem submitform" form-type="submit" :plain="true" @click="goSubmit">点击提货</u-button>
 			</view>
+		</view>
+		
+		<view class="agreeinfo" v-if="showCloseTips">
+			<view class="agreeinfo-wrap">
+				<view class="agreeinfo-title">温馨提示</view>
+				<view class="agreeinfo-content">
+					<view v-html="closeTips"></view>
+				</view>
+				<view class="agreeinfo-btn">
+					<view @click="showCloseTips = false" class="canAgree">我已知晓</view>
+				</view>
+			</view>
 		</view>
 	</view>
 
@@ -55,6 +67,8 @@
 					}]
 				},
 				dateFalse:'',
+				closeTips:'', // 
+				showCloseTips:false,
 				showHelp:false,
 				openDate:'',
 				endDate:''
@@ -66,6 +80,26 @@
 				if(item.key==='dateFalse'){
 					this.dateFalse = item.value
 				}
+				if(item.key==='closeTips'){
+					if(!isNull(item.value)){
+						this.closeTips = item.value
+					}
+				}
+				if(item.key==='showCloseTimes'){
+					if(!isNull(item.value)){
+						let now = this.$moment().format('YYYY-MM-DD HH:MM:SS')
+						// let closeTime = this.$moment(item.value).format('YYYY-MM-DD HH:MM:SS')
+						console.log(now,item.value,this.$moment(now).isAfter(item.value))
+						if(this.$moment(now).isAfter(item.value)){
+							this.showCloseTips = true
+						}else{
+							this.showCloseTips = false
+						}
+					}
+				}else{
+					this.showCloseTips = false
+				}
+				
 			})
 		},
 		methods: {
@@ -126,7 +160,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.changecontainer {
 		width: 100%;
 		background-image: url(../../static/bg-change.jpg);
@@ -212,7 +246,57 @@
 		width: 68.7%;
 		margin: 0 auto;
 	}
-
+	.agreeinfo {
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, 0.7);
+		display: flex;
+		align-items: center;
+		width: 100vw;
+		height: 100vh;
+		z-index: 999;
+		padding: 0 50rpx;
+	
+		&-wrap {
+			background: #fff;
+			padding: 60rpx 40rpx;
+			border-radius: 20rpx;
+		}
+	
+		&-title {
+			font-size: 32rpx;
+			margin-bottom: 30rpx;
+			color: #b62828;
+			text-align: center;
+		}
+	
+		&-content {
+			line-height: 1.8;
+			font-size: 30rpx;
+			height: 450rpx;
+			overflow: scroll;
+		}
+	
+		&-btn {
+	
+			>view {
+				background-color: rgba(0, 0, 0, 0.5);
+				color: #fff;
+				border-radius: 40rpx;
+				width: 60%;
+				margin: 0 auto;
+				height: 75rpx;
+				text-align: center;
+				line-height: 75rpx;
+				margin: 20rpx auto;
+			}
+	
+			.canAgree {
+				background-color: #ba8b45;
+			}
+		}
+	}
 	/deep/ .u-form-item {
 		margin-bottom: 40rpx;
 		height: 74rpx;
diff --git a/packages/order/order.vue b/packages/order/order.vue
index 711d9e4..b98867a 100644
--- a/packages/order/order.vue
+++ b/packages/order/order.vue
@@ -818,7 +818,6 @@
 									setTimeout(function() {
 										that.saveDefalutAddress()
 									}, 500)
-
 								})
 
 							}).catch(res => {
@@ -840,9 +839,7 @@
 									setTimeout(function() {
 										that.saveDefalutAddress()
 									}, 500)
-
 								})
-
 							}).catch(res => {
 								this.isLocked = false
 								console.log('res1', res)