From 0a8d7e200a433308e0baeb6d467f46239ba2a6e2 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sun, 21 Jan 2024 20:06:09 +0800
Subject: [PATCH] 2222

---
 common/request.api.js           |  2 ++
 pages/bind/bind_pickUpCard.vue  | 12 ++++++------
 pages/bind/bind_pickUpCard2.vue | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/common/request.api.js b/common/request.api.js
index b3c5a64..7723518 100644
--- a/common/request.api.js
+++ b/common/request.api.js
@@ -128,6 +128,8 @@ export default {
 	transSubmission: (params = {}) => request.post("/transferrecords/submission", params),
 	// 我的菜窖 领取/绑定转赠菜窖	
 	receiveTransferGoods: (params = {}) => request.post("/vegetablecellar/receiveTransferGoods", params),
+	// 我的菜窖 绑定之前发出的礼品卡
+	bindAllCard: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params),
 	// 我的菜窖 预约提菜
 	getStoreBySid: (params = {}) => request.get("/customerstore/getStoreBySid/" + params, params),
 	// 我的菜窖 预约提菜 选择时间范围
diff --git a/pages/bind/bind_pickUpCard.vue b/pages/bind/bind_pickUpCard.vue
index c12a6ab..0cf1b9c 100644
--- a/pages/bind/bind_pickUpCard.vue
+++ b/pages/bind/bind_pickUpCard.vue
@@ -118,16 +118,16 @@
 			},
 			save() {
 				if (this.stringIsEmpty(this.page.code) || this.page.code.length != 20) {
-					this.shortToast('请输入或扫描20位提货编码')
+					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
-				_this.$api.pickUpCardBind(this.page).then((resp) => {
+				_this.$api.bindAllCard(this.page).then((resp) => {
 					bus.$emit('order', "监听回调");
 					// setTimeout(() => {
 					// 	uni.$emit('order', "监听回调")
diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue
index 04f9fe9..3633ca4 100644
--- a/pages/bind/bind_pickUpCard2.vue
+++ b/pages/bind/bind_pickUpCard2.vue
@@ -175,15 +175,15 @@
 			},
 			save() {
 				if (this.stringIsEmpty(this.page.code) || this.page.code.length != 20) {
-					this.shortToast('请输入或扫描20位提货编码')
-					return
-				}
-				if (this.stringIsEmpty(this.page.codeKey) || this.page.codeKey.length != 6) {
-					this.shortToast('请输入6位提货密码')
+					this.shortToast('请输入20位提货编码')
 					return
 				}
+				// if (this.stringIsEmpty(this.page.codeKey) || this.page.codeKey.length != 6) {
+				// 	this.shortToast('请输入6位提货密码')
+				// 	return
+				// }
 				let _this = this
-				_this.$api.pickUpCardBind(this.page).then((resp) => {
+				_this.$api.bindAllCard(this.page).then((resp) => {
 					bus.$emit('order', "监听回调");
 					uni.switchTab({
 							url: '/pages/home/myCellar'