version 11.0.0

app.js

@@ -13,6 +13,7 @@ App({
       WXAPI.init(subDomain)
     } else {
       WXAPI.init(CONFIG.subDomain)
+      WXAPI.setMerchantId(CONFIG.merchantId)
     }
 
     const that = this;
@@ -64,7 +65,7 @@ App({
         wx.hideToast()
       }
     })
-    WXAPI.queryConfigBatch('mallName,WITHDRAW_MIN,ALLOW_SELF_COLLECTION,order_hx_uids,subscribe_ids,share_profile,adminUserIds,goodsDetailSkuShowType,shopMod,needIdCheck,balance_pay_pwd').then(res => {
+    WXAPI.queryConfigBatch('mallName,WITHDRAW_MIN,ALLOW_SELF_COLLECTION,order_hx_uids,subscribe_ids,share_profile,adminUserIds,goodsDetailSkuShowType,shopMod,needIdCheck,balance_pay_pwd,shipping_address_gps,shipping_address_region_level').then(res => {
       if (res.code == 0) {
         res.data.forEach(config => {
           wx.setStorageSync(config.key, config.value);
@@ -74,6 +75,24 @@ App({
         }
       }
     })
+    // ---------------检测navbar高度
+    let menuButtonObject = wx.getMenuButtonBoundingClientRect();
+    console.log("小程序胶囊信息",menuButtonObject)
+    wx.getSystemInfo({
+      success: res => {
+        let statusBarHeight = res.statusBarHeight,
+          navTop = menuButtonObject.top,//胶囊按钮与顶部的距离
+          navHeight = statusBarHeight + menuButtonObject.height + (menuButtonObject.top - statusBarHeight)*2;//导航高度
+        this.globalData.navHeight = navHeight;
+        this.globalData.navTop = navTop;
+        this.globalData.windowHeight = res.windowHeight;
+        this.globalData.menuButtonObject = menuButtonObject;
+        console.log("navHeight",navHeight);
+      },
+      fail(err) {
+        console.log(err);
+      }
+    })
   },
 
   onShow (e) {

app.json

@@ -7,8 +7,10 @@
     "pages/notice/show",
     "pages/category/category",
     "pages/goods/list",
+    "pages/goods/list-vop",
     "pages/goods/fav",
     "pages/goods-details/index",
+    "pages/goods-details/vop",
     "pages/shop-cart/index",
     "pages/to-pay-order/index",
     "pages/select-address/index",

app.wxss

@@ -1,80 +1,80 @@
-@import 'weui/weui.wxss';
-
-.container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-}
-.space {
-  height:20rpx;
-  background-color: #F2f2f2;
-}
-.safeAreaOldPaddingBttom {
-  padding-bottom: env(safe-area-inset-bottom);
-}
-.safeAreaNewPaddingBttom{
-  padding-bottom: constant(safe-area-inset-bottom);  
-}
-
-.safeAreaOldMarginBttom {
-  margin-bottom: env(safe-area-inset-bottom);
-}
-.safeAreaNewMarginBttom{
-  margin-bottom: constant(safe-area-inset-bottom);  
-}
-
-.no-data {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.no-data .line {
-  width:132rpx;
-  height:2rpx;
-  background: #999;
-}
-.no-data .txt {
-  font-size:26rpx;
-  color:rgba(153,153,153,1);
-  margin: 0 16rpx;
-}
-.ad-img {
-  width: 100vw;
-}
-.badge {
-  position: absolute;
-  top: 0;
-  right: 0;
-  box-sizing: border-box;
-  padding: 6rpx;
-  color: #fff;
-  font-size: 18rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: #e64340;
-  border: 1rpx solid #fff;
-  border-radius: 50%;
-}
-.vw100 {
-  width: 100vw !important;
-}
-
-page {
-  font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
-    Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
-    sans-serif;
-}
-.block-btn {
-  padding: 0 32rpx;
-}
-
-.safe-bottom-box {
-  position: fixed;
-  bottom: calc(env(safe-area-inset-bottom) / 2);
-  left: 0;
-  width: 100vw;
+@import 'weui/weui.wxss';
+
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+.space {
+  height:20rpx;
+  background-color: #F2f2f2;
+}
+.safeAreaOldPaddingBttom {
+  padding-bottom: env(safe-area-inset-bottom);
+}
+.safeAreaNewPaddingBttom{
+  padding-bottom: constant(safe-area-inset-bottom);  
+}
+
+.safeAreaOldMarginBttom {
+  margin-bottom: env(safe-area-inset-bottom);
+}
+.safeAreaNewMarginBttom{
+  margin-bottom: constant(safe-area-inset-bottom);  
+}
+
+.no-data {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.no-data .line {
+  width:132rpx;
+  height:2rpx;
+  background: #999;
+}
+.no-data .txt {
+  font-size:26rpx;
+  color:rgba(153,153,153,1);
+  margin: 0 16rpx;
+}
+.ad-img {
+  width: 100vw;
+}
+.badge {
+  position: absolute;
+  top: 0;
+  right: 0;
+  box-sizing: border-box;
+  padding: 6rpx;
+  color: #fff;
+  font-size: 18rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #e64340;
+  border: 1rpx solid #fff;
+  border-radius: 50%;
+}
+.vw100 {
+  width: 100vw !important;
+}
+
+page {
+  font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
+    Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
+    sans-serif;
+}
+.block-btn {
+  padding: 0 32rpx;
+}
+
+.safe-bottom-box {
+  position: fixed;
+  bottom: calc(env(safe-area-inset-bottom) / 2);
+  left: 0;
+  width: 100vw;
 }