From c1f6996b25ddec9f576d380471b842b44a7f1545 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 02 八月 2024 11:55:22 +0800
Subject: [PATCH] 1

---
 sub_pages/partner/partner-info/partner-code.vue |    4 ++--
 pages/login/supplier-reg.vue                    |    7 +++----
 pages/user/supplier-user.vue                    |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 713f2fc..85e6a25 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -74,8 +74,7 @@
 						<!-- #endif -->
 						<!-- #ifdef PUB_CUSTOMER -->
 						<!--            open-type="getUserInfo"-->
-						<button @tap="wxreg('')"
-							class="bottom-button">注 册</button>
+						<button @tap="wxreg('')" class="bottom-button">注 册</button>
 
 						<!-- #endif -->
 
@@ -346,8 +345,8 @@
 						return
 					}
 					var dto = JSON.parse(tjson)
-					dto.partnerId = this.partnerId || undefined
-					// dto.userId  = this.partnerId || undefined
+					// dto.partnerId = this.partnerId || undefined
+					dto.partnerUserId = this.partnerId || undefined
 					post.dto = dto
 				}
 				post.wxcode = wxcode
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index f5adb2b..7d2002c 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -368,7 +368,7 @@
 									data
 								} = await that.$http.request('post', '/api/customer/bind/partner', {
 									data: {
-										partnerId: partnerId
+										partnerUserId: partnerId
 									}
 								})
 								that.$message.hideLoading()
diff --git a/sub_pages/partner/partner-info/partner-code.vue b/sub_pages/partner/partner-info/partner-code.vue
index 70ef4d4..223308c 100644
--- a/sub_pages/partner/partner-info/partner-code.vue
+++ b/sub_pages/partner/partner-info/partner-code.vue
@@ -62,8 +62,8 @@
 							foreground: '#000000',
 							text: JSON.stringify({
 								'name': that.name,
-								// 'userId': that.currentInfo.id,
-								'userId': that.currentInfo.partnerDTO.id,
+								'userId': that.currentInfo.id,
+								// 'userId': that.currentInfo.partnerDTO.id,
 								'version': '1.1.0'
 							}),
 							// text: `https://www.hmyxianhua.com/wx-c-jump/sub_pages/customer/customer-info/customer-info?name=${that.name}&userId=${that.currentInfo.id}`

--
Gitblit v1.9.3