From 8b0c13b27b2ea6d98f5769bb4658327bf17afa8e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 12:37:23 +0800
Subject: [PATCH] update 合伙人分享商品的绑定逻辑

---
 pages/user/supplier-user.vue |  107 +++++++++++++++++++++++++++++------------------------
 1 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 550037f..510ad92 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -336,50 +336,54 @@
 				order_pendding_num: 0,
 
 			};
-		},
-		// #ifndef PUB_CUSTOMER
-		onShareAppMessage() {
-			let that = this;
-			var name = that.currentInfo.customerDTO&&currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&currentInfo.partnerDTO.name || ''
-			var url =
-				`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
-			return {
-				title: "花满芫",
-				path: url,
-			}
-		},
-		onShareTimeline() {
-			let that = this;
-			var name = that.currentInfo.customerDTO&&currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&currentInfo.partnerDTO.name || ''
-			var url =
-				`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
-			return {
-				title: "花满芫",
-				path: url,
-			}
-		},
-		// #endif
-		// #ifdef PUB_CUSTOMER
-		onShareAppMessage() {
-			let that = this;
-			var name = that.currentInfo.customerDTO&&currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&currentInfo.partnerDTO.name || ''
-			var url =
-				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
-			return {
-				title: "花满芫",
-				path: url,
-			}
-		},
-		onShareTimeline() {
-			let that = this;
-			var name = that.currentInfo.customerDTO&&currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&currentInfo.partnerDTO.name || ''
-			var url =
-				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
-			return {
-				title: "花满芫",
-				path: url,
-			}
-		},
+		},
+		// #ifndef PUB_CUSTOMER
+		onShareAppMessage() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+			var url =
+				`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫",
+				path: url,
+			}
+		},
+		onShareTimeline() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+			var url =
+				`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫",
+				path: url,
+			}
+		},
+		// #endif
+		// #ifdef PUB_CUSTOMER
+		onShareAppMessage() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+			var url =
+				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫",
+				path: url,
+			}
+		},
+		onShareTimeline() {
+			let that = this;
+			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+			var url =
+				`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				title: "花满芫",
+				path: url,
+			}
+		},
 		// #endif
 		onShow() {
 			this.getTj()
@@ -427,14 +431,19 @@
 				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('https://')||res.result.startsWith('http://')) && res.result.indexOf(
+							if (res.result && (res.result.startsWith('https://') || res.result.startsWith(
+									'http://')) && res.result.indexOf(
 									'partnerUserId') >= 0) {
-								var arr = res.result.split("?")[1].split("&")
+								var arr = res.result.split("?")[1].split("&")
 								dto = {}
 								for (var item of arr) {
-									var tarr = item.split("=")
+									var tarr = item.split("=")
 									// console.log('tarr',tarr)
 									if (tarr[1]) {
 										dto[tarr[0]] = tarr[1]
@@ -456,8 +465,8 @@
 							} else {
 								that.$message.showToast('二维码格式不正确扫码失败')
 							}
-						} catch (e) {
-							console.log('e',e)
+						} catch (e) {
+							console.log('e', e)
 							that.$message.showToast('二维码扫码错误')
 						}
 					},

--
Gitblit v1.9.3