From 9ea0383c303620cd019d0776ecbb47f52bcef805 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 28 六月 2023 14:17:25 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3版本开发' into develop

---
 uniapp/pages/active/dysearch.vue |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/uniapp/pages/active/dysearch.vue b/uniapp/pages/active/dysearch.vue
index c8195f5..f924ddf 100644
--- a/uniapp/pages/active/dysearch.vue
+++ b/uniapp/pages/active/dysearch.vue
@@ -65,7 +65,8 @@
 			<view class="goodsList-container colCen borderBox">
 				<view class="goods-content rowStaBet">
 					<view class="goods-items borderBox colCen" v-for="(items,index) in goodsList" :key='index' @click="goDetail(items)">
-						<colGoods :items="items"></colGoods>
+						  <colGoodsImg v-if="index==0&&popBannerSList&&popBannerSList.length>0" :popBannerSList="popBannerSList"></colGoodsImg>
+						<colGoods v-else :items="items"></colGoods>
 					</view>
 					<aLoadMore :status="loadstatus" mode="loading3" :showTitle='true' color="#999999"></aLoadMore>
 				</view>
@@ -76,12 +77,15 @@
 
 <script>
 	import colGoods from '../../components/colGoods.vue'
+	import colGoodsImg from '../../components/colGoodsImg.vue'
 	export default {
 		components:{
-			colGoods
+			colGoods,
+			colGoodsImg
 		},
 		data() {
 			return {
+				popBannerSList:[],
 				pageTop: 0,
 				nowCurrent: 0,
 				scrollTop: 0,
@@ -96,7 +100,8 @@
 			}
 		},
 		onLoad() {
-			this.getNav()
+			this.getNav();
+			this.getPageImg();
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop
@@ -117,6 +122,24 @@
 			}).exec();
 		},
 		methods: {
+			getPageImg()
+			{
+			 	var that=this;
+				this.$u.api.getBanner({
+					type: '11,18'
+				}).then(e => {
+					console.log(e)
+					if (e.code == 1) return that.$alert(e.msg);
+					var res = e.data.info;
+					this.popBannerSList=res.dyImg;
+					if(res.dyImg&&res.dyImg.length>0)
+					{
+						that.goodsList.unshift(res[0]);
+					}
+				}).catch(function(err) {
+					console.log(err)
+				})
+			},
 			getNav() {
 				var that = this;
 			    this.$u.api.getHdkCategoryList({type:4}).then(e => {
@@ -193,9 +216,12 @@
 			},
 
 			goDetail(info) {
-				uni.navigateTo({
-					url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
-				})
+				if(info&&info!=undefined)
+				{
+					uni.navigateTo({
+						url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
+					})
+				}
 			},
 
 			goback() {

--
Gitblit v1.9.3