diff --git a/pages.json b/pages.json index 20477bf..452c838 100644 --- a/pages.json +++ b/pages.json @@ -243,6 +243,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/demandHall/enterprisePage/index", + "style": { + "navigationBarTitleText": "企业主页", + "enablePullDownRefresh": true + } + }, { "path": "pages/demandHall/demoInvestment/index", "style": { @@ -264,6 +271,7 @@ "enablePullDownRefresh": true } }, + { "path": "pages/release/index", "style": { diff --git a/pages/demandHall/companyDetail/index.vue b/pages/demandHall/companyDetail/index.vue index 9b56e07..34c916b 100644 --- a/pages/demandHall/companyDetail/index.vue +++ b/pages/demandHall/companyDetail/index.vue @@ -195,7 +195,7 @@ export default { */ onLoad: function (options) { this.setData({ - id: options.id + id: options.id }); this.getDetail(); }, diff --git a/pages/demandHall/demoInvestment/index.vue b/pages/demandHall/demoInvestment/index.vue index 80aff97..e64012e 100644 --- a/pages/demandHall/demoInvestment/index.vue +++ b/pages/demandHall/demoInvestment/index.vue @@ -76,20 +76,50 @@ - + + + 项目领域 + + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + + + + 项目阶段 + + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + + + + 项目标签 + + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + 农林牧鱼 + + + + 重置 完成 @@ -117,39 +147,44 @@ cName: "", } }, - onLoad: function (options) { - this.getCagetoryList(); - }, + // onLoad: function (options) { + // this.getCagetoryList(); + // }, methods:{ tabClick(e) { this.setData({ active: e.currentTarget.dataset.i, }) }, - getCagetoryList() { - app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => { - if (res.data.success) { - this.setData({ - cagetoryList: res.data.data - }); - } - }); - }, + // getCagetoryList() { + // app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => { + // if (res.data.success) { + // this.setData({ + // cagetoryList: res.data.data + // }); + // } + // }); + // }, showDialog() { this.setData({ showScreenDialog: true }); }, - cagetoryClick(e) { - let item = e.currentTarget.dataset.item; - let i = e.currentTarget.dataset.i; - console.log(item); + showhaha() { this.setData({ - cagetoryActive: i, - resourceCagetoryId: item.id, - choseCagetory: item.cagetoryName + showScreenDialog: true }); }, + // cagetoryClick(e) { + // let item = e.currentTarget.dataset.item; + // let i = e.currentTarget.dataset.i; + // console.log(item); + // this.setData({ + // cagetoryActive: i, + // resourceCagetoryId: item.id, + // choseCagetory: item.cagetoryName + // }); + // }, businessChange(e) { let type = e.currentTarget.dataset.type; let name = e.currentTarget.dataset.name; @@ -435,9 +470,9 @@ .mask-box{ width: 100%; height: 100vh; - background: rgba(0,0,0,.6); + background: rgba(0,0,0,.5); position:fixed; - top: 0;/* #ifdef H5 */ + top: 190rpx;/* #ifdef H5 */ top: calc(88rpx + constant(safe-area-inset-top)); top: calc(88rpx + env(safe-area-inset-top));/* #endif */ left: 0; @@ -445,13 +480,13 @@ } .screen-dialog-box{ - width: 602rpx; + width: 590rpx; height: 100%; - /* padding-bottom: 160rpx; */ + padding-top: 10rpx; overflow-y: scroll; background-color: #fff; position: absolute; - top: 0; + top: 0rpx; right: 0rpx; animation: move 200ms ease; } @@ -469,29 +504,29 @@ .screen-item{ width: 100%; padding: 0 38rpx; - padding-bottom: 22rpx; - border-bottom: 2rpx solid #EEEEEE; + overflow: hidden; + transform: all .2s linear; } .screen-title{ - font-size: 24rpx; - color: #000; + font-size: 28rpx; + color: #343434; margin-bottom: 32rpx; + font-weight: 600 + ; } .screen-item{ padding-top: 40rpx; } .screen-item .item{ - width: 162rpx; - height: 48rpx; - line-height: 48rpx; + width: 152rpx; + height: 64rpx; + line-height: 64rpx; text-align: center; font-size: 24rpx; color: #666666; background: #F6F6F6; - border-radius: 4rpx; - margin-bottom: 20rpx; - margin-right: 20rpx; + margin: 0 32rpx 32rpx 0; } .screen-item .item:nth-child(3n){ margin-right: 0; @@ -523,18 +558,19 @@ color: #393939; } .submit-box{ - width: 602rpx; - height: 100rpx; - box-shadow: 2rpx 0px 12rpx rgba(0, 0, 0, 0.16); - position: fixed; - bottom: 0; - right: 0; + width: 376rpx; + height: 64rpx; + margin: 0 auto; + margin-top: 64rpx; } .submit-box .btn{ - width: 50%; - height: 100%; - line-height: 100rpx; - text-align: center; + width: 152rpx; + height: 64rpx; + line-height: 64rpx; + text-align: center; + border-radius: 12rpx; + color: #FF5100; + border: 2rpx solid #FF9665; } .submit-box .finish{ background: #FF660C; diff --git a/pages/demandHall/enterprisePage/index.vue b/pages/demandHall/enterprisePage/index.vue new file mode 100644 index 0000000..b4f45cb --- /dev/null +++ b/pages/demandHall/enterprisePage/index.vue @@ -0,0 +1,350 @@ + + + + + diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue index f84ef69..34fac17 100644 --- a/pages/demandHall/enterpriseServer/index.vue +++ b/pages/demandHall/enterpriseServer/index.vue @@ -2,30 +2,32 @@ - + - + 搜一下 - 服务列表 - 企业列表 - - - 筛选 - - + 服务列表 + 企业列表 + + + 筛选 + + - + - - + + - + + + APP开发平台搭建外卖小程序返现H5定制一站式解决 @@ -43,48 +45,56 @@ - - 企业 + + + {{item.enterpriseType == 1 ? '企业' : '个人'}} + - - 招聘前端工程师若干名 + + + + {{item.enterpriseName}} - 商务合作 - 场地租赁 + {{item.cname}} + - 专注微信小程序及微信公众号开发,模板定制化服务,十年经... + {{item.enterpriseTitle}} - - + - - - - 所有服务 - - {{item.cagetoryName}} - - - - 商家身份(所有商家均实名认证) - - 个人认证 - 企业认证 - - - - 重置 - 完成 - - - + + + + 所有服务 + + {{item.cagetoryName}} + + + + 商家身份(所有商家均实名认证) + + 个人认证 + 企业认证 + + + + 重置 + 完成 + + + @@ -92,9 +102,9 @@ diff --git a/pages/demandHall/index.vue b/pages/demandHall/index.vue index 4a4c4e2..84531b3 100644 --- a/pages/demandHall/index.vue +++ b/pages/demandHall/index.vue @@ -1,86 +1,90 @@ \ No newline at end of file + @keyframes move { + 0% { + transform: translateX(800rpx); + } + + 100% { + transform: translateX(0rpx); + } + } + + .screen-item { + width: 100%; + padding: 0 38rpx; + padding-bottom: 22rpx; + border-bottom: 2rpx solid #EEEEEE; + } + + .screen-title { + font-size: 24rpx; + color: #000; + margin-bottom: 32rpx; + } + + .screen-item { + padding-top: 40rpx; + } + + .screen-item .item { + width: 162rpx; + height: 48rpx; + line-height: 48rpx; + text-align: center; + font-size: 24rpx; + color: #666666; + background: #F6F6F6; + border-radius: 4rpx; + margin-bottom: 20rpx; + margin-right: 20rpx; + } + + .screen-item .item:nth-child(3n) { + margin-right: 0; + } + + .screen-item .item-active { + border: 2rpx solid #FF6E33; + color: #FE7D26; + background: #FDEFE6; + } + + .across-line { + width: 44rpx; + height: 2rpx; + background: #ACABAB; + margin: 0 12rpx; + } + + .low-price { + width: 228rpx; + height: 60rpx; + background: #F6F5F5; + border-radius: 4rpx; + } + + .low-price input { + width: 100%; + height: 100%; + text-align: center; + } + + .fz20 { + font-size: 20rpx; + color: #393939; + } + + .submit-box { + width: 602rpx; + height: 100rpx; + box-shadow: 2rpx 0px 12rpx rgba(0, 0, 0, 0.16); + position: fixed; + bottom: 0; + right: 0; + } + + .submit-box .btn { + width: 50%; + height: 100%; + line-height: 100rpx; + text-align: center; + } + + .submit-box .finish { + background: #FF660C; + color: #fff; + } +