From f991263979d8995171a842b172bf58251d2f757f Mon Sep 17 00:00:00 2001
From: yangtao <yang1793766139@163.com>
Date: Sun, 24 Mar 2024 18:34:07 +0800
Subject: [PATCH] 1

---
 config/app.js        | 4 ++--
 pages.json           | 7 +++++--
 pages/shop/index.vue | 9 ++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config/app.js b/config/app.js
index e87e172..5dc8628 100644
--- a/config/app.js
+++ b/config/app.js
@@ -6,8 +6,8 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 let openPlantGrass = '-openPlantGrass-'
 
 // 网络接口修改此字符 小程序域名要求https
-let httpApi = 'http://many.shop.lo' //测试
-// let httpApi = 'https://plus.hwms.shop' //生产
+// let httpApi = 'http://many.shop.lo' //测试
+let httpApi = 'https://plus.hwms.shop' //生产
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
 // let wsApi = 'ws://192.168.3.20:8324'
diff --git a/pages.json b/pages.json
index 43bce6f..09388bb 100644
--- a/pages.json
+++ b/pages.json
@@ -85,8 +85,11 @@
 			"path": "pages/shop/index",
 			"style": {
 				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "商家联盟"
-				
+				"navigationStyle": "custom",
+				// "navigationBarTitleText": "商家联盟",
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏
+				}
 			}
 		},
 		{
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index ec4da5d..b803c4a 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -1,7 +1,7 @@
 
 <template>
 	<view class="content">
-		<view class="top-tab">
+		<view class="top-tab" :style="`padding-top:`+navtop">
 			<view class="tab-location">
 				深圳
 				<view class="iconfont icon-dingwei"></view>
@@ -11,8 +11,11 @@
 		</view>
 		<view class="content-map" >
 			<map class="map" :latitude="22.547" :longitude="114.085947"></map>
+			
 		</view>
 		<view class="content-type">
+			<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
+			top: -20px;"></cover-image> -->
 			<view class="type-item">
 				<image class="type-item-img" src="@/static/images/shop/tab1.png" mode=""></image>
 				<text class="type-item-text">餐饮美食</text>
@@ -103,6 +106,7 @@
 	</view>
 </template>
 <script>
+	
 	import { getNavigation } from '@/api/public.js';
 	import customTab from '@/components/customTab';
 	export default {
@@ -115,6 +119,7 @@
 				activeRouter: '',
 				 tabList:[],
 				 current:0,
+				 navtop:0,
 			}
 		},
 		onLoad(){
@@ -123,6 +128,8 @@
 			this.getNav();
 		},
 		created(options) {
+			let statusBarHeight= uni.getSystemInfoSync().statusBarHeight+"px";
+			this.navtop=statusBarHeight;
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curRoute = routes[routes.length - 1].route //获取当前页面路由
 			this.activeRouter = '/' + curRoute