diff --git a/manifest.json b/manifest.json index a915bb8..7e39406 100644 --- a/manifest.json +++ b/manifest.json @@ -116,14 +116,14 @@ "scope.userLocation" : { "desc" : "获取当前所在城市位置" }, - "makePhoneCall": { - "desc": "用于拨打电话" - } + "makePhoneCall" : { + "desc" : "用于拨打电话" + } }, "optimization" : { "subPackages" : true }, - "requiredPrivateInfos" : [ "chooseAddress","getLocation" ] + "requiredPrivateInfos" : [ "chooseAddress", "getLocation" ] }, "mp-alipay" : { "usingComponents" : true diff --git a/pages/activity/charts.vue b/pages/activity/charts.vue index 295fc2e..ef86bbe 100644 --- a/pages/activity/charts.vue +++ b/pages/activity/charts.vue @@ -60,12 +60,12 @@ - {{item.name}}榜 - + GO @@ -131,12 +131,15 @@ this.rankList = data.list } }, - toBack() { + toBack(item) { // let pages = getCurrentPages(); // let beforePage = pages[pages.length - 2] // console.log(this.removeAfter(pages, 'pages/activity/ranking')) - uni.redirectTo({ - url: '/pages/activity/ranking' + // uni.redirectTo({ + // url: '/pages/activity/ranking' + // }) + uni.navigateTo({ + url: '/pages/activity/charts?categoryId=' + item.category_id + '&name=' + item.name }) }, removeAfter(arr, value) { diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue index 6f36950..a83f5fe 100644 --- a/pages/news1/wallet.vue +++ b/pages/news1/wallet.vue @@ -51,7 +51,7 @@ - + 全部 @@ -256,10 +256,11 @@