Merge branch 'master' of http://123.60.98.226:3000/chenkainan/flavorOfTimeSz

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5be1fe6ef11841cd",
+        "appid" : "wx699ed131345cf8dd",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages/index/index.vue

@@ -87,7 +87,7 @@
 		},
 		// 离开当前页面时获取定位
 		onHide() {
-			this.getLocation()
+			// this.getLocation()
 		},
 		onReady() {
 			this.sendRequest()

static/js/CommonFunction.js

@@ -251,7 +251,7 @@ Vue.prototype.gotoWebUrl = url => {
 Vue.prototype.gotoDetailByType = item => {
 	let url = ''
 	if(item.is_package) {
-		url = '/subPackages/food/detail?id=' + item.product_id
+		url = '/subPackages/food/detail?id=' + (item.product_id || item.id)
 		
 		Vue.prototype.gotoPath(url)
 		return;