From 12b2c447a6006f99284c4946b3d6f70cbf43280c Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期六, 10 八月 2024 18:26:16 +0800
Subject: [PATCH] 1

---
 pages/login/supplier-reg.vue |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 135ff49..e8d03b4 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -79,8 +79,8 @@
 							</view>
 							<!-- #ifdef PUB_CUSTOMER -->
 							<!-- v-if="source==='step'" -->
-							<view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
-							</view>
+							<!-- <view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
+							</view> -->
 							<!-- #endif -->
 							<view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
 
@@ -154,6 +154,8 @@
 				if (options.partnerUserName) {
 					this.partnerName = options.partnerUserName || '佚名'
 				}
+				//扫码过来的,自然要清除分享商品的id
+				this.$storage.removeItem('cache_sharePartnerUserId')
 			}
 			// #endif
 
@@ -166,6 +168,10 @@
 				uni.scanCode({
 					success: async function(res) {
 						console.log('条码内容:' + res.result);
+						if (!res.result) {
+							that.$message.showToast('未识别出信息,如果是微信小程序二维码,请微信扫码打开')
+							return
+						}
 						var dto = undefined
 						try {
 							if (res.result && (res.result.startsWith('http://') || res.result.startsWith(
@@ -282,7 +288,7 @@
 				}, 1000)
 			},
 			toLogin() {
-				uni.redirectTo({
+				uni.reLaunch({
 					url: '/pages/login/supplier-login'
 				})
 
@@ -391,6 +397,20 @@
 					// #ifdef PUB_CUSTOMER
 					var dto = {}
 					dto.partnerUserId = this.partnerId || undefined
+					//如果没有绑定,有商品详情的分享合伙人id的话缓存的话,尝试用这个
+					if(!dto.partnerUserId){
+						try {
+							var sharePartnerUserId = this.$storage.getItem('cache_sharePartnerUserId')
+							if (sharePartnerUserId) {
+								//试图绑定
+								this.$storage.removeItem('cache_sharePartnerUserId')
+								dto.partnerUserId = sharePartnerUserId						
+							}
+						} catch (e) {
+							console.error('reg bind ', e)
+						}
+					}
+										
 					dto.name = this.regCustomerName || ''
 					post.dto = dto
 					// #endif

--
Gitblit v1.9.3