From d7ef42ae1daf48b3fa3aa490e93393e9ad47bd74 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 26 Aug 2021 10:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88=E5=90=8E=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-waterfall-my/lf-waterfall.vue    |  8 ++++----
 components/lf-waterfall-recom/lf-waterfall.vue |  8 ++++----
 components/lf-waterfall/lf-waterfall.vue       |  8 ++++----
 pages/activityList/index.vue                   |  4 ++--
 pages/collect/index.vue                        |  2 +-
 pages/goodsDetail/index.vue                    | 10 +++++-----
 pages/goodsList/index.vue                      |  2 +-
 pages/hot/index.vue                            |  4 ++--
 pages/index/index.vue                          |  1 +
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/components/lf-waterfall-my/lf-waterfall.vue b/components/lf-waterfall-my/lf-waterfall.vue
index d78177c..97ebc24 100644
--- a/components/lf-waterfall-my/lf-waterfall.vue
+++ b/components/lf-waterfall-my/lf-waterfall.vue
@@ -4,12 +4,12 @@
 			<template v-slot:left="{leftList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
@@ -31,12 +31,12 @@
 			<template v-slot:right="{rightList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
diff --git a/components/lf-waterfall-recom/lf-waterfall.vue b/components/lf-waterfall-recom/lf-waterfall.vue
index d78177c..97ebc24 100644
--- a/components/lf-waterfall-recom/lf-waterfall.vue
+++ b/components/lf-waterfall-recom/lf-waterfall.vue
@@ -4,12 +4,12 @@
 			<template v-slot:left="{leftList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
@@ -31,12 +31,12 @@
 			<template v-slot:right="{rightList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
diff --git a/components/lf-waterfall/lf-waterfall.vue b/components/lf-waterfall/lf-waterfall.vue
index d78177c..97ebc24 100644
--- a/components/lf-waterfall/lf-waterfall.vue
+++ b/components/lf-waterfall/lf-waterfall.vue
@@ -4,12 +4,12 @@
 			<template v-slot:left="{leftList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
@@ -31,12 +31,12 @@
 			<template v-slot:right="{rightList}">
 				<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">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.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}}
+								{{item.title}}
 							</view>
 							<view class="list-price">
 								<!-- <text>{{item.price}}元</text> -->
diff --git a/pages/activityList/index.vue b/pages/activityList/index.vue
index ea814b1..e06746b 100644
--- a/pages/activityList/index.vue
+++ b/pages/activityList/index.vue
@@ -10,10 +10,10 @@
 		<view class="content">
 			<view class="item" v-for="(item,index) in list" :key="index">
 				<view class="cover" @click="enterDetail(index)">
-					<image :src="item.product.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
+					<image :src="item.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
 				</view>
 				<view style="width: 420rpx;">
-					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.product.title}}</view>
+					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.title}}</view>
 					<view class="lf-font-24 lf-color-gray">本套票只包含两个成人不可带小孩</view>
 					<view class="lf-flex lf-m-t-25">
 						<lf-price :price="item.price"></lf-price>
diff --git a/pages/collect/index.vue b/pages/collect/index.vue
index cefef37..8198bc3 100644
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@@ -4,7 +4,7 @@
 			<view class="lf-row-between list-item" v-for="(item, index) in list" :key="item.id">
 				<image class="goods-img" mode="aspectFill" :src="item.product.picture" @click="enterDetail(item.agent_product_id)"></image>
 				<view style="width: 458rpx;">
-					<view class="lf-font-28 lf-line-2" style="height: 80rpx;" @click="enterDetail(item.id)">{{ item.product.title }}</view>
+					<view class="lf-font-28 lf-line-2" style="height: 80rpx;" @click="enterDetail(item.id)">{{ item.title }}</view>
 					<view class="lf-m-t-15 lf-font-24 lf-color-gray">{{ item.created_at || '' }}</view>
 					
 					<view class="lf-row-between lf-m-t-20">
diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index ff77333..bfebbe4 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -3,14 +3,14 @@
 		<skeleton :loading="skeletonLoading" :row="12" :showAvatar="false" :showTitle="true">
 			<block v-if="isRight(goods_detail)">
 				<!-- 商品图片轮播 -->
