diff --git a/src/components/list-item.vue b/src/components/list-item.vue index 7ec3d19..6c5f0ab 100644 --- a/src/components/list-item.vue +++ b/src/components/list-item.vue @@ -50,9 +50,37 @@ export default { }, 0) this.$emit('clickItem', { _id: id }) requestUtil.postData('/view', { _id: id }) - wx.reLaunch({ - url: `/pages/details/main?_id=${id}` - }) + let objs = getCurrentPages(); + console.log('wx.getCurrentPages'); + console.log(objs); + let n = 0; + let bfind = false; + for(let i = objs.length - 1; i >=0; i--){ + let obj = objs[i]; + if(obj.route != 'pages/details/main'){ + n++; + continue; + } + if(obj.options && obj.options._id == id){ + bfind = true; + break; + } + n++; + } + if(bfind){ + if(n == 0){ + wx.pageScrollTo({scrollTop: 0}); + }else{ + wx.navigateBack({ + delta: n + }) + } + + }else{ + wx.navigateTo({ + url: `/pages/details/main?_id=${id}` + }) + } } } } diff --git a/src/pages/details/index.vue b/src/pages/details/index.vue index 66b2c71..e451bb6 100644 --- a/src/pages/details/index.vue +++ b/src/pages/details/index.vue @@ -118,7 +118,7 @@ export default { margin: 0 auto; padding: 60rpx 32rpx; background-color: #fffdf5; - border: 4px solid #ffdc34; + border: 8rpx solid #ffdc34; } .title { position: absolute; @@ -197,7 +197,7 @@ export default { margin-top: 30rpx; .list { background-color: #fff; - border: 4rpx solid #ffdc34; + border: 6rpx solid #ffdc34; .list-hd { display: flex; justify-content: space-between; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 1ddd2fe..c6d3134 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -177,7 +177,7 @@ export default { }) }, goSearch() { - wx.redirectTo({ + wx.navigateTo({ url: `/pages/search/main` }) }, @@ -226,7 +226,7 @@ export default { margin: 0 auto; padding: 90rpx 32rpx 90rpx; background-color: #fffdf5; - border: 4px solid #ffdc34; + border: 8rpx solid #ffdc34; } .title { .l { diff --git a/src/pages/result/index.vue b/src/pages/result/index.vue index 1f71a8e..1aff446 100644 --- a/src/pages/result/index.vue +++ b/src/pages/result/index.vue @@ -337,7 +337,7 @@ export default { margin-top: 30rpx; .list { background-color: #fff; - border: 4rpx solid #ffdc34; + border: 6rpx solid #ffdc34; .list-hd { display: flex; justify-content: space-between;