From 818cb96255e139444902e169e4aac65acf4bf301 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 25 Sep 2024 21:37:00 +0800
Subject: [PATCH 1/5] =?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/cart/index.vue  |  4 +--
 pages/goods/list.vue  | 64 +++++++++++++++++++++++--------------------
 pages/index/index.vue |  4 +--
 pages/user/index.vue  |  4 +--
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index b78f5a3..9e130b4 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -104,7 +104,7 @@
 								{{item.cmmdty_model}}
 							</view>
 						</view> -->
-						<!-- <view class="goodsSend">
+						<view class="goodsSend">
 							<view class="sendLeft">
 								<view class="left_1">
 									{{item.goods_source}}
@@ -122,7 +122,7 @@
 								<text v-if="item.delivery_time==5">30天内发货</text>
 								<text v-if="item.delivery_time==6">45天内发货</text>
 							</view>
-						</view> -->
+						</view>
           </view>
 				<!-- </template> -->
 				<!-- <template v-slot:right="{rightList}">
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index ae83394..741c5d2 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -57,13 +57,13 @@
 							</view>
 						</view>
 
-						<!-- 		<view class="sort-item" :class="{ active: sortType === 'city' }"
+						<view class="sort-item" :class="{ active: sortType === 'city' }"
 							@click="handleSortType('city')">
 							<picker mode="selector" @change="multiChange" value="{{multiIndex}}" :range="multiArray"
 								range-key="name">
-								<text>类型</text>
+								<text>渠道</text>
 							</picker>
-						</view> -->
+						</view>
 						<!-- <view class="show-view btnOpera" @click="handleShowView">
 							<text class="iconfont icon-view-tile" v-if="showView"></text>
 							<text class="iconfont icon-view-list" v-else></text>
@@ -143,25 +143,25 @@
 												{{item.cmmdty_model}}
 											</view>
 										</view> -->
-								<!-- 		<view class="goodsSend">
-											<view class="sendLeft">
-												<view class="left_1">
-													{{item.goods_source}}
-												</view>
-												<view class="left_2">
-													{{Number(item.discount)}}折
-												</view>
-											</view>
-											<view class="sendRight">
-												<text v-if="item.delivery_time==0">24小时内发货</text>
-												<text v-if="item.delivery_time==1">48小时内发货</text>
-												<text v-if="item.delivery_time==2">72小时内发货</text>
-												<text v-if="item.delivery_time==3">7天内发货</text>
-												<text v-if="item.delivery_time==4">15天内发货</text>
-												<text v-if="item.delivery_time==5">30天内发货</text>
-												<text v-if="item.delivery_time==6">45天内发货</text>
-											</view>
-										</view> -->
+								<view class="goodsSend">
+									<view class="sendLeft">
+										<view class="left_1">
+											{{item.goods_source}}
+										</view>
+										<view class="left_2">
+											{{Number(item.discount)}}折
+										</view>
+									</view>
+									<view class="sendRight">
+										<text v-if="item.delivery_time==0">24小时内发货</text>
+										<text v-if="item.delivery_time==1">48小时内发货</text>
+										<text v-if="item.delivery_time==2">72小时内发货</text>
+										<text v-if="item.delivery_time==3">7天内发货</text>
+										<text v-if="item.delivery_time==4">15天内发货</text>
+										<text v-if="item.delivery_time==5">30天内发货</text>
+										<text v-if="item.delivery_time==6">45天内发货</text>
+									</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -280,20 +280,26 @@
 				},
 				tabbar: [],
 				multiArray: [{
-					value: 'JD',
-					name: 'JD'
-				}, {
-					value: 'SN',
-					name: 'SN'
-				}, {
 					value: 'GC',
 					name: 'GC'
 				}, {
 					value: 'CC',
-					name: 'CC '
+					name: 'CC'
 				}, {
 					value: 'ZC',
 					name: 'ZC'
+				}, {
+					value: 'JD',
+					name: 'JD '
+				}, {
+					value: 'SN',
+					name: 'SN'
+				}, {
+					value: 'TM',
+					name: 'TM'
+				}, {
+					value: 'PF',
+					name: 'PF'
 				}],
 				multiIndex: -1,
 				blheight: 0,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d80f04b..8a4d099 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -289,7 +289,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view> -->
