From 8f23d45dcd5551aab3504eff88e6e7a78d79acf2 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 17 Sep 2025 15:38:14 +0800
Subject: [PATCH] 1

---
 components/agreeAdress.vue        | 69 +++++++++++++++++++++++++++++++
 subPackages/techan/cartOrder.vue  | 16 ++++++-
 subPackages/techan/cartOrder1.vue | 15 ++++++-
 subPackages/techan/order.vue      | 16 ++++++-
 subPackages/user/travelerList.vue | 17 ++++++++
 5 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 components/agreeAdress.vue

diff --git a/components/agreeAdress.vue b/components/agreeAdress.vue
new file mode 100644
index 0000000..90551cb
--- /dev/null
+++ b/components/agreeAdress.vue
@@ -0,0 +1,69 @@
+<template>
+	<view>
+		<uni-popup ref="agreeAddress" type="bottom" :safe-area="false">
+			<view class="agreeAddress">
+				<view class="title">用户隐私保护提示</view>
+				<view>
+					在你使用 时味苏州 服务之前，请仔细阅读<navigator style="color: royalblue;display: inline;" url="/subPackages/user/privacyInfo?id=12">《时味苏州隐私政策》</navigator>，如你同意该指引，请点击“同意”开始使用本小程序。
+				</view>
+				
+				<view class="flex-between">
+					<view class="agree-btn" @click="submit(0)">拒绝</view>
+					<view class="agree-btn" style="color: white;background: #07c261;" @click="submit(1)">同意</view>
+				</view>
+				
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"agreeAdress",
+		data() {
+			return {
+				
+			};
+		},
+		methods:{
+			closePopup() {
+				this.$refs.agreeAddress.close()
+			},
+			openPop(){
+				this.$refs.agreeAddress.open()
+			},
+			submit(val){
+				uni.setStorageSync("agreeAddress",val)
+				this.$emit("submitAgreeAdress", val)
+				this.closePopup()
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.agreeAddress{
+	width: 100%;
+	height: 599.33rpx;
+	background: white;
+	padding: 80rpx 26rpx;
+	font-size: 28rpx;
+	border-radius: 20rpx 20rpx 0 0;
+	.title{
+		font-size: 32rpx;
+		font-weight: bold;
+		padding-bottom: 30rpx;
+	}
+	.flex-between{
+		padding: 100rpx 80rpx 0;
+		.agree-btn{
+			width: 250rpx;
+			height: 80rpx;
+			border-radius: 15rpx;
+			line-height: 80rpx;
+			text-align: center;
+			background: #f2f2f2;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/subPackages/techan/cartOrder.vue b/subPackages/techan/cartOrder.vue
index 5bd6c1b..7408480 100644
--- a/subPackages/techan/cartOrder.vue
+++ b/subPackages/techan/cartOrder.vue
@@ -209,13 +209,16 @@
 				</view>
 			</view>
 		</uni-popup>
+	
+		<agreeAdressVue ref="agreeAdressRef" @submitAgreeAdress="submitAgreeAdress"></agreeAdressVue>
 	</view>
 </template>
 
 <script>
+import agreeAdressVue from '../../components/agreeAdress.vue';
 import addressAddVue from '../../components/addressAdd.vue';
 export default {
-	components: {addressAddVue},
+	components: {addressAddVue,agreeAdressVue},
 	data() {
 		return {
 			// isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
@@ -267,8 +270,19 @@ export default {
 	onReady () {
 	},
 	methods: {
+		submitAgreeAdress (val) {
+			if (val) {
+				this.getWXAddress()
+			}
+		},
 		// 获取微信地址
 		getWXAddress () {
+			let agress = uni.getStorageSync("agreeAddress")
+			if (!agress) {
+				this.$refs.agreeAdressRef.openPop()
+				return
+			}
+			
 			let _this = this;
 			uni.chooseAddress({
 				success: (res) => {
diff --git a/subPackages/techan/cartOrder1.vue b/subPackages/techan/cartOrder1.vue
index 43d4783..4b3a96c 100644
--- a/subPackages/techan/cartOrder1.vue
+++ b/subPackages/techan/cartOrder1.vue
@@ -209,13 +209,15 @@
 				</view>
 			</view>
 		</uni-popup>
+		<agreeAdressVue ref="agreeAdressRef" @submitAgreeAdress="submitAgreeAdress"></agreeAdressVue>
 	</view>
 </template>
 
 <script>
+import agreeAdressVue from '../../components/agreeAdress.vue';
 import addressAddVue from '../../components/addressAdd.vue';
 export default {
-	components: {addressAddVue},
+	components: {addressAddVue,agreeAdressVue},
 	data() {
 		return {
 			// isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
@@ -267,8 +269,19 @@ export default {
 	onReady () {
 	},
 	methods: {
+		submitAgreeAdress (val) {
+			if (val) {
+				this.getWXAddress()
+			}
+		},
 		// 获取微信地址
 		getWXAddress () {
+			let agress = uni.getStorageSync("agreeAddress")
+			if (!agress) {
+				this.$refs.agreeAdressRef.openPop()
+				return
+			}
+			
 			let _this = this;
 			uni.chooseAddress({
 				success: (res) => {
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 88b08e2..481bf79 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -181,13 +181,16 @@
 				</view>
 			</view>
 		</uni-popup>
+		
+		<agreeAdressVue ref="agreeAdressRef" @submitAgreeAdress="submitAgreeAdress"></agreeAdressVue>
 	</view>
 </template>
 
 <script>
+import agreeAdressVue from '../../components/agreeAdress.vue';
 import addressAddVue from '../../components/addressAdd.vue';
 export default {
-	components: {addressAddVue},
+	components: {addressAddVue, agreeAdressVue},
 	data() {
 		return {
 			// isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
@@ -245,8 +248,19 @@ export default {
 		// })
 	},
 	methods: {
+		submitAgreeAdress (val) {
+			if (val) {
+				this.getWXAddress()
+			}
+		},
 		// 获取微信地址
 		getWXAddress () {
+			let agress = uni.getStorageSync("agreeAddress")
+			if (!agress) {
+				this.$refs.agreeAdressRef.openPop()
+				return
+			}
+			
 			let _this = this;
 			uni.chooseAddress({
 				success: (res) => {
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
index 2e36d27..d8abd31 100644
--- a/subPackages/user/travelerList.vue
+++ b/subPackages/user/travelerList.vue
@@ -105,12 +105,15 @@
 			<navigator v-else :url="'/subPackages/user/myContactsAdd'" class="btn">添加联系人</navigator>
 			
 		</view>
+		<agreeAdressVue ref="agreeAdressRef" @submitAgreeAdress="submitAgreeAdress"></agreeAdressVue>
 	</view>
 </template>
 
 <script>
+	import agreeAdressVue from '../../components/agreeAdress.vue';
 	export default {
 		name: "travelerList",
+		components: {agreeAdressVue},
 		data() {
 			return {
 				showType: 0,
@@ -199,14 +202,28 @@
 				});
 			},
 			
+			submitAgreeAdress (val) {
+				if (val) {
+					this.getWXAddress()
+				}
+			},
 			// 获取微信地址
 			getWXAddress () {
+				let agress = uni.getStorageSync("agreeAddress")
+				if (!agress) {
+					this.$refs.agreeAdressRef.openPop()
+					return
+				}
+				
 				let _this = this;
 				uni.chooseAddress({
 					success: (res) => {
 						_this.Post({...res,method:"POST"},'/api/uservice/user/addWxDefaultConsignee').then(()=>{
 							_this.init()
 						})
+					},
+					fail: (e) => {
+						console.log(e)
 					}
 				})
 			},