From c0a006041f17681fea58cc2cc274d1152321a02b Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Tue, 24 Aug 2021 11:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=80=91=E5=B8=83=E6=B5=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-waterfall-my/lf-waterfall.vue   | 81 +++++++++++++------
 .../lf-waterfall-recom/lf-waterfall.vue       | 80 +++++++++++-------
 components/lf-waterfall/lf-waterfall.vue      | 80 ++++++++++++------
 3 files changed, 162 insertions(+), 79 deletions(-)

diff --git a/components/lf-waterfall-my/lf-waterfall.vue b/components/lf-waterfall-my/lf-waterfall.vue
index f10f955..d78177c 100644
--- a/components/lf-waterfall-my/lf-waterfall.vue
+++ b/components/lf-waterfall-my/lf-waterfall.vue
@@ -2,35 +2,55 @@
 	<view>
 		<u-waterfall v-model="dataList" ref="uWaterfall">
 			<template v-slot:left="{leftList}">
-				<view class="list-warter" v-for="(item, index) in leftList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in leftList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</template>
 			<template v-slot:right="{rightList}">
-				<view class="list-warter" v-for="(item, index) in rightList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in rightList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -53,9 +73,10 @@
 			}
 		},
 		computed: {
-			dataList() {
-				return this.list
-			}
+			dataList: {
+				get() { return this.list; },
+				set(newValue) {  console.log('newvalue',newValue) }
+			},
 		},
 		onShow(){
 			
@@ -65,10 +86,18 @@
 		},
 		methods: {
 			onClick(id){
-				console.log("aaaa");
 				this.$url('/pages/goodsDetail/index?goods_id='+id);
 				this.$emit('click');
 			},
+			goAd(type,url){
+				if(url) {
+					if(type == 0) {
+						this.$url(url);
+					}else {
+						this.$url('/pages/index/urlWeb?url='+url);
+					}
+				}
+			},
 			clear() {
 				this.$refs.uWaterfall.clear();
 			}
diff --git a/components/lf-waterfall-recom/lf-waterfall.vue b/components/lf-waterfall-recom/lf-waterfall.vue
index a3a1509..d78177c 100644
--- a/components/lf-waterfall-recom/lf-waterfall.vue
+++ b/components/lf-waterfall-recom/lf-waterfall.vue
@@ -2,35 +2,55 @@
 	<view>
 		<u-waterfall v-model="dataList" ref="uWaterfall">
 			<template v-slot:left="{leftList}">
-				<view class="list-warter" v-for="(item, index) in leftList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in leftList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</template>
 			<template v-slot:right="{rightList}">
-				<view class="list-warter" v-for="(item, index) in rightList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in rightList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -49,16 +69,11 @@
 		},
 		data(){
 			return {
-			
+				
 			}
 		},
 		computed: {
 			dataList: {
-				// let arr = [];
-				// if(this.list && this.list.length){
-				// 	arr = this.list;
-				// }
-				// return arr;
 				get() { return this.list; },
 				set(newValue) {  console.log('newvalue',newValue) }
 			},
@@ -74,6 +89,15 @@
 				this.$url('/pages/goodsDetail/index?goods_id='+id);
 				this.$emit('click');
 			},
+			goAd(type,url){
+				if(url) {
+					if(type == 0) {
+						this.$url(url);
+					}else {
+						this.$url('/pages/index/urlWeb?url='+url);
+					}
+				}
+			},
 			clear() {
 				this.$refs.uWaterfall.clear();
 			}
diff --git a/components/lf-waterfall/lf-waterfall.vue b/components/lf-waterfall/lf-waterfall.vue
index 15f168f..d78177c 100644
--- a/components/lf-waterfall/lf-waterfall.vue
+++ b/components/lf-waterfall/lf-waterfall.vue
@@ -2,35 +2,55 @@
 	<view>
 		<u-waterfall v-model="dataList" ref="uWaterfall">
 			<template v-slot:left="{leftList}">
-				<view class="list-warter" v-for="(item, index) in leftList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in leftList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</template>
 			<template v-slot:right="{rightList}">
-				<view class="list-warter" v-for="(item, index) in rightList" :key="index" @click="onClick(item.id)">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
-						<view class="list-label">已售{{item.sale}}</view>
-					</u-lazy-load>
-					<view class="lf-p-20">
-						<view class="list-title">
-							{{item.product.title}}
+				<view class="list-warter" v-for="(item, index) in rightList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+							<view class="list-label">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.product.title}}
+							</view>
+							<view class="list-price">
+								<!-- <text>{{item.price}}元</text> -->
+								<lf-price :price="item.price"></lf-price>
+								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+							</view>
 						</view>
-						<view class="list-price">
-							<!-- <text>{{item.price}}元</text> -->
-							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -53,9 +73,10 @@
 			}
 		},
 		computed: {
-			dataList() {
-				return this.list
-			}
+			dataList: {
+				get() { return this.list; },
+				set(newValue) {  console.log('newvalue',newValue) }
+			},
 		},
 		onShow(){
 			
@@ -68,6 +89,15 @@
 				this.$url('/pages/goodsDetail/index?goods_id='+id);
 				this.$emit('click');
 			},
+			goAd(type,url){
+				if(url) {
+					if(type == 0) {
+						this.$url(url);
+					}else {
+						this.$url('/pages/index/urlWeb?url='+url);
+					}
+				}
+			},
 			clear() {
 				this.$refs.uWaterfall.clear();
 			}