diff --git a/pages/index/index.vue b/pages/index/index.vue index c5b6d88..e91704f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -687,7 +687,7 @@ let userId = uni.getStorageSync('userId') if (userId) { uni.navigateTo({ - url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue+'&text='+'index' + url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue }) }else{ uni.navigateTo({ diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue index 555656d..baae980 100644 --- a/pages/my/cikarDrtail.vue +++ b/pages/my/cikarDrtail.vue @@ -1,7 +1,7 @@ @@ -44,7 +44,7 @@ - + {{item.title}} @@ -165,26 +165,12 @@ tabCurrent: 0, productTitle: '氧气罐', type:'1', - textName:'', - title:'' } }, onLoad(e) { this.myId = uni.getStorageSync('userId') if (e) { this.searchValue = e.searchValue; - this.textName=e.text - if(this.textName=='index'){ - this.title='全部项目' - uni.setNavigationBarTitle({ - title: '全部项目' - }); - }else{ - this.title='单项' - uni.setNavigationBarTitle({ - title: '单项' - }); - } } this.tabNav() @@ -229,24 +215,15 @@ this.$refs.paging.reload(true); }, queryList(pageNo, pageSize) { - let url='' const params = { page: pageNo, limit: pageSize, title: this.searchValue, classifyId: this.classifyId, + city:'', + type:this.type } - if(this.textName=='index'){ - params.city='' - params.type=this.type - url="/app/massage/package/findPackageAndMassagePage"; - - }else{ - params.type='1' - url="/app/artificer/selectMassageTypePage"; - } - - this.$Request.get(url, params).then(res => { + this.$Request.get("/app/massage/package/findPackageAndMassagePage", params).then(res => { for (var i = 0; i < res.data.list.length; i++) { res.data.list[i].tagsData = res.data.list[i].labels.split(','); } @@ -273,35 +250,28 @@ this.getData() }, itemClick(item) { - if(this.textName=='index'){ - if (item.type == '104') { - uni.navigateTo({ - url: '/pages/my/serviceOderDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this - .page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon - }) - } else if (item.type == '105') { - uni.navigateTo({ - url: '/pages/my/cikarDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this - .page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon - }) - } else if (item.type == '106') { - uni.navigateTo({ - url: '/pages/my/fuwuliaochengDetail?id=' + item.id + '&limit=' + this.limit + '&page=' + - this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon - }) - } else if(item.type == '114'){ - uni.navigateTo({ - url: '/pages/shop/qiyeDatail?id=' + item.id +'&name=' + 'index' - }) - }else { - uni.navigateTo({ - url: '/pages/my/fuwuDateil?id=' + item.id + '&limit=' + this.limit + '&page=' + this.page + - '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon - }) - } - }else{ + if (item.type == '104') { uni.navigateTo({ - url: '/pages/my/fuwuDateil?id=' + item.massageTypeId + '&limit=' + this.limit + '&page=' + this.page + + url: '/pages/my/serviceOderDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this + .page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon + }) + } else if (item.type == '105') { + uni.navigateTo({ + url: '/pages/my/cikarDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this + .page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon + }) + } else if (item.type == '106') { + uni.navigateTo({ + url: '/pages/my/fuwuliaochengDetail?id=' + item.id + '&limit=' + this.limit + '&page=' + + this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon + }) + } else if(item.type == '114'){ + uni.navigateTo({ + url: '/pages/shop/qiyeDatail?id=' + item.id +'&name=' + 'index' + }) + }else { + uni.navigateTo({ + url: '/pages/my/fuwuDateil?id=' + item.id + '&limit=' + this.limit + '&page=' + this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon }) } diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue index e2506e4..3a966c9 100644 --- a/pages/my/fuwuliaochengDetail.vue +++ b/pages/my/fuwuliaochengDetail.vue @@ -1,7 +1,7 @@