diff --git a/config/app.js b/config/app.js
index 5dc8628..e87e172 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/shop/index.vue b/pages/shop/index.vue
index 6703d6e..73ea12c 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -22,7 +22,7 @@
 			</view>
 			<view class="type-item">
 				<image class="type-item-img" src="@/static/images/shop/tab3.png" mode=""></image>
-				<text class="type-item-text">休息娱乐</text>
+				<text class="type-item-text">休闲娱乐</text>
 			</view>
 			<view class="type-item">
 				<image class="type-item-img" src="@/static/images/shop/tab4.png" mode=""></image>
@@ -45,7 +45,7 @@
 				<text class="type-item-text">汽车服务</text>
 			</view>
 			<view class="type-item">
-				<image class="type-item-img" src="@/static/images/shop/tab8.png" mode=""></image>
+				<image class="type-item-img" src="@/static/images/shop/tab9.png" mode=""></image>
 				<text class="type-item-text">家装</text>
 			</view>
 			<view class="type-item">
@@ -60,8 +60,17 @@
 			</view>
 			<view class="list-container">
 				<view class="list-item" v-for="(item,index) in 20" :key='index'>
-					<view class="list-item-left">
-						<image src="../users/static/images/level_avatar.png" mode=""></image>
+					<view class="list-item-left" v-if="index==1">
+						<image src="@/static/images/shop/1.jpg" mode=""></image>
+					</view>
+					<view class="list-item-left" v-else-if="index==2">
+						<image src="@/static/images/shop/2.jpg" mode=""></image>
+					</view>
+					<view class="list-item-left" v-else-if="index==3">
+						<image src="@/static/images/shop/3.png" mode=""></image>
+					</view>
+					<view class="list-item-left" v-else>
+						<image src="@/static/images/shop/4.jpg" mode=""></image>
 					</view>
 					<view class="list-item-right" @click="navtoDetail()">
 						<view class="item-title">
@@ -88,22 +97,51 @@
 				</view>
 			</view>
 		</view>
+		<!--自定义底部tab栏-->
+		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
 	</view>
 </template>
 <script>
+	import { getNavigation } from '@/api/public.js';
+	import customTab from '@/components/customTab';
 	export default {
 		components:{
-			
+			customTab,
 		},
 		data(){
 			return{
+				newData: {},
+				activeRouter: '',
 				 tabList:[],
 				 current:0,
 			}
 		},
 		onLoad(){
 		},
+		onShow(){
+			this.getNav();
+		},
+		created(options) {
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			this.activeRouter = '/' + curRoute
+		},
 		methods:{
+			getNav(){
+				getNavigation().then(res => {
+					this.newData = res.data
+					if (this.newData.status && this.newData.status.status) {
+						uni.hideTabBar()
+					} else {
+						uni.showTabBar()
+					}
+				})
+			},
+			created(options) {
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].route //获取当前页面路由
+				this.activeRouter = '/' + curRoute
+			},
 			selectCurrent(val){
 				this.current=val;
 			},
diff --git a/static/images/shop/1.jpg b/static/images/shop/1.jpg
new file mode 100644
index 0000000..e511628
Binary files /dev/null and b/static/images/shop/1.jpg differ
diff --git a/static/images/shop/2.jpg b/static/images/shop/2.jpg
new file mode 100644
index 0000000..3b66636
Binary files /dev/null and b/static/images/shop/2.jpg differ
diff --git a/static/images/shop/3.png b/static/images/shop/3.png
new file mode 100644
index 0000000..c6463dc
Binary files /dev/null and b/static/images/shop/3.png differ
diff --git a/static/images/shop/4.jpg b/static/images/shop/4.jpg
new file mode 100644
index 0000000..22af654
Binary files /dev/null and b/static/images/shop/4.jpg differ