diff --git a/pages.json b/pages.json index 771a82f..89bfafb 100644 --- a/pages.json +++ b/pages.json @@ -497,12 +497,19 @@ "iconPath": "/static/tabbarComponent/icon/home.png", "selectedIconPath": "/static/tabbarComponent/icon/home-a.png" }, + // { + // "pagePath": "pages/demandHall/index", + // "text": "供需大厅", + // "iconPath": "/static/tabbarComponent/icon/tab2.png", + // "selectedIconPath": "/static/tabbarComponent/icon/tab2-a.png" + // }, { - "pagePath": "pages/demandHall/index", - "text": "供需大厅", + "pagePath": "pages/demandHall/business/index", + "text": "商业", "iconPath": "/static/tabbarComponent/icon/tab2.png", "selectedIconPath": "/static/tabbarComponent/icon/tab2-a.png" }, + { "pagePath": "pages/life/index", "text": "生活", diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue index 031fd90..b2a4d74 100644 --- a/pages/demandHall/business/index.vue +++ b/pages/demandHall/business/index.vue @@ -9,11 +9,11 @@ - + - - + + @@ -60,7 +60,7 @@ - + @@ -99,32 +99,67 @@ 装修服务 - + - - - - - - - - 富硒产品 - - 农业项目、国家扶贫、乡村振兴、国家红利 - - 持续盈利 - 财务规范 - 零负债 - + + + + + + + + 富硒产品 + + 农业项目、国家扶贫、乡村振兴、国家红利 + + 持续盈利 + 财务规范 + 零负债 + diff --git a/pages/demandHall/demoInvestment/index.vue b/pages/demandHall/demoInvestment/index.vue index e64012e..4864a3c 100644 --- a/pages/demandHall/demoInvestment/index.vue +++ b/pages/demandHall/demoInvestment/index.vue @@ -21,7 +21,7 @@ - + @@ -210,6 +210,12 @@ choseCagetory: '', }); }, + + toProjectDetail(e){ + uni.navigateTo({ + url:"/pages/demandHall/projectDetail/index" + }) + } } } diff --git a/pages/demandHall/index.vue b/pages/demandHall/index.vue index 98ca69e..acc3cec 100644 --- a/pages/demandHall/index.vue +++ b/pages/demandHall/index.vue @@ -234,7 +234,6 @@ loading: true, pageNumber: 0, }); - this.getPageData(); }, methods: { diff --git a/pages/demandHall/projectDetail/index.vue b/pages/demandHall/projectDetail/index.vue index 6f79c64..1e5832f 100644 --- a/pages/demandHall/projectDetail/index.vue +++ b/pages/demandHall/projectDetail/index.vue @@ -48,7 +48,7 @@ 换一批 - + @@ -62,7 +62,7 @@ - + 联系项目方 @@ -129,33 +129,35 @@ height: 128rpx; margin-left: auto; } - + } -.category-box { - .tag { - width: 112rpx; - height: 36rpx; - border-radius: 4rpx; - font-size: 20rpx; - margin-right: 8rpx; - text-align: center; - } - .tag-item-b { - border: 1rpx solid #3A9EFA; - color: #3A9EFA; - } + .category-box { + .tag { + width: 112rpx; + height: 36rpx; + border-radius: 4rpx; + font-size: 20rpx; + margin-right: 5rpx; + text-align: center; + } - .tag-item-y { - border: 1px solid #FFAA00; - color: #FFAA00; - } + .tag-item-b { + border: 1rpx solid #3A9EFA; + color: #3A9EFA; + } - .tag-item-p { - color: #FC9367; - border: 1px solid #FC9367; - } + .tag-item-y { + border: 1px solid #FFAA00; + color: #FFAA00; + } + + .tag-item-p { + color: #FC9367; + border: 1px solid #FC9367; } + } + .region { width: 670rpx; height: 112rpx; @@ -216,40 +218,46 @@ height: 36rpx; margin-right: 10rpx; } -.mask-box{ - width: 750rpx; - height: 384rpx; - background: #fff; - box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.01); - filter: blur(6rpx); - position: fixed; - top: 390rpx; -} -.mask-con{ - width: 484rpx; - height: 136rpx; - z-index: 9999; -} -.con{ - font-size: 36rpx; - font-weight: 600; - color: #FF5100; - margin-bottom: 20rpx; -} -.authentication-btn{ - width: 148rpx; - height: 52rpx; - background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%); - border-radius: 12rpx; - font-size: 24rpx; - font-weight: 600; - line-height: 52rpx; - color: #FFFFFF; - text-align: center; -} - .recommend-box .title{ + + .mask-box { + width: 750rpx; + height: 384rpx; + background: #fff; + box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.01); + filter: blur(6rpx); + position: fixed; + top: 390rpx; + } + + .mask-con { + width: 484rpx; + height: 136rpx; + z-index: 9999; + } + + .con { + font-size: 36rpx; + font-weight: 600; + color: #FF5100; + margin-bottom: 20rpx; + } + + .authentication-btn { + width: 148rpx; + height: 52rpx; + background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%); + border-radius: 12rpx; + font-size: 24rpx; + font-weight: 600; + line-height: 52rpx; + color: #FFFFFF; + text-align: center; + } + + .recommend-box .title { margin-left: 32rpx; } + .recommend-box { width: 750rpx; height: 528rpx; @@ -258,7 +266,7 @@ // padding: 24rpx 0 0 32rpx; padding: 24rpx 0 0 0rpx; } - + .update-box { width: 670rpx; height: 48rpx; @@ -267,29 +275,34 @@ margin-bottom: 26rpx; margin-left: 32rpx; } - .update-icon{ + + .update-icon { width: 118rpx; height: 48rpx; background: #FFFFFF; box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16); border-radius: 24rpx; font-size: 20rpx; - line-height: 26rpx;color: #666666; + line-height: 26rpx; + color: #666666; margin-left: auto; } - .update-icon image{ + + .update-icon image { width: 26rpx; height: 26rpx; background: rgba(0, 0, 0, 0); margin-right: 10rpx; } - .scroll-view_H{ + + .scroll-view_H { width: 100%; height: 345rpx; white-space: nowrap; padding-left: 22rpx; } - .recommend-list{ + + .recommend-list { width: 392rpx; background: #FFFFFF; box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16); @@ -299,29 +312,34 @@ display: inline-block; margin: 0 22rpx 0 10rpx; } - .recommend-list image{ + + .recommend-list image { width: 392rpx; height: 194rpx; border-radius: 12rpx 12rpx 0 0; } - .recommend-bottom{ + + .recommend-bottom { height: 130rpx; padding: 0 16rpx 15rpx 24rpx; } - .title-item{ + + .title-item { height: 30rpx; line-height: 30rpx; font-size: 28rpx; font-weight: 600; color: #1D1D1D; } - .footer{ + + .footer { width: 100%; height: 132rpx; background: #FFFFFF; padding: 32rpx 32rpx 0 0; } - .toContact{ + + .toContact { width: 223rpx; height: 76rpx; line-height: 76rpx; diff --git a/pages/demandHall/supplyHall/index.vue b/pages/demandHall/supplyHall/index.vue index 1ac9b41..58560d4 100644 --- a/pages/demandHall/supplyHall/index.vue +++ b/pages/demandHall/supplyHall/index.vue @@ -2,28 +2,30 @@ - + - + 搜一下 - 需求广场 - 供应广场 - - - 筛选 - - + 需求广场 + 供应广场 + + + 筛选 + + - + - - + + - + + {{item.enterpriseType == 1 ? '企业' : '个人'}} + - - + + + {{item.enterpriseType == 1 ? '企业' : '个人'}} + - 招聘前端工程师若干名 - 2K-10K + {{item.title}} + {{item.capital}} - 网站建设 - APP开发 - 2021.8.30截止报名 + + {{item.cname}} + {{item.resourceEndTime}}截止报名 湖北知音动漫有限公司 - + 查看详情 - + + {{item.enterpriseType == 1 ? '企业' : '个人'}} + - + + {{item.enterpriseType == 1 ? '企业' : '个人'}} + @@ -101,27 +111,31 @@ - - - - 所有服务 - - {{item.cagetoryName}} - - - - 商家身份(所有商家均实名认证) - - 个人认证 - 企业认证 - - - - 重置 - 完成 - - - + + + + 所有服务 + + {{item.cagetoryName}} + + + + 商家身份(所有商家均实名认证) + + 个人认证 + 企业认证 + + + + 重置 + 完成 + + + @@ -129,9 +143,9 @@ diff --git a/pages/release/index.vue b/pages/release/index.vue index ceb5f6e..ea82244 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -1,332 +1,358 @@ \ No newline at end of file + /* pages/release/index.wxss */ + + .auth-btn-box { + width: 100%; + margin-top: 300rpx; + } + + .auth-btn { + width: 310rpx; + height: 101rpx; + background: linear-gradient(137deg, #FFCDB8 0%, #FF9060 100%); + border-radius: 12rpx; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + margin-bottom: 50rpx; + } + + .auth-btn image { + width: 32rpx; + height: 32rpx; + transform: rotate(180deg); + } + + .bgG { + background: linear-gradient(137deg, #BFD7F9 0%, #A8C8F6 100%); + } + + .posi { + position: absolute; + width: 100%; + bottom: 100rpx; + } + + .top30 { + bottom: 30%; + } + + .tips-box { + /* margin-top: 15%; */ + } + + .tips { + color: #FF0000; + font-size: 26rpx; + padding-left: 54rpx; + margin-bottom: 10rpx; + } + + .icon { + width: 26rpx; + height: 26rpx; + border: 1rpx solid #FF0000; + text-align: center; + line-height: 22rpx; + border-radius: 50%; + font-size: 20rpx; + margin-right: 10rpx; + } + + .btn-box { + width: 100%; + padding: 0 36rpx; + margin-top: 28rpx; + } + + .btn { + width: 320rpx; + height: 378rpx; + position: relative; + } + + .btn-box image { + width: 320rpx; + height: 378rpx; + position: absolute; + left: 0; + top: 0; + } + + .btn-box .default { + filter: grayscale(1); + } + + .btn .tip { + color: #9C9C9C; + font-weight: 500; + font-size: 32rpx; + position: relative; + left: 0; + top: 70rpx; + text-align: center; + z-index: 3; + } + + .btn .auth { + color: #1D1D1D; + } + + .close { + text-align: center; + } + + .close image { + width: 88rpx; + height: 88rpx; + } +