From 723b82cabaaec0585b953f7f940179d1fbb7227c Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 15 May 2024 09:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=97=E8=A1=A8=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=20=E5=92=8C=E8=AF=A6=E6=83=85=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/index.vue   | 16 ++++++++--------
 pages/goods/detail.vue |  6 +++---
 pages/goods/list.vue   | 24 ++++++++++++------------
 pages/index/index.vue  | 17 ++++++++---------
 pages/user/index.vue   | 29 ++++++++++++++---------------
 5 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index d41ccb5..91734ca 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -97,7 +97,7 @@
 								{{item.cmmdty_model}}
 							</view>
 						</view>
-						<view class="goodsSend">
+						<!-- <view class="goodsSend">
 							<view class="sendLeft">
 								<view class="left_1">
 									{{item.goods_source}}
@@ -106,7 +106,7 @@
 									{{Number(item.discount)}}折
 								</view>
 							</view>
-						<!-- 	<view class="sendRight">
+							<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>
@@ -114,8 +114,8 @@
 								<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>
 				</template>
 				<template v-slot:right="{rightList}">
@@ -146,7 +146,7 @@
 								{{item.cmmdty_model}}
 							</view>
 						</view>
-						<view class="goodsSend">
+						<!-- <view class="goodsSend">
 							<view class="sendLeft">
 								<view class="left_1">
 									{{item.goods_source}}
@@ -155,7 +155,7 @@
 									{{Number(item.discount)}}折
 								</view>
 							</view>
-							<!-- <view class="sendRight">
+							<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>
@@ -163,8 +163,8 @@
 								<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>
 				</template>
 			</u-waterfall>
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index f0c68c9..afb164a 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -126,12 +126,12 @@
 						</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: 27rpx;height: 27rpx;margin-left: 14rpx;"></image>
+							style="width: 30rpx;height: 30rpx;margin-left: 14rpx;"></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index c978250..35ab77f 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -56,13 +56,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>
 							</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,7 +143,7 @@
 												{{item.cmmdty_model}}
 											</view>
 										</view>
-										<view class="goodsSend">
+								<!-- 		<view class="goodsSend">
 											<view class="sendLeft">
 												<view class="left_1">
 													{{item.goods_source}}
@@ -152,7 +152,7 @@
 													{{Number(item.discount)}}折
 												</view>
 											</view>
-											<!-- <view class="sendRight">
+											<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>
@@ -160,8 +160,8 @@
 												<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>
 								</view>
 							</view>
@@ -199,7 +199,7 @@
 												{{item.cmmdty_model}}
 											</view>
 										</view>
-										<view class="goodsSend">
+										<!-- <view class="goodsSend">
 											<view class="sendLeft">
 												<view class="left_1">
 													{{item.goods_source}}
@@ -208,7 +208,7 @@
 													{{Number(item.discount)}}折
 												</view>
 											</view>
-											<!-- <view class="sendRight">
+											<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>
@@ -216,8 +216,8 @@
 												<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>
 								</view>
 							</view>
@@ -444,7 +444,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 : ''
 				}
 				console.log(param)
 				return new Promise((resolve, reject) => {
@@ -612,7 +612,7 @@
 			background: #fff;
 
 			.sort-item {
-				flex-basis: 25%;
+				flex-basis: 33.33%;
 				display: flex;
 				justify-content: center;
 				align-items: center;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 41df482..2f23ab6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -268,7 +268,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view>
-								<view class="goodsSend">
+								<!-- <view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -277,7 +277,7 @@
 											{{Number(item.discount)}}折
 										</view>
 									</view>
-									<!-- <view class="sendRight">
+									<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>
@@ -285,8 +285,8 @@
 										<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>
 						</template>
 						<template v-slot:right="{rightList}">
@@ -318,7 +318,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view>
-								<view class="goodsSend">
+						<!-- 		<view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -327,7 +327,7 @@
 											{{Number(item.discount)}}折
 										</view>
 									</view>
-									<!-- <view class="sendRight">
+									<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>
@@ -335,9 +335,8 @@
 										<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>
 						</template>
 					</u-waterfall>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 007e8d0..a797d8a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -155,7 +155,6 @@
 							浏览记录
 						</view>
 					</view>
-					<!-- @click="goJump('/pages/news3/setOutRecords')" -->
 					<view class="listItem" @click="goShopOrderList()">
 						<view class="num">
 							{{actionCountsInfo.take_goods_number?actionCountsInfo.take_goods_number:0}}
@@ -542,7 +541,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view>
-								<view class="goodsSend">
+								<!-- <view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -551,7 +550,7 @@
 											{{Number(item.discount)}}折
 										</view>
 									</view>
-									<!-- <view class="sendRight">
+									<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>
@@ -559,8 +558,8 @@
 										<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>
 						</view>
 					</template>
@@ -587,7 +586,7 @@
 										{{item.cmmdty_model}}
 									</view>
 								</view>
-								<view class="goodsSend">
+								<!-- <view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -596,16 +595,16 @@
 											{{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 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>