Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !71

src/pages/cart/cart.js

@@ -36,7 +36,14 @@ wxService.page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    
+    wxService.getSystemInfo().then(res => {
+      const { statusBarHeight } = res
+      const { currentHeight, currentMarginTop, currentPaddingTop } = this.data
+      this.setData({
+        currentHeight: currentHeight + statusBarHeight,
+      })
+    })
+    console.log(this.data.currentHeight)
   },
 
   /**
@@ -49,15 +56,6 @@ wxService.page({
         selected: 2
       })
     }
-    wxService.getSystemInfo().then(res => {
-      const { statusBarHeight } = res
-      const { currentHeight, currentMarginTop, currentPaddingTop } = this.data
-      this.setData({
-        currentHeight: currentHeight + statusBarHeight,
-      })
-    })
-    console.log(this.data.currentHeight)
-    
   },
 
   //选择商品

src/project.config.json

@@ -262,10 +262,10 @@
 					"id": -1,
 					"name": "分享",
 					"pathName": "subPackage/page/pages/share/share",
-          "query": "",
-          "scene": null
-        },
-        {
+					"query": "",
+					"scene": null
+				},
+				{
 					"id": 33,
 					"name": "支付状态",
 					"pathName": "subPackage/page/pages/paymentStatus/paymentStatus",