diff --git a/components/addressWindow/index.vue b/components/addressWindow/index.vue
index 84300c4..f2618d4 100644
--- a/components/addressWindow/index.vue
+++ b/components/addressWindow/index.vue
@@ -18,7 +18,7 @@
 				<image src='../../static/images/noAddress.png'></image>
 				<view>暂无地址</view>
 			</view>
-			<view class='addressBnt' @tap='goAddressPages'>添加新地址</view>
+			<view class='addressBnt' @tap='goAddressPages'>添加/编辑地址</view>
 		</view>
 		<view class='mask' catchtouchmove="true" :hidden='address.address==false' @tap='close'></view>
 	</view>
diff --git a/manifest.json b/manifest.json
index f208982..7b8fdb9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,6 +12,9 @@
         "nvueCompiler" : "uni-app",
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+        "compatible":{
+          "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+        },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
diff --git a/pages.json b/pages.json
index c4e8e9f..f1d6895 100644
--- a/pages.json
+++ b/pages.json
@@ -34,6 +34,7 @@
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true,
+        "onReachBottomDistance": 300,
 				// #ifdef APP-PLUS
 				"enablePullDownRefresh": true,
 				// #endif
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 15cae8c..a78079e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -302,9 +302,9 @@ export default {
 	onReachBottom() {
 
 		if (this.productList.length > 0) {
-			setTimeout(() => {
-				this.getGoods(false);
-			}, 1000)
+			this.$u.sleep(50).then(()=>{
+        this.getGoods(false);
+      })
 		}
 
 	},
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 3a3bf91..db91cbd 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -185,7 +185,7 @@
               </view>
             </view>
             <!-- 购物车 -->
-            <view class="card" :style="`bottom:${appInfo.bottom}px`"
+            <view class="card" :style="`bottom:${appInfo.bottom+10}px`"
               @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
               <view class="left">
                 <view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999">
@@ -263,7 +263,7 @@
 
       <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
       </authorize>
-      <view class="" :style="`height:${appInfo.bottom}px;`"> </view>
+      <view class="" :style="`height:${appInfo.bottom+10}px;`"> </view>
     </view>
 
     <view class="">
@@ -420,7 +420,7 @@
     // ...mapGetters(['isLogin', 'viewColor', 'uid']),
     onLoad(e) {
       // this.cartFn()
-	  this.location = e.location;
+      this.location = e.location;
       this.appInfo = this.$appInfo.safeAreaInsets
       this.winHeight = this.$appInfo.windowHeight
       this.street_code = e.street
diff --git a/pages/store/detail/index.vue b/pages/store/detail/index.vue
index 51d0552..109fbc1 100644
--- a/pages/store/detail/index.vue
+++ b/pages/store/detail/index.vue
@@ -210,11 +210,19 @@ export default {
 				type: 'routine'
 			};
 			//#endif
+      // #ifndef MP
+      params = {
+      	type: 'app'
+      };
+      //#endif
 			merchantQrcode(this.id, params)
 				.then(res => {
+          console.log('二维码', res);
 					this.storeCode = res.data.url;
 				})
-				.catch(err => {});
+				.catch(err => {
+          console.log('二维码错误', err);
+        });
 		},
 		// #ifdef MP
 		// 小程序保存图片