From ea61939b3e98a420116cdc20191e40a08e003514 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Thu, 12 Dec 2024 14:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index-home/index-home.vue     | 40 +++++++++++++++++-------
 components/mall-news/mall-news.vue       | 11 ++++---
 components/panic-buying/panic-buying.vue | 30 +++++++++---------
 pages/index/index.vue                    |  8 ++---
 4 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/components/index-home/index-home.vue b/components/index-home/index-home.vue
index f607edb..626727a 100644
--- a/components/index-home/index-home.vue
+++ b/components/index-home/index-home.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="index-home p-t-20">
+	<view class="index-home p-t-10">
 
 		<ad-swipers :pid="7" height="312rpx" padding="0 30rpx" radius="20rpx"></ad-swipers>
 
@@ -42,10 +42,14 @@
 						<swiper class="swiper" :autoplay="true" :interval="3000" style="height: 500rpx;">
 							<swiper-item v-for="(item, index) in hotListGoods" :key="index">
 								<router-link :to="{path: '/pages/goods_details/goods_details', query: {id: item.goods_id || item.id}}">
-									<view>
-										<u-image mode="aspectFill" width="100%" height="360rpx"
-											:border-radius="radius" :src="item.image">
-										</u-image>
+									<view style="border-radius: 20rpx;">
+										<view class="paixu-block">
+											<u-image mode="aspectFill" width="100%" height="360rpx"
+												border-radius="20" :src="item.image">
+											</u-image>
+											<image v-if="index < 3" class="paixu" :src="aliOSS + 'uniapp/No.' + index + '.png'"></image>
+										</view>
+									
 										<view class="line-2 p-t-20">{{item.name}}</view>
 										<price-format :color="colorConfig.primary" class="m-r-10" :first-size="34" :second-size="26"
 											:subscript-size="26" :price="item.activity_price || item.min_price"
@@ -62,10 +66,12 @@
 					
 				<view style="width: 54%;margin-left: 20rpx;">
 					<view class="section special-price">
-						<view class="header row-between">
-							<u-image :src="aliOSS + 'uniapp/tttj.png'" height="40" width="120" mode="aspectFit"></u-image>
-							<u-icon name="arrow-right" size="28" color="#ccc"></u-icon>
-						</view>
+						<router-link to="/bundle_b/pages/panic_buying/index">
+							<view class="header row-between">
+								<u-image :src="aliOSS + 'uniapp/tttj.png'" height="80" width="120" mode="aspectFit"></u-image>
+								<u-icon name="arrow-right" size="28" color="#ccc"></u-icon>
+							</view>
+						</router-link>
 						<view class="content">
 							<panic-buying v-if="appConfig.group_buy_status" :list="panicList"></panic-buying>
 						</view>
