From 31ff647fdf17731147316f8de46b3a8c28f4defe Mon Sep 17 00:00:00 2001
From: yangtao <yang1793766139@163.com>
Date: Sun, 24 Mar 2024 15:49:14 +0800
Subject: [PATCH] 1

---
 pages.json           | 28 +++++++++++-----------------
 pages/shop/index.vue |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/pages.json b/pages.json
index 526d390..43bce6f 100644
--- a/pages.json
+++ b/pages.json
@@ -16,7 +16,7 @@
 				"navigationBarTitleText": "首页",
 					"navigationStyle": "custom",
 				// #ifdef APP-PLUS	
-					"enablePullDownRefresh": true,
+					"enablePullDownRefresh": false,
 				// #endif
 				"app-plus": {
 					"scrollIndicator": false //禁用原生导航栏
@@ -26,7 +26,7 @@
 		{
 			"path": "pages/order_addcart/order_addcart",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "购物车"
 			}
 		},
@@ -40,7 +40,7 @@
 		{
 			"path": "pages/user/index",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "个人中心",
 				"navigationStyle": "custom"
 			}
@@ -53,13 +53,6 @@
 
 			}
 		},
-		{
-			"path": "pages/shop/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "门店"
-			}
-		},
 		{
 			"path": "pages/shop_details/index",
 			"style": {
@@ -84,15 +77,16 @@
 		{
 			"path": "pages/goods_cate/goods_cate",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "商品分类"
 			}
 		},
 		{
 			"path": "pages/shop/index",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "商家联盟"
+				
 			}
 		},
 		{
@@ -972,7 +966,7 @@
 			"pages": [{
 					"path": "goods_seckill/index",
 					"style": {
-						"enablePullDownRefresh": true,
+						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "限时秒杀",
 						"navigationBarBackgroundColor": "#F2F2F2"
 					}
@@ -994,7 +988,7 @@
 				{
 					"path": "presell/index",
 					"style": {
-						"enablePullDownRefresh": true,
+						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "预售列表"
 							// #ifdef MP || APP-PLUS
 							,
@@ -1012,7 +1006,7 @@
 				{
 					"path": "combination/index",
 					"style": {
-						"enablePullDownRefresh": true,
+						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "拼团"
 							// #ifdef MP || APP-PLUS
 							,
@@ -1038,7 +1032,7 @@
 				{
 					"path": "assist/index",
 					"style": {
-						"enablePullDownRefresh": true,
+						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "助力列表",
 						"navigationBarBackgroundColor": "#F2F2F2"
 					}
@@ -1328,7 +1322,7 @@
 				"pagePath": "pages/shop/index",
 				"iconPath": "static/images/shop/index-tab.png",
 				"selectedIconPath": "static/images/shop/index-tab.png",
-				"text": "门店"
+				"text": "商家"
 			},
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 6513780..6703d6e 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -3,7 +3,7 @@
 	<view class="content">
 		<view class="top-tab">
 			<view class="tab-location">
-				北京
+				深圳
 				<view class="iconfont icon-dingwei"></view>
 			</view>
 			商家联盟