diff --git a/components/CustomNavigator.vue b/components/CustomNavigator.vue new file mode 100644 index 0000000..ef60374 --- /dev/null +++ b/components/CustomNavigator.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/config/index.js b/config/index.js index bf80009..93ee94a 100644 --- a/config/index.js +++ b/config/index.js @@ -1,7 +1,7 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // 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 = 'http://192.168.1.34: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 = 'https://thapi.xinxintuan.co/api' diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue index 1bc963c..643cc82 100644 --- a/pages/demandHall/business/index.vue +++ b/pages/demandHall/business/index.vue @@ -166,7 +166,6 @@ }) }, toResourcesDetail(id){ - console.log(id,'id') return if(id){ this.$yrouter.push({ @@ -229,7 +228,7 @@ // 认证 toAuthentication(e){ uni.navigateTo({ - url:"/pages/release/index2" + url:"/pages/release/index" }) } }, diff --git a/pages/demandHall/supplyHall/index.vue b/pages/demandHall/supplyHall/index.vue index 93a08cc..95cee35 100644 --- a/pages/demandHall/supplyHall/index.vue +++ b/pages/demandHall/supplyHall/index.vue @@ -27,7 +27,7 @@ {{item.enterpriseType == 1 ? '企业' : '个人'}} - {{item.title}} + {{item.title}} {{item.capital}} + 活动中心 ￥{{item.price}} - 进行中 - 立即报名 + + 筹备中 + 报名中 + 待举办 + 已结束 @@ -46,10 +50,19 @@ mounted: function() { this.getIndexData() }, + onPullDownRefresh(){ + this.getIndexData() + }, methods: { + backClick(){ + uni.navigateBack({ + delta: 1 + }) + }, getIndexData() { getIndexData().then(res => { this.activity = res.data.recommendActivity.content + uni.stopPullDownRefresh() }) }, toActiveDetail(e) { @@ -80,6 +93,14 @@ color: #fff; position: absolute; text-align: center; + image{ + width: 36rpx; + height: 36rpx; + position: absolute; + left: 36rpx; + top: 50%; + margin-top: -18rpx; + } } .activity-box { @@ -106,7 +127,7 @@ .act-con { width: 450rpx; - height: 236rpx; + // height: 236rpx; padding: 5rpx 0; .title { diff --git a/pages/home/index.vue b/pages/home/index.vue index fde4347..7ef5ac8 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -2,12 +2,13 @@ - - + --> + @@ -163,21 +164,22 @@ import { mapGetters } from 'vuex' - import tabbar from "../../tabbarComponent/tabbar"; + + import CustomNav from '@/components/CustomNavigator.vue' import vSwiper from '@/components/vSwiper.vue' import skeleton from '@/components/quick-skeleton/quick-skeleton' const app = getApp(); export default { components: { - tabbar, vSwiper, - skeleton + skeleton, + CustomNav }, - name: "GoodsClass", computed: mapGetters(['userInfo']), props: {}, data: function() { return { + title: '禅易云生态', category: [], navActive: 0, search: "", diff --git a/pages/information/index.vue b/pages/information/index.vue index b361f9c..975675f 100644 --- a/pages/information/index.vue +++ b/pages/information/index.vue @@ -7,11 +7,11 @@ 搜一下 - + {{item.title}} - {{item.title}} + {{item.createTime}} @@ -35,7 +35,7 @@ {{item.author}} {{item.createTime.split(' ')[0]}} - 203 + {{item.visit}} @@ -189,7 +189,7 @@ height: 68rpx; border: 2rpx solid #FF5100; border-radius: 8rpx; - margin: 52rpx auto; + margin: 24rpx auto 52rpx; font-size: 28rpx; position: relative; } diff --git a/pages/life/index.vue b/pages/life/index.vue index ac79b90..553553f 100644 --- a/pages/life/index.vue +++ b/pages/life/index.vue @@ -145,7 +145,7 @@ export default { // }, mounted: function () { this.getProducts(); - this.getActivity(); + // this.getActivity(); }, onReachBottom() { if (this.isLoad) { diff --git a/pages/release/index.vue b/pages/release/index.vue index ea82244..3ff7899 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -1,358 +1,461 @@ +/* pages/release/index.wxss */ +.guid-box{ + width: 662rpx; + height: 140rpx; + margin: 196rpx 46rpx 60rpx 40rpx; + position: relative; +} +.guid-title{ + width: 192rpx; + height: 56rpx; + font-size: 42rpx; + color: #1D1D1D; +} +.handbook-img{ + width: 200rpx; + height: 56rpx; +} +.title-s{ + width: 650rpx; + height: 74rpx; + font-size: 24rpx; + color: #1D1D1D; + margin-top: 10rpx; +} +.arror-r{ + width: 21rpx; + height: 39rpx; + position: absolute; + right: 0; + top: 16rpx; +} + +.auth-btn-box{ + width: 100%; + margin-top: 60rpx; +} +.auth-btn{ + width: 666rpx; + height: 134rpx; + box-shadow: 0px 0px 12rpx rgba(164, 164, 164, 0.16); + border-radius: 12rpx; + margin-bottom: 22rpx; + background: #FFFFFF; + position: relative; +} +.auth-headimg{ + margin: 0 44rpx 0 44rpx; +} +.person-img{ + width: 73rpx; + height: 68rpx; +} +.business-img{ + width: 65rpx; + height: 73rpx; +} +.investor-img{ + width: 65rpx; + height: 73rpx; +} +.auth-title{ + width: 454rpx; + height: 40rpx; +} +.auth-title-h{ + width: 445rpx; + font-size: 24rpx; + color: #686868; +} +.tojump{ + width: 21rpx; + height: 39rpx; + position: absolute; + right: 32rpx; +} + +.posi{ + width: 100%; + bottom: 100rpx; + margin-top: 50rpx; +} +.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: 598rpx; + margin: 0 auto; +} +.btn{ + width: 598rpx; + height: 150rpx; + background: #F8F8F8; + border-radius: 148px; + position: relative; + margin-bottom: 42rpx; +} +.btn-res{ + background: #FF783A; +} +.btn-need{ + background: #6AA5FF; +} +.btn-demo{ + background: #ACAAFF; +} +.btn-box image{ + width: 98rpx; + height: 98rpx; + margin: 0 32rpx 0 42rpx; +} +.btn-box .default{ + filter: grayscale(100%); +} +.bgGary{ + /* -webkit-filter:grayscale(100%); */ +} +.btn .tip{ + color: #FFFFFF; + font-weight: 500; + font-size: 32rpx; + margin-bottom: 12rpx; +} +.tip-s{ + font-size: 24rpx; + color: #FFFFFF; +} +.close { + text-align: center; + margin: 114rpx 0 180rpx 0; +} +.close image{ + width: 40rpx; + height: 40rpx; +} + \ No newline at end of file diff --git a/pages/release/index2.vue b/pages/release/index2.vue index 3ff7899..ea82244 100644 --- a/pages/release/index2.vue +++ b/pages/release/index2.vue @@ -1,461 +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; + } + diff --git a/pages/user/index.vue b/pages/user/index.vue index 8191671..ec4d5af 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -2,7 +2,9 @@ - 禅易云生态 + + + {{authType == 1 ? '企业' : '个人'}}中心 @@ -108,7 +110,7 @@ - 发布需求 + 发布供应 @@ -221,6 +223,7 @@