From 18c8b3a09778d5631a3d07965ffe6923ac483934 Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Tue, 26 Mar 2024 17:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/newPeople.vue | 13 ++++++-------
 pages/goods/list.vue         | 36 +++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index 52f5591..e2f70e2 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -344,17 +344,16 @@
 
 					.title {
 						padding: 10rpx 0;
-						line-height: 40rpx;
 						font-size: 24rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #1E1E1E;
-						    display: -webkit-box;
-						    -webkit-box-orient: vertical;
-						    overflow: hidden;
-						    -webkit-line-clamp: 2;
-						    height: 90rpx;
-						    line-height: 45rpx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						overflow: hidden;
+						-webkit-line-clamp: 2;
+						height: 90rpx;
+						line-height: 45rpx;
 
 						text {
 							background-color: #F34A40;
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index c6cca97..b35256b 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -8,23 +8,25 @@
 					<search :tips="options.search ? options.search : '搜索商品'" @event="handleSearch" />
 				</view>
 			</view>
-			<view class="store-sort" v-if="tabbar.length>0">
-				<view class="goodsType">
-					<scroll-view class="typeList" scroll-x="true">
-						<view v-for="(item,index) in tabbar" :key="index" class="typeItem" @click="onChage(item,1)"
-							:style="{'color':item.category_id==isBanrdActive?'#F43B21':'#5A5A5A','background':item.category_id==isBanrdActive?'#FEF6F6':'#F7F8FA','border':item.category_id==isBanrdActive?'2rpx solid #F22029':'none'}">
-							{{item.name}}
-						</view>
-					</scroll-view>
-				</view>
-				<view class="goodsType" v-if="goodsType && goodsType.length > 0">
-					<scroll-view class="typeList" scroll-x="true">
-						<view v-for="(item,index) in goodsType" :key="index" class="typeItem" @click="onChage(item,2)"
-							:style="{'color':isActive==item.category_id?'#F43B21':'#5A5A5A','background':isActive==item.category_id?'#FEF6F6':'#F7F8FA','border':isActive==item.category_id?'2rpx solid #F22029':'none'}">
-							{{item.name}}
-						</view>
-					</scroll-view>
-				</view>
+			<view class="store-sort">
+				<template v-if="options.categoryId">
+					<view class="goodsType" v-if="tabbar && tabbar.length > 0">
+						<scroll-view class="typeList" scroll-x="true">
+							<view v-for="(item,index) in tabbar" :key="index" class="typeItem" @click="onChage(item,1)"
+								:style="{'color':item.category_id==isBanrdActive?'#F43B21':'#5A5A5A','background':item.category_id==isBanrdActive?'#FEF6F6':'#F7F8FA','border':item.category_id==isBanrdActive?'2rpx solid #F22029':'none'}">
+								{{item.name}}
+							</view>
+						</scroll-view>
+					</view>
+					<view class="goodsType" v-if="goodsType && goodsType.length > 0">
+						<scroll-view class="typeList" scroll-x="true">
+							<view v-for="(item,index) in goodsType" :key="index" class="typeItem" @click="onChage(item,2)"
+								:style="{'color':isActive==item.category_id?'#F43B21':'#5A5A5A','background':isActive==item.category_id?'#FEF6F6':'#F7F8FA','border':isActive==item.category_id?'2rpx solid #F22029':'none'}">
+								{{item.name}}
+							</view>
+						</scroll-view>
+					</view>
+				</template>
 				<!-- 排序标签 -->
 				<view class="store-box">
 					<view class="sort-item" :class="{ active: sortType === 'all' }" @click="handleSortType('all')">