-				<swiper :current="current" :indicator-dots="goods_detail.product.pictures.length > 1 ? true : false" :circular="true" class="swiper-box" indicator-active-color="#1998FE">
-					<swiper-item v-for="(item, index) in goods_detail.product.pictures" :key="index">
+				<swiper :current="current" :indicator-dots="goods_detail.pictures.length > 1 ? true : false" :circular="true" class="swiper-box" indicator-active-color="#1998FE">
+					<swiper-item v-for="(item, index) in goods_detail.pictures" :key="index">
 						<image mode="aspectFill" :src="item" style="width: 100%; height: 100%;" @click="lookImg(index)"></image>
 					</swiper-item>
 				</swiper>
 				<!-- 商品主要信息 -->
 				<view class="head-info">
-					<view class="lf-font-32 lf-color-333 lf-font-bold">{{ goods_detail.product.title }}</view>
+					<view class="lf-font-32 lf-color-333 lf-font-bold">{{ goods_detail.title }}</view>
 					<view class="lf-row-between lf-font-24 lf-m-t-30 lf-p-b-20">
 						<view class="lf-flex price">
 							<lf-price :price="goods_detail.price"></lf-price>
@@ -19,7 +19,7 @@
 						</view>
 						<view class="lf-font-24 lf-text-right">
 							<view class="lf-color-gray">已售 {{ goods_detail.sale }}</view>
-							<view class="lf-color-gray">库存 {{ goods_detail.product.stock }}</view>
+							<view class="lf-color-gray">库存 {{ goods_detail.stock }}</view>
 							<!-- <view class="lf-color-primary">{{ goods_detail.specs[0].stock_text }}</view> -->
 						</view>
 					</view>
@@ -50,7 +50,7 @@
 				<!-- 商品详情 -->
 				<view class="goods-detail">
 					<view class="lf-font-32 lf-font-bold lf-m-b-20">旅游须知</view>
-					<rich-text :nodes="formatRichText(goods_detail.product.know)"></rich-text>
+					<rich-text :nodes="formatRichText(goods_detail.know)"></rich-text>
 					<!-- <image class="goods-img" :src="item" v-for="(item, index) in goods_detail.content" :key="index" v-if="goods_detail.content_type == 'img'"></image> -->
 				</view> 
 				<!-- 修饰专用 -->
diff --git a/pages/goodsList/index.vue b/pages/goodsList/index.vue
index e42c25b..59665c1 100644
--- a/pages/goodsList/index.vue
+++ b/pages/goodsList/index.vue
@@ -7,7 +7,7 @@
 					<image :src="item.product.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
 				</view>
 				<view style="width: 420rpx;">
-					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.product.title}}</view>
+					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.title}}</view>
 					<view class="lf-font-24 lf-color-gray">本套票只包含两个成人不可带小孩</view>
 					<view class="lf-flex lf-m-t-25">
 						<lf-price :price="item.price"></lf-price>
diff --git a/pages/hot/index.vue b/pages/hot/index.vue
index 835858d..c96d6d2 100644
--- a/pages/hot/index.vue
+++ b/pages/hot/index.vue
@@ -4,10 +4,10 @@
 		<view class="content">
 			<view class="item" v-for="(item,index) in list" :key="index" @click="$url('/pages/goodsDetail/index?goods_id='+item.id)">
 				<view class="cover">
-					<image :src="item.product.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
+					<image :src="item.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
 				</view>
 				<view style="width: 420rpx;">
-					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.product.title}}</view>
+					<view class="lf-font-28 lf-color-333 lf-m-b-20 lf-line-2" style="height: 78rpx;">{{item.title}}</view>
 					<view class="lf-font-24 lf-color-gray">本套票只包含两个成人不可带小孩</view>
 					<view class="lf-flex lf-m-t-25">
 						<lf-price :price="item.price"></lf-price>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f6d154..3c26d55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -178,6 +178,7 @@
 				// this.$msg('您点击了ad广告')
 				if(url) {
 					if(type == 0) {
+						console.log(url)
 						this.$url(url);
 					}else {
 						this.$url('/pages/index/urlWeb?url='+url);