From 82f985cb4783fbc31d81df116c1e579db033cfe3 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 24 Jul 2024 03:21:55 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=8824=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/public/login.vue    | 5 ++++-
 pages/public/register.vue | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pages/public/login.vue b/pages/public/login.vue
index f4df2dc..dcd2b8e 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -91,13 +91,16 @@
 				weixinPhone: false,
 				sendDataList: {},
 				sessionkey: '',
-				phoneNum: false
+				phoneNum: false,
 			};
 		},
 		onLoad(e) {
 			if (e.inviterCode) {
 				this.$queue.setData('inviterCode', e.inviterCode);
 			}
+			if (e.bindingConsortiaId) {
+				this.$queue.setData('bindingConsortiaId', e.bindingConsortiaId);
+			}
 			this.$Request.get('/app/common/type/237').then(res => {
 				if (res.code == 0) {
 					if (res.data && res.data.value && res.data.value == '是') {
diff --git a/pages/public/register.vue b/pages/public/register.vue
index e2126e0..773c2ed 100644
--- a/pages/public/register.vue
+++ b/pages/public/register.vue
@@ -33,6 +33,11 @@
 					<input type="" maxlength="6" :value="invitation" placeholder="请填写邀请码(选填)" data-key="invitation"
 						@input="inputChange" @confirm="toLogin" />
 				</view>
+				<view hidden class="cu-form-group" style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">绑定商家ID</text>
+					<input type="" disabled maxlength="6" :value="bindingConsortiaId" placeholder="绑定商家" data-key="bindingConsortiaId" @input="inputChange" @confirm="toLogin" />
+				</view>
+
 			</view>
 			<button class="confirm-btn" @click="toLogin">立即注册</button>
 			<view class="footer">
@@ -65,10 +70,11 @@
 				invitation: '',
 				platform: '',
 				scanning_channel: '',
+        bindingConsortiaId: '',
 			};
 		},
 		onLoad(e) {
-			
+			this.bindingConsortiaId = this.$queue.getData('bindingConsortiaId') ? this.$queue.getData('bindingConsortiaId') : '';
 			this.invitation = this.$queue.getData('inviterCode') ? this.$queue.getData('inviterCode') : '';
 			// #ifdef APP-PLUS
 			this.platform = 'app'
@@ -200,6 +206,7 @@
 						phone: phone,
 						openId: this.$queue.getData('openid') ? this.$queue.getData('openid') : '',
 						inviterCode: this.invitation,
+            bindingConsortiaId: this.bindingConsortiaId,
 						platform: this.platform,
 						msg: code
 					}