From a3e1c1a07d73055f11e47dc30905668881f9f89d Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 18 Jun 2024 09:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue  | 74 +++++++++++++++++++++----------------------
 pages/index/index.vue |  3 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index f87fcf8..d94f268 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -15,7 +15,7 @@
 							<scroll-view class="typeList" scroll-x="true">
 								<view v-for="(item,index) in tabbar" :key="index" class="bandsImg"
 									@click="onChage(item,1,index)"
-									:style="{'color':item.category_id==isBanrdActive?'#F43B21':'#5A5A5A','border':item.category_id==isBanrdActive?'1rpx solid #F22029':'1rpx solid #E7E7E7'}">
+									:style="{display: item.image ? 'inline-block' : 'none','color':item.category_id==isBanrdActive?'#F43B21':'#5A5A5A','border':item.category_id==isBanrdActive?'1rpx solid #F22029':'1rpx solid #E7E7E7'}">
 									<image :src="item.image?item.image.external_url:''" mode="aspectFill"></image>
 									<view class="typeItem">{{item.name}}</view>
 								</view>
@@ -110,40 +110,39 @@
 				</view>
 				<view v-else>
 					<!-- <u-waterfall v-model="list.data" ref="uWaterfall1"> -->
-						<!-- <template v-slot:left="{leftList}"> -->
-							<view class="goods-item goods-item1" v-for="(item, index) in list.data" :key="index"
-								@click="onTargetDetail(item)">
-								<!-- 多列显示 -->
-								<view class="">
-									<!-- 商品图片 -->
-									<view class="goods-image">
-										<image class="image" mode="aspectFill" :src="item.goods_image"></image>
-										<!-- <u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load> -->
+					<!-- <template v-slot:left="{leftList}"> -->
+					<view class="goods-item goods-item1" v-for="(item, index) in list.data" :key="index"
+						@click="onTargetDetail(item)">
+						<!-- 多列显示 -->
+						<view class="">
+							<!-- 商品图片 -->
+							<view class="goods-image">
+								<image class="image" mode="aspectFill" :src="item.goods_image"></image>
+								<!-- <u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load> -->
+							</view>
+							<view class="detail" style="padding-top: 10rpx;">
+								<!-- 商品名称 -->
+								<view class="goods-name">
+									<text>{{ item.goods_name }}</text>
+								</view>
+								<!-- 商品价格 -->
+								<view class="shenBox">
+									<view class="detail-price oneline-hide">
+										<text class="goods-price f-30 col-m"><text
+												style="font-size: 26rpx;">￥</text>{{ item.goods_price_min>0?Number(item.goods_price_min):0.00}}
+											<text class="delPrice"></text></text>
+										<text v-if="item.line_price_min > 0"
+											class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 									</view>
-									<view class="detail" style="padding-top: 10rpx;">
-										<!-- 商品名称 -->
-										<view class="goods-name">
-											<text>{{ item.goods_name }}</text>
-										</view>
-										<!-- 商品价格 -->
-										<view class="shenBox">
-											<view class="detail-price oneline-hide">
-												<text class="goods-price f-30 col-m"><text
-														style="font-size: 26rpx;">￥</text>{{ item.goods_price_min>0?Number(item.goods_price_min):0.00}}
-													<text class="delPrice"></text></text>
-												<text v-if="item.line_price_min > 0"
-													class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
-											</view>
-											<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1"
-												mode="">
-											</image>
-										</view>
-										<!-- 	<view class="goodsInfo" v-if="item.cmmdty_model">
+									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
+									</image>
+								</view>
+								<!-- 	<view class="goodsInfo" v-if="item.cmmdty_model">
 											<view class="oneTip">
 												{{item.cmmdty_model}}
 											</view>
 										</view> -->
-										<!-- 		<view class="goodsSend">
+								<!-- 		<view class="goodsSend">
 											<view class="sendLeft">
 												<view class="left_1">
 													{{item.goods_source}}
@@ -162,11 +161,11 @@
 												<text v-if="item.delivery_time==6">45天内发货</text>
 											</view>
 										</view> -->
-									</view>
-								</view>
 							</view>
-						<!-- </template> -->
-						<!-- <template v-slot:right="{rightList}">
+						</view>
+					</view>
+					<!-- </template> -->
+					<!-- <template v-slot:right="{rightList}">
 							<view class="goods-item goods-item1" v-for="(item, index) in rightList" :key="index"
 								@click="onTargetDetail(item)">
 								<view class="">
@@ -297,7 +296,7 @@
 				}],
 				multiIndex: -1,
 				blheight: 0,
-				from: ''
+				from: '',
 			}
 		},
 
@@ -572,7 +571,7 @@
 
 <style lang="scss" scoped>
 	::v-deep .u-empty {
-		padding: 100rpx 0;
+		padding: 150rpx 0 0 0;
 	}
 
 	.head {
@@ -754,6 +753,7 @@
 			justify-content: space-between;
 			flex-wrap: wrap;
 		}
+
 		.goods-item {
 			// width: 50%;
 		}
@@ -1045,4 +1045,4 @@
 		}
 
 	}
-</style>
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 52bd337..fddc34e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -190,7 +190,8 @@
 					</view>
 				</view>
 				<view class="activity">
-					<view class="left" @click="goNews" v-if="wxAppSetting.service">
+					<!-- @click="goNews" -->
+					<view class="left" v-if="wxAppSetting.service">
 						<image :src="`${$picUrl}/static/index/activity${styleIndex || ''}.png?t=${timestamp}`" mode="widthFix"></image>
 					</view>
 					<view class="right">