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] =?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> -->