-						<!-- <view class="goodsSend">
+						<view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -307,7 +307,7 @@
 										<text v-if="item.delivery_time==5">30天内发货</text>
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
-								</view> -->
+								</view>
 					</view>
 					<!-- </template> -->
 					<!-- <template v-slot:right="{rightList}">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4f26fd1..b7f560b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -580,7 +580,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view> -->
-						<!-- <view class="goodsSend">
+						<view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -598,7 +598,7 @@
 										<text v-if="item.delivery_time==5">30天内发货</text>
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
-								</view> -->
+								</view>
 					</view>
 				</view>
 				<!-- </template> -->

From 021f76b23040e8a946870b56942200f34a8f1f2a Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 26 Sep 2024 19:21:51 +0800
Subject: [PATCH 2/5] =?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   | 22 +++++++++++-----------
 pages/search/index.vue |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 741c5d2..1855b58 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -280,26 +280,26 @@
 				},
 				tabbar: [],
 				multiArray: [{
+					value: 'JD',
+					name: '京东 '
+				}, {
+					value: 'SN',
+					name: '苏宁'
+				}, {
 					value: 'GC',
-					name: 'GC'
+					name: '工厂'
 				}, {
 					value: 'CC',
-					name: 'CC'
+					name: '仓储'
 				}, {
 					value: 'ZC',
-					name: 'ZC'
-				}, {
-					value: 'JD',
-					name: 'JD '
-				}, {
-					value: 'SN',
-					name: 'SN'
+					name: '自采'
 				}, {
 					value: 'TM',
-					name: 'TM'
+					name: '天猫'
 				}, {
 					value: 'PF',
-					name: 'PF'
+					name: '批发平台'
 				}],
 				multiIndex: -1,
 				blheight: 0,
diff --git a/pages/search/index.vue b/pages/search/index.vue
index 259baec..ef4aa70 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="search">
 			<image :src="$picUrl+'/static/home/search.png'" mode="" class="searchIcon"></image>
-			<input v-model="searchValue" class="input" focus="true" placeholder="iPhone15" type="text" />
+			<input v-model="searchValue"  confirm-type="搜索" show-confirm-bar @confirm="getSearchInfo"  class="input" focus="true" placeholder="iPhone15" type="text" />
 			<view class="searchBtn" @click="getSearchInfo">
 				搜索
 			</view>

From ac064cdae36376de15faa3906fbccb4ffba7b6b2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 26 Sep 2024 19:41:05 +0800
Subject: [PATCH 3/5] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 1855b58..3bdc493 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -468,7 +468,7 @@
 					page: pageNo,
 					// keywords: keywords.length > 0 ? keywords.join(',') : '',
 					keyword: app.options.search || '',
