From 70a59b5da832ea1e075b64fd9a7e0716f72f1d4d Mon Sep 17 00:00:00 2001 From: kk_888 <1422704179@qq.com> Date: Mon, 24 Jan 2022 10:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E7=94=9F=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- pages.json | 14 + pages/activity/detail/index.vue | 2 +- pages/demandHall/business/index.vue | 19 +- pages/demandHall/demoInvestment/index.vue | 146 ++---- pages/demandHall/enterprisePage/index.vue | 31 +- pages/demandHall/enterpriseServer/index.vue | 95 ++-- pages/demandHall/newProject/index.vue | 160 ++++++ pages/demandHall/projectDetail/index.vue | 334 ++++++------ pages/demandHall/projectManage/index.vue | 312 +++++++++++ pages/demandHall/supplyHall/index.vue | 42 +- pages/home/index.vue | 547 ++++++++++++-------- pages/information/index.vue | 49 +- pages/life/articleDetail/index.vue | 15 +- pages/shop/GoodsCon/index.vue | 5 +- static/images/home/c1.png | Bin 0 -> 505 bytes static/images/home/c2.png | Bin 0 -> 519 bytes static/images/home/c3.png | Bin 0 -> 636 bytes 18 files changed, 1185 insertions(+), 588 deletions(-) create mode 100644 pages/demandHall/newProject/index.vue create mode 100644 pages/demandHall/projectManage/index.vue create mode 100644 static/images/home/c1.png create mode 100644 static/images/home/c2.png create mode 100644 static/images/home/c3.png diff --git a/config/index.js b/config/index.js index 9ade227..3293949 100644 --- a/config/index.js +++ b/config/index.js @@ -3,7 +3,7 @@ // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' // export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api' export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' -// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; + // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/pages.json b/pages.json index 839277a..d284641 100644 --- a/pages.json +++ b/pages.json @@ -264,6 +264,20 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/demandHall/projectManage/index", + "style": { + "navigationBarTitleText": "项目管理", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/demandHall/newProject/index", + "style": { + "navigationBarTitleText": "新建项目", + "enablePullDownRefresh": true + } + }, { "path": "pages/demandHall/business/index", "style": { diff --git a/pages/activity/detail/index.vue b/pages/activity/detail/index.vue index 029c308..ffb4978 100644 --- a/pages/activity/detail/index.vue +++ b/pages/activity/detail/index.vue @@ -68,7 +68,7 @@ - {{activityDetail.collect ? '已收藏':'收藏'}} + {{activityDetail.collect ? '已收藏':'收藏'}} diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue index 0feb907..b10affa 100644 --- a/pages/demandHall/business/index.vue +++ b/pages/demandHall/business/index.vue @@ -106,13 +106,12 @@ - 富硒产品 + 富硒产品 农业项目、国家扶贫、乡村振兴、国家红利 持续盈利 财务规范 - 零负债 @@ -245,10 +244,10 @@ height: 36rpx; overflow: hidden; .tag { - // width: 112rpx; + width: auto; padding: 0 10rpx; height: 36rpx; - line-height: 33rpx; + line-height: 34rpx; border-radius: 4rpx; font-size: 20rpx; margin-right: 16rpx; @@ -587,6 +586,7 @@ } .right-con { + width: 510rpx; .title { font-weight: 800; height: 35rpx; @@ -596,15 +596,16 @@ width: 48rpx; height: 24rpx; margin-right: 8rpx; - - .title-h { - color: #1D1D1D; - } + } + .title-h { + width: 450rpx; + height: 35rpx; + color: #1D1D1D; } } .title-s { - width: 450rpx; + width: 100%; height: 34rpx; font-size: 24rpx; color: #707070; diff --git a/pages/demandHall/demoInvestment/index.vue b/pages/demandHall/demoInvestment/index.vue index 59b20d7..b2eaca1 100644 --- a/pages/demandHall/demoInvestment/index.vue +++ b/pages/demandHall/demoInvestment/index.vue @@ -28,9 +28,9 @@ - 富硒产品 + 富硒产品 - 农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持 + 农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持 持续盈利 财务规范 @@ -40,7 +40,7 @@ 融资金额 - 200万元-300万元 + 200万元-300万元 查看 @@ -56,14 +56,14 @@ - 李岩斌 - + 李岩斌 + 朗玛峰创投 合伙人 - 意向领域：智能硬件、企业IT服务... - 投资伦次：A轮、A+轮、B轮 + 意向领域：智能硬件、企业IT服务... + 投资伦次：A轮、A+轮、B轮 @@ -72,53 +72,30 @@ - + - - - 项目领域 - - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 + + 项目领域 + + {{item.cagetoryName}} 项目阶段 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 + 农林牧鱼 项目标签 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 - 农林牧鱼 + 农林牧鱼 - 重置 完成 @@ -137,60 +114,40 @@ active: '1', showScreenDialog: false, cagetoryActive: "", - //筛选企业/个人 - resourceCagetoryId: '', - // 分类列表 - enterpriseType: '', //筛选分类 choseCagetory: '', - choseBusiness: '', - 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 - // }); - // } - // }); - // }, - showDialog() { - this.setData({ - showScreenDialog: true + getCagetoryList() { + app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => { + if (res.data.success) { + this.setData({ + cagetoryList: res.data.data + }); + } }); }, - showhaha() { + showDialog() { this.setData({ 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; + cagetoryClick(e) { + let item = e.currentTarget.dataset.item; + let i = e.currentTarget.dataset.i; + console.log(item); this.setData({ - choseBusiness: name, - enterpriseType: type + cagetoryActive: i, + choseCagetory: item.cagetoryName }); }, @@ -202,11 +159,7 @@ resetClick() { this.setData({ - cName: '', cagetoryActive: null, - resourceCagetoryId: '', - enterpriseType: '', - choseBusiness: '', choseCagetory: '', }); }, @@ -338,16 +291,19 @@ margin-right: 18rpx; } .right-con { + width: 450rpx; .title { - line-height: 24rpx; + line-height: 35rpx; font-weight: 800; .new-icon { width: 48rpx; height: 24rpx; margin-right: 8rpx; - .title-h { - color: #1D1D1D; - } + } + .title-h { + width: 390rpx; + height: 35rpx; + color: #1D1D1D; } } .title-s { @@ -357,23 +313,29 @@ color: #707070; } .category-box { + width: 100%; + height: 36rpx; + overflow: hidden; .tag { - width: 112rpx; + padding: 0 10rpx; height: 36rpx; - line-height: 33rpx; + line-height: 34rpx; border-radius: 4rpx; font-size: 20rpx; margin-right: 16rpx; text-align: center; } + .tag-item-b { border: 1rpx solid #3A9EFA; color: #3A9EFA; } + .tag-item-y { border: 1px solid #FFAA00; color: #FFAA00; } + .tag-item-p { color: #FC9367; border: 1px solid #FC9367; @@ -382,8 +344,9 @@ } } .project-bottom { + width: 100%; height: 40rpx; - margin: 0 45rpx 0 20rpx; + padding: 0 45rpx 0 20rpx; color: #FF5100; font-size: 24rpx; .finance-price { @@ -391,6 +354,7 @@ font-weight: 900; } .price { + width: 350rpx; font-weight: 900; } .tocheck { @@ -442,6 +406,7 @@ color: #707070; .name { width: 100%; + height: 38rpx; font-size: 32rpx; font-weight: bold; color: #1D1D1D; @@ -531,7 +496,7 @@ width: 152rpx; height: 64rpx; line-height: 64rpx; - text-align: center; + text-align: center; font-size: 24rpx; color: #666666; background: #F6F6F6; @@ -541,9 +506,8 @@ margin-right: 0; } .screen-item .item-active{ - border: 2rpx solid #FF6E33; - color: #FE7D26; - background: #FDEFE6; + color: #fff; + background: #FF6D31; } .across-line{ width: 44rpx; diff --git a/pages/demandHall/enterprisePage/index.vue b/pages/demandHall/enterprisePage/index.vue index 31f36be..05b6391 100644 --- a/pages/demandHall/enterprisePage/index.vue +++ b/pages/demandHall/enterprisePage/index.vue @@ -14,15 +14,15 @@ - + {{detail.enterpriseAddress}} - + {{detail.enterpriseNet}} - + {{detail.enterprisePhone}} @@ -178,9 +178,10 @@ width: 134rpx; height: 134rpx; margin-right: 26rpx; + border-radius: 8rpx; } .info-right { - width: 470rpx; + width: 510rpx; height: 134rpx; color: #FFFFFF; font-size: 24rpx; @@ -189,28 +190,40 @@ font-size: 32rpx; } .category-box { + width: 100%; + height: 36rpx; + overflow: hidden; .tag { width: auto; - padding: 0 10rpx; + padding: 0 15rpx; height: 36rpx; line-height: 36rpx; border-radius: 8rpx; font-size: 20rpx; - margin-right: 12rpx; + margin-right: 16rpx; text-align: center; - color: #fff; } + .tag-item-b { background: #5D8AFD; + color: #fff; } + .tag-item-y { + border: 1px solid #FFAA00; + color: #fff; + + } + + .tag-item-p { + color: #fff; background: #FD855B; } } } } .contact-box{ - width: 460rpx; + width: 500rpx; height: 106rpx; font-size: 24rpx; font-weight: 500; @@ -222,7 +235,7 @@ margin-right: 10rpx; } .line1{ - width: 400rpx; + width: 470rpx; line-height: 30rpx; } } diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue index 82cea9a..4e80873 100644 --- a/pages/demandHall/enterpriseServer/index.vue +++ b/pages/demandHall/enterpriseServer/index.vue @@ -37,11 +37,11 @@ ￥20,000 - @@ -51,7 +51,7 @@ - + {{item.enterpriseName}} {{item.cname}} @@ -63,6 +63,10 @@ + + @@ -329,16 +333,10 @@ border-radius: 12rpx; } - .user-info { - margin: 8rpx 0 0rpx 20rpx; + .enterprise-info { + margin: 8rpx 20rpx 0rpx 20rpx; padding-bottom: 16rpx; } - - .user-name { - height: 40rpx; - color: #1D1D1D; - margin: 0 10rpx 0 16rpx; - } .category-box{ width: 100%; height: 36rpx; @@ -346,7 +344,7 @@ .tag { width: auto; height: 36rpx; - line-height: 28rpx; + line-height: 34rpx; border-radius: 4rpx; font-size: 20rpx; margin-right: 8rpx; @@ -373,18 +371,21 @@ color: #FC9367; border: 1px solid #FC9367; } - + .enterprise-name{ + max-width: 382rpx; + height: 40rpx; + color: #1D1D1D; + margin: 0 10rpx 0 16rpx; + } .todetails { width: 148rpx; height: 44rpx; line-height: 44rpx; background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%); border-radius: 8rpx; - position: absolute; - right: 18rpx; - bottom: 38rpx; text-align: center; color: #fff; + margin-left: auto; } .enterprise-list { @@ -393,7 +394,6 @@ margin: 0 auto; margin-top: 32rpx; border-radius: 12rpx; - position: relative; } .enterprise-price { @@ -421,7 +421,6 @@ .content-right { width: 456rpx; - position: relative; } .content-right>.supply-screen { @@ -439,7 +438,7 @@ margin: 0 auto; margin-top: 32rpx; border-radius: 12rpx; - position: relative; + padding-bottom: 30rpx; } .business-lable { @@ -455,41 +454,40 @@ .bg2 { background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%); } - - .business-con { + width: 100%; margin: 8rpx 20rpx 16rpx 20rpx; + .logo-img { + width: 154rpx; + height: 154rpx; + margin-right: 20rpx; + } + .con-right{ + width: 450rpx; + .title-h { + width: 100%; + height: 44rpx; + font-size: 32rpx; + color: #1D1D1D; + margin-bottom: 8rpx; + } + .title-s { + width: 456rpx; + height: 65rpx; + font-size: 24rpx; + color: #666666; + margin-top: 10rpx; + overflow: hidden; + text-overflow: ellipsis; + } + } + } - - .logo-img { - width: 154rpx; - height: 154rpx; - margin-right: 20rpx; - } - - .title-h { - width: 450rpx; - height: 44rpx; - font-size: 32rpx; - color: #1D1D1D; - margin-bottom: 8rpx; - } - - .title-s { - width: 456rpx; - height: 65rpx; - font-size: 24rpx; - color: #666666; - margin-top: 10rpx; - overflow: hidden; - text-overflow: ellipsis; - } - .business-img { width: 630rpx; height: 176rpx; margin: 0 20rpx; - padding-bottom: 30rpx; + overflow: hidden; } .business-img image { @@ -572,6 +570,7 @@ } .screen-item .item-active { + line-height: 44rpx; border: 2rpx solid #FF6E33; color: #FE7D26; background: #FDEFE6; diff --git a/pages/demandHall/newProject/index.vue b/pages/demandHall/newProject/index.vue new file mode 100644 index 0000000..650a920 --- /dev/null +++ b/pages/demandHall/newProject/index.vue @@ -0,0 +1,160 @@ +