diff --git a/App.vue b/App.vue
index 4fc5a03..7ef1a8e 100644
--- a/App.vue
+++ b/App.vue
@@ -60,7 +60,7 @@
 		onLaunch: function(option) {
 			uni.hideTabBar();
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-			this.globalData.uid = this.$store.state.app.uid
+			this.globalData.uid = this.$store.state.app.uid;
 			let that = this;
 			// #ifdef MP
 			if (HTTP_REQUEST_URL == '') {
diff --git a/manifest.json b/manifest.json
index ce3f9bc..cc36711 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,7 +58,6 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
@@ -79,14 +78,15 @@
                     "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_ios" : "f868a24eddab123b4e3a2cadb78b6fba",
+                        "appkey_android" : "a4fc891e60ccdf388ce0996cc833aca1"
                     }
                 },
                 "payment" : {
@@ -94,27 +94,17 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "",
-                        "UniversalLinks" : "https://mer. .net/"
-                    }
-                },
+                "share" : {},
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_ios" : "f868a24eddab123b4e3a2cadb78b6fba",
+                        "appkey_android" : "a4fc891e60ccdf388ce0996cc833aca1"
                     }
                 },
                 "push" : {},
                 "oauth" : {
-                    "apple" : {},
-                    "weixin" : {
-                        "appid" : "",
-                        "appsecret" : "",
-                        "UniversalLinks" : "https://mer. .net/"
-                    }
+                    "apple" : {}
                 },
                 "ad" : {}
             },
diff --git a/pages/shop/css/shop.css b/pages/shop/css/shop.css
index 21ad2aa..cce572f 100644
--- a/pages/shop/css/shop.css
+++ b/pages/shop/css/shop.css
@@ -26,6 +26,7 @@
 	font-size: 40rpx;
 	position: absolute;
 	right:28rpx;
+	color:#3587F7;
 }
 .content .top-tab .tab-location .icon-dingwei{
 	color: blue;
@@ -33,11 +34,11 @@
 }
 .content .content-map{
 	width: 100%;
-	height: 400rpx;
+	height: 520rpx;
 }
 .content .content-map .map{
 	width:100%;
-	height: 400rpx;
+	height: 520rpx;
 }
 .content .content-type{
 	width: 100%;
@@ -89,6 +90,19 @@
 	margin: 24rpx 28rpx;
 	padding: 24rpx 0;
 }
+
+.content .content-list .list-container .list-fail {
+	text-align: center;
+	margin: 78rpx auto 56rpx auto;
+	padding-bottom: 60rpx;
+}
+.content .content-list .list-container .list-fail image {
+	width: 414rpx;
+	height: 305rpx;
+}
+.content .content-list .list-container .list-fail view{
+	color: #999;
+}
 .content .content-list  .list-container .list-item .list-item-left{
 	display: flex;
 	justify-content: center;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index b803c4a..583c131 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -62,7 +62,7 @@
 				<view :class="current==0?'action':''" @click="selectCurrent(0)">全部商家</view>
 				<view :class="current==1?'action':''" @click="selectCurrent(1)">附近商家</view>
 			</view>
-			<view class="list-container">
+			<view class="list-container" v-if="false">
 				<view class="list-item" v-for="(item,index) in 20" :key='index'>
 					<view class="list-item-left" v-if="index==1">
 						<image src="@/static/images/shop/1.jpg" mode=""></image>
@@ -100,13 +100,19 @@
 					</view>
 				</view>
 			</view>
+			<view class="list-container" v-else>
+				<view class="list-fail">
+					<image :src="`${domain}/static/images/noCart.png`"></image>
+					<view>暂无商家，去看看其他的吧</view>
+				</view>
+			</view>
 		</view>
 		<!--自定义底部tab栏-->
 		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
 	</view>
 </template>
 <script>
-	
+	import { HTTP_REQUEST_URL } from '@/config/app';
 	import { getNavigation } from '@/api/public.js';
 	import customTab from '@/components/customTab';
 	export default {
@@ -115,8 +121,9 @@
 		},
 		data(){
 			return{
-				newData: {},
-				activeRouter: '',
+				 domain: HTTP_REQUEST_URL,
+				 newData: {},
+				 activeRouter: '',
 				 tabList:[],
 				 current:0,
 				 navtop:0,