关联商品优化

pages/goods/list.vue

@@ -309,7 +309,6 @@
 			this.options = options
 			this.searchText = options.search
 			this.from = options.from || '';
-			console.log(this.from, 316);
 			// 设置默认列表显示方式
 			this.setShowView()
 			// 设置微信公众号链接分享卡片内容
@@ -520,7 +519,7 @@
 				this.keyName2 = '';
 				this.banrdType = [];
 				this.goodsType = [];
-				const searchPageUrl = 'pages/search/index?category_id=' + this.options.categoryId
+				const searchPageUrl = `pages/search/index?category_id=${this.options.categoryId}&from=${this.from}`
 				// 判断来源页面
 				let pages = getCurrentPages()
 				if (pages.length > 1 &&
@@ -528,8 +527,14 @@
 					uni.navigateBack()
 					return
 				}
-				// 跳转到商品搜索页
-				this.$navTo(searchPageUrl)
+				if (this.from === 'dynamic') {
+					uni.redirectTo({
+						url: `/${searchPageUrl}`,
+					});
+				} else {
+					// 跳转到商品搜索页
+					this.$navTo(searchPageUrl)
+				}
 			},
 
 			// 设置微信公众号链接分享卡片内容

pages/search/index.vue

@@ -86,6 +86,7 @@
 				goodsList: [],
 				category_id:0,
 				merchantId: '',
+				from: '',
 				isHot: true,
 			}
 		},
@@ -100,7 +101,8 @@
 		},
 		onLoad(op) {
 			this.category_id=op.category_id || ''
-			this.merchantId = op.merchantId || ''
+			this.merchantId = op.merchantId || ''
+			this.from = op.from || ''
 			this.getHot()
 			this.chartsGoodsJingHandle()
 		},
@@ -150,10 +152,17 @@
 
 				})
 			},
-			searchGoods(item) {
-				uni.navigateTo({
-					url: `/pages/goods/list?search=${item}&merchantId=${this.merchantId}`
-				})
+			searchGoods(item) {
+				console.log(this.from);
+				if (this.from === 'dynamic') {
+					uni.redirectTo({
+						url: `/pages/goods/list?search=${item}&merchantId=${this.merchantId}&from=${this.from}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/goods/list?search=${item}&merchantId=${this.merchantId}`
+					})
+				}
 			},
 			getSearchInfo() {
 				// 搜索
@@ -164,7 +173,7 @@
 				}
 				console.log(this.merchantId);
 				uni.redirectTo({
-					url: `/pages/goods/list?search=${this.searchValue}&categoryId=${this.category_id}&merchantId=${this.merchantId}`
+					url: `/pages/goods/list?search=${this.searchValue}&categoryId=${this.category_id}&merchantId=${this.merchantId}&from=${this.from}`
 				})
 			},
 			chartsGoodsJingHandle() {