From 2600e173389a5ddc421c5ed4278c9e4885682987 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 22 Jan 2024 00:42:16 +0800
Subject: [PATCH] 111111111

---
 pages/bind/bind_cloudCard.vue   |  2 +-
 pages/bind/bind_pickUpCard.vue  |  2 +-
 pages/bind/bind_pickUpCard2.vue | 21 ++++++++++++---------
 pages/home/myCellar.vue         |  3 ++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue
index c32cf2f..9c01296 100644
--- a/pages/bind/bind_cloudCard.vue
+++ b/pages/bind/bind_cloudCard.vue
@@ -136,7 +136,7 @@
 				console.log("params+++++++++++++++", params);
 
 				_this.$api.receiveTransferGoods(params).then((resp) => {
-					bus.$emit('order', "监听回调");
+					// bus.$emit('order', "监听回调");
 					// setTimeout(() => {
 					// 	uni.$emit('order', "监听回调")
 					// }, 500)
diff --git a/pages/bind/bind_pickUpCard.vue b/pages/bind/bind_pickUpCard.vue
index 0cf1b9c..e73f872 100644
--- a/pages/bind/bind_pickUpCard.vue
+++ b/pages/bind/bind_pickUpCard.vue
@@ -128,7 +128,7 @@
 				// }
 				let _this = this
 				_this.$api.bindAllCard(this.page).then((resp) => {
-					bus.$emit('order', "监听回调");
+					// bus.$emit('order', "监听回调");
 					// setTimeout(() => {
 					// 	uni.$emit('order', "监听回调")
 					// }, 500)
diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue
index 3633ca4..0d8d89e 100644
--- a/pages/bind/bind_pickUpCard2.vue
+++ b/pages/bind/bind_pickUpCard2.vue
@@ -55,17 +55,17 @@
 				<input maxlength="20" placeholder="请输入/扫码"
 					style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number"
 					:value="page.code" @input="onKeyInput1" />
-				<!-- <view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view>
+				<view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view>
 				<uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;"
-					@click="scan" /> -->
+					@click="scan" />
 			</view>
-			<!-- <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text>
+			<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text>
 			<view style="display: flex;flex-direction: row;justify-content: space-between;
 				 background: #F8F8F8;border-radius: 5px; padding:10px 0px;
 				 box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;">
 				<input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;"
 					type="number" :value="page.codeKey" @input="onKeyInput2" />
-			</view> -->
+			</view>
 
 			<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; 
 				width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;
@@ -178,13 +178,16 @@
 					this.shortToast('请输入20位提货编码')
 					return
 				}
-				// if (this.stringIsEmpty(this.page.codeKey) || this.page.codeKey.length != 6) {
-				// 	this.shortToast('请输入6位提货密码')
-				// 	return
-				// }
+				if (this.stringIsEmpty(this.page.codeKey) || this.page.codeKey.length != 6) {
+					this.shortToast('请输入6位提货密码')
+					return
+				}
 				let _this = this
+				
+				console.log("+++++++++++",this.page);
+				
 				_this.$api.bindAllCard(this.page).then((resp) => {
-					bus.$emit('order', "监听回调");
+					// bus.$emit('order', "监听回调");
 					uni.switchTab({
 							url: '/pages/home/myCellar'
 					})
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 6a804e2..828eb3d 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -431,8 +431,8 @@
 					_this.data = resp
 					_this.pickingUpGoods = []
 					_this.baseDataSuccess = true
-					_this.getgoods()
 					_this.selectIndex = 0
+					_this.getgoods()
 				}).catch(e => {
 					_this.$nextTick(() => {
 						_this.$refs.pageView.setLoadState(1)
@@ -447,6 +447,7 @@
 					affiliation: this.data[this.selectIndex].id
 				}
 
+
 				_this.$api.vegeCellarList(params).then((resp) => {
 					_this.goods = resp