From 093f7b10f698919f5c7d333ab8e981a585a1b975 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sun, 21 Jan 2024 23:15:31 +0800
Subject: [PATCH] 1111111111

---
 components/NavBar/NavBar.vue | 2 +-
 pages/good/reservation.vue   | 2 ++
 pages/good/shoppCart.vue     | 6 +++---
 pages/home/cloudCard2.vue    | 2 +-
 pages/home/myCellar.vue      | 6 +++---
 pages/login/login.vue        | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/components/NavBar/NavBar.vue b/components/NavBar/NavBar.vue
index f60859a..0b00cda 100644
--- a/components/NavBar/NavBar.vue
+++ b/components/NavBar/NavBar.vue
@@ -174,7 +174,7 @@
 					return;
 				}else{
 					uni.switchTab({
-						url: '/pages/home/pickUpCard'
+						url: '/pages/home/myCellar'
 					})
 				}
 					
diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue
index f4faa77..d967570 100644
--- a/pages/good/reservation.vue
+++ b/pages/good/reservation.vue
@@ -219,6 +219,8 @@
 
 			this.pickingUpGoods = JSON.parse(options.pickingUpGoods)
 			this.affiliation = options.affiliation
+			
+			console.log(">>>>>",options);
 
 		},
 		onUnload() {
diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
index 3e84762..6337a94 100644
--- a/pages/good/shoppCart.vue
+++ b/pages/good/shoppCart.vue
@@ -74,7 +74,7 @@
 					<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop()">
 						<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>
 					</view>
@@ -105,9 +105,9 @@
 		</loading-state>
 
 		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
+			<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
 				:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
-				content="1、菜窖起订量为20斤，20-100斤需额外支付10%附加费用，101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
+				content="菜窖起订量为20斤，\n\n20-100斤需额外支付10%附加费用，\n\n101斤-200斤需额外支付5%附加费用，\n\n200斤以上无附加费。"></uni-popup-dialog>
 		</uni-popup>
 
 	</view>
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index da034f9..bdd82bc 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -188,7 +188,7 @@
 		<uni-popup ref="inputDialog2" type="dialog">
 			<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
 				:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
-				content="1、菜窖起订量为20斤，20-100斤需额外支付10%附加费用，101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
+				content="菜窖起订量为20斤，\n\n20-100斤需额外支付10%附加费用，\n\n101斤-200斤需额外支付5%附加费用，\n\n200斤以上无附加费。"></uni-popup-dialog>
 		</uni-popup>
 
 	</view>
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 6389992..6a804e2 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -18,8 +18,8 @@
 				<view class="center">
 
 					<view style="width: 22%;display: flex;flex-direction: column;overflow-y: auto;padding-top: 10px;">
-						<text style="width: 100%;text-align: center;margin-bottom: 5px;margin-top: 5px;
-						color: #333;font-weight: 600;font-size: 13px;">全部分类</text>
+						<!-- <text style="width: 100%;text-align: center;margin-bottom: 5px;margin-top: 5px;
+						color: #333;font-weight: 600;font-size: 13px;">全部分类</text> -->
 						<view style="width: 100%;display: flex;flex-direction: column; ">
 							<view v-for="(item,index) in data" @click="labelClick(index,item)"
 								style="display: flex;flex-direction: column;justify-content: center;position: relative;">
@@ -531,7 +531,7 @@
 
 					uni.navigateTo({
 						url: '/pages/good/reservation?pickingUpGoods=' + JSON.stringify(this.pickingUpGoods) +
-							"&affiliation=" + this.brandType,
+							"&affiliation=" + this.data[this.selectIndex].id,
 					})
 
 					// this.showModal = true
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0e1aaa7..58014c1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -127,7 +127,7 @@
 													showCancel: false,
 													success: function(res) {
 														uni.switchTab({
-															url: '/pages/home/pickUpCard'
+															url: '/pages/home/myCellar'
 														})
 													}
 												});