From 3d6ac6a40fb018c74699e25c115b105aa26351c7 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sun, 21 Jan 2024 21:38:22 +0800
Subject: [PATCH] 11111

---
 pages/good/shoppCart.vue  |  4 ++--
 pages/home/cloudCard2.vue | 11 ++++++-----
 pages/home/myHome.vue     |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
index 895cdcb..2336daf 100644
--- a/pages/good/shoppCart.vue
+++ b/pages/good/shoppCart.vue
@@ -107,7 +107,7 @@
 		<uni-popup ref="inputDialog" type="dialog">
 			<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
 				:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
-				content="1、20斤起订量。\n2、新用户正好20斤5折。\n3、20-100斤加10%附加额。\n4、101斤-200斤加5%附加额。"></uni-popup-dialog>
+				content="1、菜窖起订量为20斤，20-100斤需额外支付10%附加费用，101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
 		</uni-popup>
 
 	</view>
@@ -148,7 +148,7 @@
 			},
 
 			dialogInputConfirm() {
-				this.dialogBeforeClose = true
+				this.dialogBeforeClose = false
 			},
 			request() {
 				let _this = this
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index eeb13de..f3f91dc 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -139,7 +139,7 @@
 							<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop2()">
 								<text
 									style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
-									起订协议</text>
+									起订说明</text>
 								<text
 									style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
 									>></text>
@@ -187,9 +187,9 @@
 		</uni-popup>
 
 		<uni-popup ref="inputDialog2" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
+			<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
 				:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
-				content="1、20斤起订量。\n2、新用户正好20斤5折。\n3、20-100斤加10%附加额。\n4、101斤-200斤加5%附加额。"></uni-popup-dialog>
+				content="1、菜窖起订量为20斤，20-100斤需额外支付10%附加费用，101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
 		</uni-popup>
 
 	</view>
@@ -494,7 +494,8 @@
 			},
 
 			dialogInputConfirm2(val) {
-				this.dialogBeforeClose2 = true
+				console.log(">>>>>>>>>>>",this.dialogBeforeClose2);
+				this.dialogBeforeClose2 = false
 			},
 
 			saveGoods() {
@@ -623,7 +624,7 @@
 		display: flex;
 		flex-direction: row;
 		/* 这里注意，影响弹窗 */
-		height: calc(100vh - 140px - 50vw);
+		height: calc(100vh - 120px - 50vw);
 		background-color: #f7f7f7;
 		border-radius: 15px;
 		overflow: hidden;
diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue
index 9b96388..9770db1 100644
--- a/pages/home/myHome.vue
+++ b/pages/home/myHome.vue
@@ -10,7 +10,7 @@
 				<image class="head-img" :src="userInfo.photo"></image>
 				<view class="name-mob" style="flex: 1;">
 					<!-- 昵称 -->
-					<text @click="showDiaLog">{{userInfo.nick}}</text>
+					<text >{{userInfo.nick}}</text>
 					<!-- 手机 -->
 					<text style="font-size:14px;">{{userInfo.mobile}}</text>
 				</view>