-					// goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
+					goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
 				}
 				return new Promise((resolve, reject) => {
 					GoodsApi.list(param)

From 5db14c5a8a7465b6f22c2ef07a860ed13366c25b Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 26 Sep 2024 21:08:47 +0800
Subject: [PATCH 4/5] =?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/detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 0b194e5..cf92b27 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -128,10 +128,10 @@
 						</picker>
 					</view>
 					<view v-if="goods.goods_no" class="operaImg" @click="copyNum(goods.goods_no)">
-						<!-- <view class="left_1">
+						<view class="left_1">
 							{{goods.goods_source}}
 						</view>
-						<text style="color: #8A8A8A;font-size: 28rpx;">{{goods.goods_no}}</text> -->
+						<text style="color: #8A8A8A;font-size: 28rpx;">{{goods.goods_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"
 							style="width: 30rpx;height: 30rpx;margin-left: 14rpx;"></image>
 					</view>

From 1ba71b14641987532c8cc7b8dbdda7e94080e7de Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 11 Oct 2024 19:47:16 +0800
Subject: [PATCH 5/5] =?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/cart/index.vue  | 128 ++++++++++++++++++++++++------------------
 pages/index/index.vue |  49 +++++++++-------
 pages/user/index.vue  |  45 ++++++++-------
 3 files changed, 127 insertions(+), 95 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 9e130b4..21c26c3 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -20,8 +20,10 @@
 		<!-- 购物车商品列表 -->
 		<view v-if="list.length" class="cart-list">
 			<view class="cart-item" v-for="(item, index) in list" :key="index">
-				<view v-if="storeVersion == 1 && item.goods.merchant_id > 0 && item.goods.merchant" class="merchant-name" @click="toShop(item)">
-					<image :src="item.goods.merchant.logoImage && item.goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
+				<view v-if="storeVersion == 1 && item.goods.merchant_id > 0 && item.goods.merchant"
+					class="merchant-name" @click="toShop(item)">
+					<image :src="item.goods.merchant.logoImage && item.goods.merchant.logoImage[0].external_url"
+						mode="aspectFill"></image>
 					<text>{{ item.goods.merchant.shop_name }}</text>
 					<image src="@/static/arrow-right.png" mode="aspectFill"></image>
 				</view>
@@ -76,56 +78,56 @@
 		</view>
 		<view class="goodsRecommend">
 			<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
-				<!-- <template v-slot:left="{leftList}"> -->
-					<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="onTargetGoods(item.goods_id)"
-						:key="index">
-						<view class="pic">
-							<image :src="item.goods_image" mode="aspectFill"></image>
-						</view>
-						<view class="goodsInfo">
-							<view class="title">
-								<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
-								<text class="name">{{item.goods_name}}</text>
-							</view>
-						</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>
+			<!-- <template v-slot:left="{leftList}"> -->
+			<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="onTargetGoods(item.goods_id)"
+				:key="index">
+				<view class="pic">
+					<image :src="item.goods_image" mode="aspectFill"></image>
+				</view>
+				<view class="goodsInfo">
+					<view class="title">
+						<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
+						<text class="name">{{item.goods_name}}</text>
+					</view>
+				</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="goodsInfo1" v-if="item.cmmdty_model">
 							<view class="oneTip">
 								{{item.cmmdty_model}}
 							</view>
 						</view> -->
-						<view class="goodsSend">
-							<view class="sendLeft">
-								<view class="left_1">
-									{{item.goods_source}}
-								</view>
-								<view class="left_2">
-									{{Number(item.discount)}}折
-								</view>
-							</view>
-							<view class="sendRight">
-								<text v-if="item.delivery_time==0">24小时内发货</text>
-								<text v-if="item.delivery_time==1">48小时内发货</text>
-								<text v-if="item.delivery_time==2">72小时内发货</text>
-								<text v-if="item.delivery_time==3">7天内发货</text>
-								<text v-if="item.delivery_time==4">15天内发货</text>
-								<text v-if="item.delivery_time==5">30天内发货</text>
-								<text v-if="item.delivery_time==6">45天内发货</text>
-							</view>
+				<view class="goodsSend">
+					<view class="sendLeft">
+						<view class="left_1">
+							{{item.goods_source}}
 						</view>
-          </view>
-				<!-- </template> -->
-				<!-- <template v-slot:right="{rightList}">
+						<view class="left_2">
+							{{Number(item.discount)}}折
+						</view>
+					</view>
+					<view class="sendRight">
+						<text v-if="item.delivery_time==0">24小时内发货</text>
+						<text v-if="item.delivery_time==1">48小时内发货</text>
+						<text v-if="item.delivery_time==2">72小时内发货</text>
+						<text v-if="item.delivery_time==3">7天内发货</text>
+						<text v-if="item.delivery_time==4">15天内发货</text>
+						<text v-if="item.delivery_time==5">30天内发货</text>
+						<text v-if="item.delivery_time==6">45天内发货</text>
+					</view>
+				</view>
+			</view>
+			<!-- </template> -->
+			<!-- <template v-slot:right="{rightList}">
 					<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 						@click="onTargetGoods(item.goods_id)" :key="index">
 						<view class="pic">
@@ -294,7 +296,7 @@
 			checkLogin() ? this.getCartList() : this.isLoading = false
 		},
 		onReachBottom() {
-		  if (!this.recommendFinish) {
+			if (!this.recommendFinish) {
 				this.getSuggest()
 			}
 		},
@@ -302,7 +304,9 @@
 		methods: {
 			getSuggest() {
 				// 获取推荐商品
-				Api.recommendedNew({ page: this.recommendPage++ }).then(res => {
+				Api.recommendedNew({
+					page: this.recommendPage++
+				}).then(res => {
 					console.log(res);
 					let arr = res.data.goodsList.data
 					if (arr && arr.length > 0) {
@@ -316,10 +320,10 @@
 					if (arr.length < res.data.goodsList.per_page) {
 						this.recommendFinish = true;
 					}
-						this.recommendLoadTitle = this.recommendFinish ? "已全部加载完" : "上拉加载更多";
+					this.recommendLoadTitle = this.recommendFinish ? "已全部加载完" : "上拉加载更多";
 					this.goodsRecommend = [...this.goodsRecommend, ...arr]
 				})
-			
+
 			},
 			// 计算合计金额 (根据选中的商品)
 			onCalcTotalPrice() {
@@ -482,7 +486,7 @@
 						app.handleToggleMode()
 					})
 			},
-			
+
 			toShop(item) {
 				uni.navigateTo({
 					url: `/pages/shopList/shopPage?id=${item.goods.merchant_id}`,
@@ -540,22 +544,30 @@
 			margin: 0rpx 0 20rpx 0;
 
 			.pic {
+				position: relative;
 				width: 100%;
 				align-items: center;
 				display: flex;
-				height: 256rpx;
 				overflow: hidden;
-			
+				width: 100%;
+				height: 0;
+				padding-bottom: 100%;
+				overflow: hidden;
+
 				image {
 					width: 100%;
 					height: 100%;
-			
+					object-fit: cover;
+					position: absolute;
+					left: 0;
+					top: 0
 				}
 			}
 
 			.goodsInfo {
 				margin-bottom: 12rpx;
-                 height: 60rpx;
+				height: 60rpx;
+
 				.title {
 					display: flex;
 					align-items: center;
@@ -628,6 +640,7 @@
 				}
 			}
 		}
+
 		.finished {
 			font-size: 28rpx;
 			line-height: 100rpx;
@@ -680,21 +693,25 @@
 		border-radius: 12rpx;
 		padding: 30rpx 16rpx;
 		margin-bottom: 24rpx;
+
 		.merchant-name {
 			font-size: 30rpx;
 			color: #333;
 			font-weight: bold;
+
 			>text {
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
 				max-width: calc(100% - 73rpx);
 			}
+
 			>image {
 				margin-left: 10rpx;
 				width: 13rpx;
 				height: 24rpx;
 				flex-shrink: 0;
+
 				&:first-child {
 					width: 40rpx;
 					height: 40rpx;
@@ -702,6 +719,7 @@
 				}
 			}
 		}
+
 		>view {
 			display: flex;
 			align-items: center;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8a4d099..8b7699c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,7 +25,7 @@
 					<!-- <view class="badge"></view> -->
 				</view>
 				<view class="chat" v-else>
-					<view  v-if="setting.provider=='wxqykf'" @click="handleContact">
+					<view v-if="setting.provider=='wxqykf'" @click="handleContact">
 						<u-icon name="chat" color="#000000" size="70"></u-icon>
 					</view>
 					<view v-else>
@@ -290,24 +290,24 @@
 									</view>
 								</view> -->
 						<view class="goodsSend">
-									<view class="sendLeft">
-										<view class="left_1">
-											{{item.goods_source}}
-										</view>
-										<view class="left_2">
-											{{Number(item.discount)}}折
-										</view>
-									</view>
-									<view class="sendRight">
-										<text v-if="item.delivery_time==0">24小时内发货</text>
-										<text v-if="item.delivery_time==1">48小时内发货</text>
-										<text v-if="item.delivery_time==2">72小时内发货</text>
-										<text v-if="item.delivery_time==3">7天内发货</text>
-										<text v-if="item.delivery_time==4">15天内发货</text>
-										<text v-if="item.delivery_time==5">30天内发货</text>
-										<text v-if="item.delivery_time==6">45天内发货</text>
-									</view>
+							<view class="sendLeft">
+								<view class="left_1">
+									{{item.goods_source}}
+								</view>
+								<view class="left_2">
+									{{Number(item.discount)}}折
 								</view>
+							</view>
+							<view class="sendRight">
+								<text v-if="item.delivery_time==0">24小时内发货</text>
+								<text v-if="item.delivery_time==1">48小时内发货</text>
+								<text v-if="item.delivery_time==2">72小时内发货</text>
+								<text v-if="item.delivery_time==3">7天内发货</text>
+								<text v-if="item.delivery_time==4">15天内发货</text>
+								<text v-if="item.delivery_time==5">30天内发货</text>
+								<text v-if="item.delivery_time==6">45天内发货</text>
+							</view>
+						</view>
 					</view>
 					<!-- </template> -->
 					<!-- <template v-slot:right="{rightList}">
@@ -697,7 +697,7 @@
 						}
 					})
 					// #endif
-				}else{
+				} else {
 					this.$toast('暂不支持企业微信客服')
 				}
 			},
@@ -2047,16 +2047,23 @@
 					margin: 0rpx 0 20rpx 0;
 
 					.pic {
+						position: relative;
 						width: 100%;
 						align-items: center;
 						display: flex;
-						height: 256rpx;
+						overflow: hidden;
+						width: 100%;
+						height: 0;
+						padding-bottom: 100%;
 						overflow: hidden;
 
 						image {
 							width: 100%;
 							height: 100%;
-
+							object-fit: cover;
+							position: absolute;
+							left: 0;
+							top: 0
 						}
 					}
 
diff --git a/pages/user/index.vue b/pages/user/index.vue
index b7f560b..7110d83 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -581,24 +581,24 @@
 									</view>
 								</view> -->
 						<view class="goodsSend">
-									<view class="sendLeft">
-										<view class="left_1">
-											{{item.goods_source}}
-										</view>
-										<view class="left_2">
-											{{Number(item.discount)}}折
-										</view>
-									</view>
-									<view class="sendRight">
-										<text v-if="item.delivery_time==0">24小时内发货</text>
-										<text v-if="item.delivery_time==1">48小时内发货</text>
-										<text v-if="item.delivery_time==2">72小时内发货</text>
-										<text v-if="item.delivery_time==3">7天内发货</text>
-										<text v-if="item.delivery_time==4">15天内发货</text>
-										<text v-if="item.delivery_time==5">30天内发货</text>
-										<text v-if="item.delivery_time==6">45天内发货</text>
-									</view>
+							<view class="sendLeft">
+								<view class="left_1">
+									{{item.goods_source}}
+								</view>
+								<view class="left_2">
+									{{Number(item.discount)}}折
 								</view>
+							</view>
+							<view class="sendRight">
+								<text v-if="item.delivery_time==0">24小时内发货</text>
+								<text v-if="item.delivery_time==1">48小时内发货</text>
+								<text v-if="item.delivery_time==2">72小时内发货</text>
+								<text v-if="item.delivery_time==3">7天内发货</text>
+								<text v-if="item.delivery_time==4">15天内发货</text>
+								<text v-if="item.delivery_time==5">30天内发货</text>
+								<text v-if="item.delivery_time==6">45天内发货</text>
+							</view>
+						</view>
 					</view>
 				</view>
 				<!-- </template> -->
@@ -1387,16 +1387,23 @@
 			margin: 0 0 20rpx 0;
 
 			.pic {
+				position: relative;
 				width: 100%;
 				align-items: center;
 				display: flex;
-				height: 256rpx;
+				overflow: hidden;
+				width: 100%;
+				height: 0;
+				padding-bottom: 100%;
 				overflow: hidden;
 
 				image {
 					width: 100%;
 					height: 100%;
-
+					object-fit: cover;
+					position: absolute;
+					left: 0;
+					top: 0
 				}
 			}