diff --git a/pages/index/index.vue b/pages/index/index.vue index 7d55081..4744ca4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1141,7 +1141,7 @@ this.remen() }else if(this.currentTabFl=='2'){// 全部项目 uni.navigateTo({ - url:'/pages/my/fuwuGengduo' + url:'/pages/my/fuwuGengduo?text='+'index' }) }else if(this.currentTabFl=='3'){//行业大拿 uni.navigateTo({ diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue index 6f4efa0..2b575a1 100644 --- a/pages/my/fuwuGengduo.vue +++ b/pages/my/fuwuGengduo.vue @@ -6,7 +6,7 @@ - 全部项目 + {{title}} - + @@ -44,7 +44,7 @@ - + {{item.title}} @@ -164,14 +164,29 @@ // 分类列表 tabCurrent: 0, productTitle: '氧气罐', - type:'1' + type:'1', + textName:'', + title:'' } }, onLoad(e) { this.myId = uni.getStorageSync('userId') if (e) { - this.searchValue = e.searchValue + 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() this.getData() }, @@ -214,15 +229,23 @@ this.$refs.paging.reload(true); }, queryList(pageNo, pageSize) { + let url='' const params = { - city: '', page: pageNo, limit: pageSize, title: this.searchValue, classifyId: this.classifyId, - type:this.type } - this.$Request.get('/app/massage/package/findPackageAndMassagePage', params).then(res => { + if(this.textName=='index'){ + params.city='' + params.type=this.type + url="/app/massage/package/findPackageAndMassagePage"; + + }else{ + url="/app/artificer/selectMassageTypePage"; + } + + this.$Request.get(url, params).then(res => { for (var i = 0; i < res.data.list.length; i++) { res.data.list[i].tagsData = res.data.list[i].labels.split(','); } diff --git a/pages/my/index.vue b/pages/my/index.vue index b64612e..46f71b3 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -125,6 +125,12 @@ 企业预约 + + + + 单项 + + 常用功能 @@ -185,14 +191,14 @@ 我是渠道商 --> - + 我的团队 @@ -328,6 +334,11 @@ } }, methods: { + danxiang(){ + uni.navigateTo({ + url:'/pages/my/fuwuGengduo?text='+'my' + }) + }, getUserInfo() { this.$Request.get("/app/user/selectUserById").then(res => { console.log("res.data--->", res.data);