From 857a2528a616f29cf3222186c9a20ad88ab1f173 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 25 Mar 2024 14:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recommend/index.vue     |  2 +-
 pages/gather/gather.vue            |  6 ++----
 pages/goods_details/index.vue      | 11 ++++++-----
 pages/index/component/homeComb.vue |  2 +-
 pages/users/order_list/index.vue   |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index d48a0dc..7a518e4 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -167,7 +167,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		height: 118rpx;
+		height: 90rpx;
 
 		image {
 			width: 340rpx;
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 7688dbb..f5bbdf5 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -20,7 +20,6 @@
     }
 
     .swiperBg {
-      padding-top: 25rpx;
       z-index: 1;
 
       .colorBg {
@@ -110,8 +109,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      height: 68rpx;
-      margin-bottom: 40rpx;
+      height: 90rpx;
 
       image {
         width: 340rpx;
@@ -155,7 +153,7 @@
     </view>
 
     <!--轮播图-->
-    <view class="swiperBg">
+    <view class="swiperBg" style="margin-top: 12px;">
       <view class="swiper page_swiper">
         <swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
           :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 46efede..ce31d7f 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -51,7 +51,7 @@
 								<text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
 							</view>
 							<!--无氛围图-->
-							<!-- <view v-else class='share acea-row row-between row-bottom'>
+							<view v-else class='share acea-row row-between row-bottom'>
 								<view class='money p-color skeleton-rect' style="min-width: 70rpx;">
 									￥
 									<text class='num'>{{storeInfo.price}}</text>
@@ -64,16 +64,17 @@
 									<view @click="setCollect">
 										<text class="iconfont" :class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br/>收藏
 									</view>
-									<view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br/>分享</view>
+									<!-- <view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br/>分享</view> -->
 								</view>
-							</view> -->
-              <view v-else class='share acea-row row-between row-top' style="flex-direction: column;">
+							</view>
+              <view class='share acea-row row-between row-top' style="flex-direction: column;">
               	<view class='money p-color skeleton-rect' v-for="(item, index) in storeInfo.sku" style="min-width: 70rpx;">
               		￥
               		<text class='num'>{{item.price}}</text>
-                  <text style="color: #ccc;font-weight: 500;">{{"/"}}{{ item.sku || storeInfo.unit_name}}</text>
+              	  <text style="color: #ccc;font-weight: 500;">{{"/"}}{{ item.sku || storeInfo.unit_name}}</text>
               	</view>
               </view>
+              
 							<view 
 								v-if="svipData && !svipData.is_svip && svipData.show_svip"
 							  class="svipCon acea-row row-between-wrapper skeleton-rect" style="margin-top: 20rpx;">
diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue
index a1751c4..7f44b1a 100644
--- a/pages/index/component/homeComb.vue
+++ b/pages/index/component/homeComb.vue
@@ -23,7 +23,7 @@
 		</view>
 
 		<!--轮播图-->
-		<view class="swiperBg" :style="{ marginTop: (swiperTop + 15)+'px'}">
+		<view class="swiperBg" :style="{ marginTop: (swiperTop + 10)+'px'}">
 			<view class="swiper page_swiper" v-if="imgUrls.length">
 				<swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
 					indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index c20eb2d..cee06b3 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -536,7 +536,7 @@
 			goMall(item) {
 				if (this.hide_mer_status == 0) {
 					uni.navigateTo({
-						url: '/pages/store/home/index?id=' + item.mer_id
+						url: `/pages/store/home/index?id=${item.mer_id}&sale_type=${this.sale_type}`
 					})
 				}
 			},