Merge branch 'dev' into feature-zyw

# Conflicts:
#	src/project.config.json

src/project.config.json

@@ -37,7 +37,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 11,
+			"current": -1,
 			"list": [
 				{
 					"id": -1,
@@ -53,49 +53,31 @@
 				},
 				{
 					"id": -1,
-					"name": "会员规则",
-					"pathName": "pages/memberRules/memberRules",
-					"query": ""
-				},
-				{
-					"id": -1,
 					"name": "消费详情",
 					"pathName": "pages/consumptionDetails/consumptionDetails",
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "积分流水",
+					"id": 6,
+					"name": "券码详情页",
 					"pathName": "pages/couponDetail/couponDetail",
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "积分流水",
-					"pathName": "pages/consumptionDetails/consumptionDetails",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "积分流水",
-					"pathName": "pages/couponDetail/couponDetail",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "积分流水",
+					"id": 7,
+					"name": "会员规则",
 					"pathName": "pages/memberRules/memberRules",
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "积分流水",
+					"id": 8,
+					"name": "积分商城",
 					"pathName": "pages/IntegralMall/IntegralMall",
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "积分流水",
+					"id": 9,
+					"name": "积分兑换详情页",
 					"pathName": "pages/integralMallDetail/integralMallDetail",
 					"query": ""
 				},
@@ -104,11 +86,6 @@
 					"name": "welvcom",
 					"pathName": "pages/welcome/welcome",
 					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "消费",
-					"pathName": "pages/mySpend/mySpend"
 				}
 			]
 		}

src/utils/wxService.js

@@ -300,12 +300,14 @@ class WXService extends Http {
     const { sr } = this.getApp()
     const CONFIG_PAPGE = {
       onLoad: function (...args) {
-        // const app = _self.getApp()
         const page = this
+        _self.initAppGlobalDataSync()
+        config.onLoad && config.onLoad.apply(page, args)
       },
       onShow: function (...args) {
         const page = this
-     
+        _self.currentPage = page
+        config.onShow && config.onShow.apply(page, args)
     
       },
       onReady: function (...args) {
@@ -313,7 +315,7 @@ class WXService extends Http {
       },
       onHide: function (...args) {
         const page = this
-     
+        config.onHide && config.onHide.apply(this, args)
       
       },
       onUnload: function (...args) {