diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue index 59a340c..6b3a330 100644 --- a/pages/demandHall/business/index.vue +++ b/pages/demandHall/business/index.vue @@ -46,7 +46,7 @@ - + {{item.enterpriseName}} {{item.cname}} @@ -194,7 +194,7 @@ }, toCompanyDetail(id) { uni.navigateTo({ - url:"/pages/demandHall/companyDetail/index?id=" + id + url:"/pages/demandHall/enterprisePage/index?id=" + id }) }, //换一批 diff --git a/pages/demandHall/enterprisePage/index.vue b/pages/demandHall/enterprisePage/index.vue index 05b6391..a265607 100644 --- a/pages/demandHall/enterprisePage/index.vue +++ b/pages/demandHall/enterprisePage/index.vue @@ -223,7 +223,7 @@ } } .contact-box{ - width: 500rpx; + width: 670rpx; height: 106rpx; font-size: 24rpx; font-weight: 500; @@ -235,7 +235,7 @@ margin-right: 10rpx; } .line1{ - width: 470rpx; + width: 620rpx; line-height: 30rpx; } } diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue index 6209c4d..7c5b0f3 100644 --- a/pages/demandHall/enterpriseServer/index.vue +++ b/pages/demandHall/enterpriseServer/index.vue @@ -21,7 +21,8 @@ - + {{item.enterpriseType == 1 ? '企业' : '个人'}} @@ -35,20 +36,21 @@ ¥{{item.totalMoney}} - - + {{item.enterpriseType == 1 ? '企业' : '个人'}} - + {{item.enterpriseName}} @@ -129,7 +131,7 @@ }); if (e.currentTarget.dataset.i == 2) { this.getCompanyList(); - } else{ + } else { this.getPageData(); } }, @@ -157,7 +159,7 @@ showScreenDialog: true }); }, - + // 所有服务 cagetoryClick(e) { let item = e.currentTarget.dataset.item; @@ -169,7 +171,7 @@ choseCagetory: item.cagetoryName }); }, - + // 个人/企业认证 businessChange(e) { let type = e.currentTarget.dataset.type; @@ -179,14 +181,14 @@ enterpriseType: type }); }, - + // 完成 finishClick() { this.setData({ showScreenDialog: false }); }, - + // 重置 resetClick() { this.setData({ @@ -200,34 +202,34 @@ }, //获取服务列表 getPageData() { - if (this.loading) { - app.http('post', `Resources/listResources?page=${this.pageNumber}&size=${this.pageSize}`, { - resourceType: 1, - resourceCagetoryId: this.resourceCagetoryId, - enterpriseType: this.enterpriseType - }).then(res => { - if (res.data.success) { - uni.stopPullDownRefresh(); - if (res.data.data.content.length < this.pageSize) { - this.setData({ - loading: false - }); - } - - if (this.pageNumber > 0) { - this.setData({ - resourceList: this.resourceList.concat(res.data.data.content) - }); - } else { - this.setData({ - resourceList: res.data.data.content - }); - } - } - }); - } else { - uni.stopPullDownRefresh(); - } + if (this.loading) { + app.http('post', `Resources/listResources?page=${this.pageNumber}&size=${this.pageSize}`, { + resourceType: 1, + resourceCagetoryId: this.resourceCagetoryId, + enterpriseType: this.enterpriseType + }).then(res => { + if (res.data.success) { + uni.stopPullDownRefresh(); + if (res.data.data.content.length < this.pageSize) { + this.setData({ + loading: false + }); + } + + if (this.pageNumber > 0) { + this.setData({ + resourceList: this.resourceList.concat(res.data.data.content) + }); + } else { + this.setData({ + resourceList: res.data.data.content + }); + } + } + }); + } else { + uni.stopPullDownRefresh(); + } }, toResourceDetail(e) { let id = e.currentTarget.dataset.id; @@ -247,9 +249,10 @@