@@ -325,12 +331,24 @@
 		
 		.container {		
 			align-items: flex-start;
-			height: 618rpx;
+			height: 600rpx;
 			overflow: hidden;
 			
 			.hot-sale {
 				width: 46%;
-				height: 618rpx;
+				height: 600rpx;
+			}
+			
+			.paixu-block {
+				position: relative;
+				
+				.paixu {
+					position: absolute;
+					top: 0;
+					left: 10rpx;
+					width: 48rpx;
+					height: 60rpx;
+				}
 			}
 			
 			.section {
diff --git a/components/mall-news/mall-news.vue b/components/mall-news/mall-news.vue
index 2f1fad9..e24b838 100644
--- a/components/mall-news/mall-news.vue
+++ b/components/mall-news/mall-news.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="mall bg-white">
 		<view v-if="list" class="mall-block">
-			<swiper class="swiper" :autoplay="true" style="height: 200rpx;">
+			<swiper class="swiper" :autoplay="true" style="height: 190rpx;">
 				<swiper-item  class="item bg-white flex"  v-for="(item, index) in list" :key="index">
 					<view class="flex-1">
 						<router-link :to="{path: '/bundle_b/pages/mall_news/detail', query: {id: item.id}}" v-if="item.mall_type == 0">
-							<view v-if="item.files != ''" style="height: 120rpx;">
+							<view v-if="item.files != ''" style="height: 160rpx;">
 								<view v-if="item.type == 0">
 									<u-image class="thumb" :height="width" :border-radius="10" :src="item.files[0].src"></u-image>
 								</view>
@@ -14,7 +14,7 @@
 								</view>
 							</view>
 							
-							<view class="goods-name line-2 bold sm m-t-20">{{item.title}}</view>
+							<view class="goods-name line-1 sm m-t-20">{{item.title}}</view>
 						</router-link>
 						
 						<view v-if="item.mall_type == 1">
@@ -29,7 +29,7 @@
 									</view>
 								</scroll-view>
 							</view>
-							<view class="goods-name line-2 bold sm m-t-20">{{item.title}}</view>
+							<view class="goods-name line-1 sm m-t-20">{{item.title}}</view>
 						</view>
 					</view>
 				</swiper-item>
@@ -49,7 +49,7 @@
 		},
 		data() {
 			return {
-				width: '120rpx'
+				width: '160rpx'
 			};
 		},
 		methods: {
@@ -135,6 +135,7 @@
 		
 		.goods-name {
 			height: 80rpx;
+			width: calc(100% - 20rpx);
 		}
 	}
 </style>
diff --git a/components/panic-buying/panic-buying.vue b/components/panic-buying/panic-buying.vue
index 420f3c2..357c9c6 100644
--- a/components/panic-buying/panic-buying.vue
+++ b/components/panic-buying/panic-buying.vue
@@ -1,22 +1,20 @@
 <template>
 	<view class="panic bg-white">
-		<view class="m-t-20">
-			<scroll-view style="white-space: nowrap;" scroll-x="true" scroll-with-animation="true">
-				<view class="flex item">
-					<router-link v-for="(item, index) in list.lists" :key="index" class="p-r-20" :to="{path: '/pages/goods_details/goods_details', query: {id: item.goods_id, activity_sn: item.activity_sn, act_id: 1}}">
-						<u-image :src="item.goods_image" :width="width" :height="width" border-radius="10rpx"></u-image>
-						<view class="text-center flex row-between m-t-10">
-							<price-format class="m-r-10 ele1" :first-size="32" :second-size="26"
-								:subscript-size="24" :price="item.activity_price" :weight="500" color="#F20A0A"></price-format>
-							<view class="go flex">
-								<view>抢</view>
-								<u-icon name="play-right-fill" size="12" class="right"></u-icon>
-							</view>
+		<scroll-view style="white-space: nowrap;height: 200rpx;" scroll-x="true" scroll-with-animation="true">
+			<view class="flex item">
+				<router-link v-for="(item, index) in list.lists" :key="index" class="p-r-20" :to="{path: '/pages/goods_details/goods_details', query: {id: item.goods_id, activity_sn: item.activity_sn, act_id: 1}}">
+					<u-image :src="item.goods_image" :width="width" :height="width" border-radius="10rpx"></u-image>
+					<view class="text-center flex row-between m-t-10">
+						<price-format class="m-r-10 ele1" :first-size="32" :second-size="26"
+							:subscript-size="24" :price="item.activity_price" :weight="500" color="#F20A0A"></price-format>
+						<view class="go flex">
+							<view>抢</view>
+							<u-icon name="play-right-fill" size="12" class="right"></u-icon>
 						</view>
-					</router-link>
-				</view>
-			</scroll-view>
-		</view>
+					</view>
+				</router-link>
+			</view>
+		</scroll-view>
 	</view>
 </template>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e28e15..90d9720 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,7 +19,7 @@
 										<u-search wrap-bg-color="transparent" bg-color="#fff" :disabled="true" :height="62">
 										</u-search>
 									</router-link>
-									<button open-type="contact" hover-class="none">
+									<button open-type="contact" hover-class="none" class="m-t-10">
 										<u-icon name="server-fill" size="44" color="#FFFFFF"></u-icon>
 									</button>
 								</view>
@@ -36,7 +36,7 @@
 					<view class="flex">
 						<view class="flex-1" style="min-width:600rpx">
 							<u-tabs active-color="#000" :show-bar="false" inactive-color="#000" :current="active" :list="cateList"
-								bg-color="transparent" :active-item-style="{fontSize:'32rpx'}" :bar-width="64"
+								bg-color="transparent" :active-item-style="{fontSize:'36rpx'}" :bar-width="64"
 								:bold="true" @change="changeActive">
 							</u-tabs>
 						</view>
@@ -55,11 +55,11 @@
 						color="#449FFB" ></u-notice-bar>
 				</view>
 				
-				<view v-if="appConfig.show_mini_notice">
+				<view v-if="appConfig.show_mini_notice" class="m-b-10">
 					<u-notice-bar mode="horizontal" :list="[appConfig.mini_notice]" :font-size="28" :close-icon="false" :speed="100"
 						color="#449FFB" ></u-notice-bar>
 				</view>
-				<view  v-show="active == 0">
+				<view v-show="active == 0">
 					<index-home ref="indexHome" :home-data="homeData" :nav-list="navList" :live-list="liveLists">
 					</index-home>
 					<goods-column ref="mescrollItem" :autoGetData="false"></goods-column>