Compare commits

..

No commits in common. '99d8a466ec2c3acc96e7376239b1567b481f7052' and 'e06f4c8692b2b8e4d3a2d3944d8061d2e876dc3d' have entirely different histories.

  1. 4
      App.vue
  2. 2
      config/index.js
  3. 5
      manifest.json
  4. 23
      pages.json
  5. 67
      pages/demandHall/business/index.vue
  6. 8
      pages/demandHall/demoInvestment/index.vue
  7. 3
      pages/demandHall/index.vue
  8. 22
      pages/demandHall/projectDetail/index.vue
  9. 195
      pages/demandHall/supplyHall/index.vue
  10. 6
      pages/home/index.vue
  11. 4
      pages/home/index2.vue
  12. 378
      pages/information/index.vue
  13. 2
      pages/life/index.vue
  14. 40
      pages/release/index.vue
  15. 2
      pages/shop/GoodsClass/index.vue
  16. 4
      pages/shop/GoodsCon/index.vue
  17. 2
      pages/user/index.vue

4
App.vue

@ -7,7 +7,7 @@ export default {
var that = this; //
this.setMenuHeight();
this.autoUpdate();
// uni.hideTabBar()
uni.hideTabBar()
},
globalData: {
baseURL: VUE_APP_API_URL+ '/',
@ -27,7 +27,7 @@ export default {
onShow(e) {
this.globalData.scene = e.scene
//tabbar
// uni.hideTabBar();
uni.hideTabBar();
var query = {};
if (e.query.q) {
//storage

2
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.0.111: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'

5
manifest.json

@ -69,10 +69,5 @@
},
"mp-toutiao": {
"usingComponents": true
},
"h5" : {
"router" : {
"mode" : "history"
}
}
}

23
pages.json

@ -478,12 +478,6 @@
"style": {
"navigationBarTitleText": "退货列表"
}
},
{
"path": "pages/information/index",
"style": {
"navigationBarTitleText": "资讯广场"
}
}
],
"tabBar": {
@ -497,31 +491,18 @@
"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/business/index",
"text": "商业",
"pagePath": "pages/demandHall/index",
"text": "供需大厅",
"iconPath": "/static/tabbarComponent/icon/tab2.png",
"selectedIconPath": "/static/tabbarComponent/icon/tab2-a.png"
},
{
"pagePath": "pages/life/index",
"text": "生活",
"iconPath": "/static/tabbarComponent/icon/tab3.png",
"selectedIconPath": "/static/tabbarComponent/icon/tab3-a.png"
},
{
"pagePath": "pages/information/index",
"text": "资讯",
"iconPath": "/static/tabbarComponent/icon/tab3.png",
"selectedIconPath": "/static/tabbarComponent/icon/tab3-a.png"
},
{
"pagePath": "pages/user/index",
"text": "我的",

67
pages/demandHall/business/index.vue

@ -9,11 +9,11 @@
<!-- 供需大厅 企业服务 项目投融 -->
<view class="acea-row row-around pa40">
<view class="img1">
<image src="../../../static/images/business-img1.png" @tap="toSupplyHall"></image>
<image src="../../../static/images/business-img1.png"></image>
</view>
<view class="img2 acea-row row-column-between">
<image src="../../../static/images/business-img2.png" @tap="toEnterpriseServer"></image>
<image src="../../../static/images/business-img3.png" @tap="toDemoInvestment"></image>
<image src="../../../static/images/business-img2.png"></image>
<image src="../../../static/images/business-img3.png"></image>
</view>
</view>
@ -60,7 +60,7 @@
<view class="service-box">
<view class="title-con acea-row row-middle">
<image src="../../../static/images/business-title2.png" class="title-img"></image>
<image src="../../../static/images/fabu-close.png" class="toadd" @tap="toAuthentication"></image>
<image src="../../../static/images/fabu-close.png" class="toadd"></image>
</view>
<view class="service-top acea-row row-between">
<view class="service-nub-left acea-row row-column-between">
@ -125,41 +125,6 @@
</template>
<script>
export default {
data() {
return {
};
},
methods:{
//
toSupplyHall(e){
// let id = e.currentTarget.dataset.id;
uni.navigateTo({
url:"/pages/demandHall/supplyHall/index"
})
},
//
toEnterpriseServer(e){
uni.navigateTo({
url:"/pages/demandHall/enterpriseServer/index"
})
},
//
toDemoInvestment(e){
uni.navigateTo({
url:"/pages/demandHall/demoInvestment/index"
})
},
//
toAuthentication(e){
uni.navigateTo({
url:"/pages/release/index2"
})
}
},
}
</script>
<style lang="less">
@ -259,7 +224,6 @@
.company-box {
height: 380rpx;
.update-icon {
width: 118rpx;
height: 48rpx;
@ -284,7 +248,6 @@
height: 330rpx;
white-space: nowrap;
margin-left: 30rpx;
.company-list {
width: 408rpx;
height: 304rpx;
@ -294,7 +257,6 @@
padding: 16rpx 24rpx;
display: inline-block;
margin: 15rpx 30rpx 0 10rpx;
.title {
font-size: 28rpx;
font-weight: 600;
@ -358,19 +320,16 @@
.service-box {
width: 100%;
height: 496rpx;
.toadd {
width: 88rpx;
height: 88rpx;
margin-left: auto;
transform: rotate(45deg);
}
.service-top {
padding: 0 40rpx;
height: 272rpx;
margin: 8rpx 0 16rpx 0;
.service-nub-left {
width: 344rpx;
height: 272rpx;
@ -378,16 +337,13 @@
border-radius: 12rpx;
padding: 14rpx 24rpx;
}
.service-nub-left image {
width: 288rpx;
height: 162rpx;
}
.service-nub-right {
width: 310rpx;
height: 272rpx;
.module-nub {
width: 310rpx;
height: 128rpx;
@ -397,7 +353,6 @@
}
}
}
.service-bottom {
padding: 0 40rpx;
height: 112rpx;
@ -413,7 +368,6 @@
}
}
}
.module-box {
width: 184rpx;
height: 112rpx;
@ -448,7 +402,6 @@
.module-nub .tips {
color: #FF7636;
}
.service-top .module-box {
width: 144rpx;
height: 128rpx;
@ -461,43 +414,36 @@
.project-box{
width: 100%;
height: 610rpx;
.project-list{
width: 100%;
height: 180rpx;
padding: 26rpx 40rpx;
border-bottom: 1rpx solid #DCDCDC;
.project-img{
width: 128rpx;
height: 128rpx;
margin-right: 32rpx;
}
.right-con {
.title {
font-weight: 800;
height: 35rpx;
line-height: 35rpx;
.new-icon {
width: 48rpx;
height: 24rpx;
margin-right: 8rpx;
.title-h {
color: #1D1D1D;
}
}
}
.title-s {
width: 450rpx;
height: 34rpx;
font-size: 24rpx;
color: #707070;
}
.category-box {
.tag {
width: 112rpx;
@ -508,17 +454,14 @@
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;
@ -527,8 +470,8 @@
}
}
}
.project-box .title-img{
margin: 35rpx 0 -15rpx 40rpx;
}
</style>

8
pages/demandHall/demoInvestment/index.vue

@ -21,7 +21,7 @@
<view class="modular-box">
<!-- 全部项目 -->
<view class="project-box" v-if="active == 1">
<view class="project-list" v-for="(item,index) in 2" @tap="toProjectDetail">
<view class="project-list" v-for="(item,index) in 2">
<view class="project-top acea-row row-left">
<image src="../../../static/images/home/menu6.png" class="project-img"></image>
<view class="right-con acea-row row-column-between">
@ -210,12 +210,6 @@
choseCagetory: '',
});
},
toProjectDetail(e){
uni.navigateTo({
url:"/pages/demandHall/projectDetail/index"
})
}
}
}
</script>

3
pages/demandHall/index.vue

@ -157,7 +157,7 @@
</view>
</view>
</view>
<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
<tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar>
</view>
</template>
@ -234,6 +234,7 @@
loading: true,
pageNumber: 0,
});
this.getPageData();
},
methods: {

22
pages/demandHall/projectDetail/index.vue

@ -131,14 +131,13 @@
}
}
.category-box {
.tag {
width: 112rpx;
height: 36rpx;
border-radius: 4rpx;
font-size: 20rpx;
margin-right: 5rpx;
margin-right: 8rpx;
text-align: center;
}
@ -157,7 +156,6 @@
border: 1px solid #FC9367;
}
}
.region {
width: 670rpx;
height: 112rpx;
@ -218,7 +216,6 @@
height: 36rpx;
margin-right: 10rpx;
}
.mask-box{
width: 750rpx;
height: 384rpx;
@ -228,20 +225,17 @@
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;
@ -253,11 +247,9 @@
color: #FFFFFF;
text-align: center;
}
.recommend-box .title{
margin-left: 32rpx;
}
.recommend-box {
width: 750rpx;
height: 528rpx;
@ -275,7 +267,6 @@
margin-bottom: 26rpx;
margin-left: 32rpx;
}
.update-icon{
width: 118rpx;
height: 48rpx;
@ -283,25 +274,21 @@
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{
width: 26rpx;
height: 26rpx;
background: rgba(0, 0, 0, 0);
margin-right: 10rpx;
}
.scroll-view_H{
width: 100%;
height: 345rpx;
white-space: nowrap;
padding-left: 22rpx;
}
.recommend-list{
width: 392rpx;
background: #FFFFFF;
@ -312,18 +299,15 @@
display: inline-block;
margin: 0 22rpx 0 10rpx;
}
.recommend-list image{
width: 392rpx;
height: 194rpx;
border-radius: 12rpx 12rpx 0 0;
}
.recommend-bottom{
height: 130rpx;
padding: 0 16rpx 15rpx 24rpx;
}
.title-item{
height: 30rpx;
line-height: 30rpx;
@ -331,14 +315,12 @@
font-weight: 600;
color: #1D1D1D;
}
.footer{
width: 100%;
height: 132rpx;
background: #FFFFFF;
padding: 32rpx 32rpx 0 0;
}
.toContact{
width: 223rpx;
height: 76rpx;

195
pages/demandHall/supplyHall/index.vue

@ -23,9 +23,7 @@
<view class="resource-box" v-if="active == 1" >
<!-- 个人 -->
<view class="personal-list" v-for="(item,index) in 2" :key="index">
<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '' )">
{{item.enterpriseType == 1 ? '企业' : '个人'}}
</view>
<image src="../../../static/images/backhome.png" mode="" class="lable-img"></image>
<view class="acea-row row-column-between info-box">
<view class="user-info acea-row row-middle">
<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
@ -43,19 +41,15 @@
<view class="todetails">查看详情</view>
</view>
<!-- 企业 -->
<view class="enterprise-list" v-for="(item, index) in list" :key="index" @tap="toNeedsDetail"
:data-id="item.id">
<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '' )">
{{item.enterpriseType == 1 ? '企业' : '个人'}}
</view>
<view class="enterprise-list">
<image src="../../../static/images/act-time.png" mode="" class="lable-img"></image>
<view class="enterprise-box acea-row row-column-between">
<view class="title-h">{{item.title}}</view>
<view class="enterprise-price">{{item.capital}}</view>
<view class="title-h">招聘前端工程师若干名</view>
<view class="enterprise-price">2K-10K</view>
<view class="supply-screen acea-row">
<!-- <view class="tag-item-y tag">网站建设</view>
<view class="tag-item-p tag">APP开发</view> -->
<view class="tag-item-p tag">{{item.cname}}</view>
<view class="time-end-t">{{item.resourceEndTime}}截止报名</view>
<view class="tag-item-y tag">网站建设</view>
<view class="tag-item-p tag">APP开发</view>
<view class="time-end-t">2021.8.30截止报名</view>
</view>
<view class="enterprise-info acea-row row-middle">
<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
@ -68,9 +62,7 @@
</view>
<view class="company-box" v-if="active == 2">
<view class="personal-list">
<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '' )">
{{item.enterpriseType == 1 ? '企业' : '个人'}}
</view>
<image src="../../../static/images/backhome.png" mode="" class="lable-img"></image>
<view class="acea-row row-column-between info-box">
<view class="user-info acea-row row-middle">
<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
@ -88,9 +80,7 @@
<view class="todetails">查看详情</view>
</view>
<view class="enterprise-list">
<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '' )">
{{item.enterpriseType == 1 ? '企业' : '个人'}}
</view>
<image src="../../../static/images/act-time.png" mode="" class="lable-img"></image>
<view class="enterprise-con acea-row">
<image src="../../../static/images/home/menu6.png" class="enterprise-img"></image>
<view class="content-right acea-row row-column-between">
@ -116,18 +106,14 @@
<view class="screen-item">
<view class="screen-title">所有服务</view>
<view class="acea-row">
<view v-for="(item, index) in cagetoryList" :key="index"
:class="'item ' + (cagetoryActive == index ? 'item-active' : '')" @tap="cagetoryClick"
:data-i="index" :data-item="item">{{item.cagetoryName}}</view>
<view v-for="(item, index) in cagetoryList" :key="index" :class="'item ' + (cagetoryActive == index ? 'item-active' : '')" @tap="cagetoryClick" :data-i="index" :data-item="item">{{item.cagetoryName}}</view>
</view>
</view>
<view class="screen-item">
<view class="screen-title">商家身份<text class="fz20">(所有商家均实名认证)</text></view>
<view class="acea-row">
<view :class="'item ' + (enterpriseType == 2 ? 'item-active' : '')" @tap="businessChange"
data-name="个人认证" data-type="2">个人认证</view>
<view :class="'item ' + (enterpriseType == 1 ? 'item-active' : '')" @tap="businessChange"
data-name="企业认证" data-type="1">企业认证</view>
<view :class="'item ' + (enterpriseType == 2 ? 'item-active' : '')" @tap="businessChange" data-name="个人认证" data-type="2">个人认证</view>
<view :class="'item ' + (enterpriseType == 1 ? 'item-active' : '')" @tap="businessChange" data-name="企业认证" data-type="1">企业认证</view>
</view>
</view>
<view class="submit-box acea-row">
@ -156,45 +142,26 @@
choseCagetory: '',
choseBusiness: '',
cName: "",
//
list: [],
pageNumber: 0,
pageSize: 5,
loading: true,
}
},
onShow: function() {
this.getPageData();
},
onPullDownRefresh: function() {
this.setData({
loading: true,
pageNumber: 0,
});
this.getPageData();
},
onReachBottom: function() {
this.setData({
pageNumber: this.pageNumber + 1
});
this.getPageData();
onLoad: function (options) {
this.getCagetoryList();
},
methods:{
tabClick(e) {
this.setData({
active: e.currentTarget.dataset.i,
loading: true,
pageNumber: 0,
list: [],
enterpriseType: '',
cagetoryActive: null,
resourceCagetoryId: ''
})
},
getCagetoryList() {
app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => {
if (res.data.success) {
this.setData({
cagetoryList: res.data.data
});
}
});
console.log(this.active)
this.getPageData();
},
showDialog() {
this.setData({
showScreenDialog: true
@ -235,46 +202,6 @@
choseCagetory: '',
});
},
// 广
toNeedsDetail(e) {
let id = e.currentTarget.dataset.id;
uni.navigateTo({
url: '/pages/demandHall/needsDetail/index?id=' + id
});
},
getPageData() {
if (this.loading) {
app.http('post', `Resources/listResources?page=${this.pageNumber}&size=${this.pageSize}`, {
resourceType: this.active,
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({
list: this.list.concat(res.data.data.content)
});
} else {
this.setData({
list: res.data.data.content
});
}
}
});
} else {
uni.stopPullDownRefresh();
}
},
}
}
</script>
@ -286,7 +213,6 @@
background: #F5F5F5;
font-size: 28rpx;
}
/* 导航栏 */
.navigation-box{
width: 100%;
@ -294,7 +220,6 @@
background: #fff;
padding-top: 20rpx;
}
.search-box{
width: 670rpx;
height: 68rpx;
@ -302,13 +227,11 @@
border-radius: 8rpx;
margin: 0 auto;
}
.search-box image{
width: 35rpx;
height: 35rpx;
margin: 0 29rpx 0 52rpx;
}
.search{
margin-left: auto;
width: 132rpx;
@ -317,7 +240,6 @@
border-radius: 8rpx;
color: #fff;
}
.resource-tabs{
width: 100%;
padding-top: 10rpx;
@ -325,7 +247,6 @@
border-bottom: 2rpx solid #EEEEEE;
padding-left: 20rpx;
}
.tab{
width: 150rpx;
padding: 26rpx 0;
@ -336,7 +257,6 @@
text-align: center;
margin-left: 115rpx;
}
.tab::after{
display: block;
content: '';
@ -352,11 +272,9 @@
transform:scaleX(0);
transition: all .2s ease,opacity .15s ease;
}
.tab-a{
color: #FF5100;
}
.tab-a::after{
opacity: 1;
transform: scaleX(1);
@ -369,26 +287,21 @@
background: #fff;
margin-left: auto;
}
.screen-result{
color: #FF5100;
}
.screen image{
width: 27rpx;
height: 27rpx;
margin-left: 6rpx;
}
.supplyHall-box{
width: 670rpx;
margin: 0 auto;
}
.resource-box{
width: 100%;
}
/* 个人 */
.personal-list{
width: 100%;
@ -398,38 +311,25 @@
margin-top: 34rpx;
padding-bottom: 32rpx;
}
.tips-item {
.lable-img{
width: 60rpx;
height: 32rpx;
font-size: 20rpx;
color: #fff;
border-radius: 12rpx 0;
text-align: center;
background-color: #007AFF;
margin-bottom: 5rpx;
}
.bg2 {
background: linear-gradient(141deg, #FF6D31 0%, #FFA782 100%);
background: #FFFFFF;
border-radius: 12rpx;
}
.info-box{
height: 214rpx;
padding-left: 20rpx;
}
.head-img{
width: 64rpx;
height: 64rpx;
}
.user-name{
height: 40rpx;
color: #1D1D1D;
margin: 0 10rpx 0 16rpx;
}
.user-address{
width: 80rpx;
height: 28rpx;
@ -440,7 +340,6 @@
color: #FFFFFF;
text-align: center;
}
.user-price{
position: absolute;
right: 58rpx;
@ -448,7 +347,6 @@
color: #FF5100;
font-weight: 600;
}
.supply-con{
height: 40rpx;
color: #1D1D1D;
@ -456,36 +354,30 @@
}
.tag{
width: auto;
width: 112rpx;
height: 36rpx;
border-radius: 4rpx;
font-size: 20rpx;
margin-right: 8rpx;
text-align: center;
padding: 0 10rpx;
}
.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;
}
.time-end{
height: 34rpx;
font-size: 24rpx;
color: #707070;
}
.todetails{
width: 148rpx;
height: 44rpx;
@ -508,12 +400,10 @@
position: relative;
padding-bottom: 15rpx;
}
.enterprise-box{
height: 208rpx;
padding-left: 20rpx;
}
.title-h{
width: 456rpx;
height: 35rpx;
@ -522,19 +412,16 @@
color: #1D1D1D;
font-weight: 600;
}
.enterprise-price{
height: 30rpx;
line-height: 30rpx;
font-size: 28rpx;
color: #FF5100;
}
.head-logo{
width: 72rpx;
height: 72rpx;
}
.time-end-t{
position: absolute;
right: 15rpx;
@ -542,31 +429,26 @@
font-size: 24rpx;
color: #707070;
}
.enterprise-con{
width: 100%;
height: 192rpx;
padding: 0 20rpx;
}
.enterprise-img{
width: 150rpx;
height: 192rpx;
margin-right: 30rpx;
}
.content-right{
width: 450rpx;
height:180rpx;
position: relative;
}
.e-price{
height: 40rpx;
color: #FF5100;
font-weight: 600;
}
.mt20{
padding-left: 20rpx;
}
@ -578,16 +460,13 @@
height: 100vh;
background: rgba(0,0,0,.6);
position:fixed;
top: 0;
/* #ifdef H5 */
top: 0;/* #ifdef H5 */
top: calc(88rpx + constant(safe-area-inset-top));
top: calc(88rpx + env(safe-area-inset-top));
/* #endif */
top: calc(88rpx + env(safe-area-inset-top));/* #endif */
left: 0;
z-index: 9999;
}
.screen-dialog-box{
width: 602rpx;
height: 100%;
@ -599,7 +478,6 @@
right: 0rpx;
animation: move 200ms ease;
}
/* .move{
right: 0rpx;
} */
@ -607,25 +485,21 @@
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;
}
@ -642,42 +516,35 @@
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;
@ -686,14 +553,12 @@
bottom: 0;
right: 0;
}
.submit-box .btn{
width: 50%;
height: 100%;
line-height: 100rpx;
text-align: center;
}
.submit-box .finish{
background: #FF660C;
color: #fff;

6
pages/home/index.vue

@ -136,7 +136,7 @@
</u-waterfall>
<!-- <u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="addRandomData"></u-loadmore> -->
</view>
<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
<tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar>
</view>
</template>
<script>
@ -204,12 +204,12 @@ export default {
onReady:function(){
const that = this;
// that.$refs.skeleton.attachedAction();
that.$refs.skeleton.attachedAction();
that.$refs.skeleton.readyAction();
},
onLoad() {
// uni.hideTabBar()
uni.hideTabBar()
},
mounted: function() {
this.getIndexData()

4
pages/home/index2.vue

@ -152,7 +152,7 @@
<text>更多内容去供需大厅</text>
<image src="/static/images/home/arrow-r.png"></image>
</view>
<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
<tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar>
</view>
</template>
@ -231,7 +231,7 @@ export default {
}
},
onLoad() {
// uni.hideTabBar();
uni.hideTabBar();
// app.globalData.editTabbar();
this.pagePath = '/pages/home/index'
this.getCagetoryList();

378
pages/information/index.vue

@ -1,378 +0,0 @@
<template>
<view class="information-box">
<view class="search-box acea-row row-middle" >
<image src="../../../static/images/search-icon.png" mode=""></image>
<input type="text" value="" placeholder="请输入相关关键词"/>
<view class="search acea-row row-center-wrapper">搜一下</view>
</view>
<view class="vote-box">
<view class="news">
<view class="news-title-h">武汉12月底双层公交车将全面下线</view>
<view class="news-title-s">趁着有时间和你爱的人再去回味一下,那你认为有下线的必要吗</view>
</view>
<view class="vote">
</view>
</view>
<scroll-view class="scroll-view_N" scroll-x="true" >
<view class="rotaion" v-for="(item,index) in 7" :key="index">
<view class="acea-row row-center">
<image src="../../../static/images/collect.png" mode=""></image>
<view class="rotaion-h">今日大事</view>
<view class="rotaion-s">每日热点资讯</view>
</view>
</view>
</scroll-view>
<!-- 最新资讯 -->
<view class="newInfo-box">
<image src="../../../static/images/newInfo.png" mode="" class="newInfo-title-img"></image>
<view class="newInfo" >
<view class="modular acea-row row-between" v-for="(item,index) in 3" :key="index">
<view class="acea-row title" >
<view class="modular-h">海鸥出行将大巴车市场带入平台化阶段提高包车出行效率</view>
<view class="title-l acea-row row-between">
<view>云资讯</view>
<view>1小时前</view>
<view class="acea-row row-middle">203
<image src="../../../static/images/eye.png" mode="" ></image>
</view>
</view>
</view>
<image src="../../../static/images/home/top-bg.png" mode="" ></image>
</view>
</view>
</view>
<!-- 热点精选 -->
<view class="hotspot-box">
<image src="../../../static/images/user/hotspot.png" mode="" class="title-h-img"></image>
<scroll-view class="scroll-view_H acea-row" scroll-x="true" >
<view class="slide-box" v-for="(item,index) in 3" :key="index">
<image src="../../../static/images/home/top-bg.png" mode=""></image>
<view class="hotspot-con">
<view class="hotspot-icon">热点</view>
<view class="hotspot-title-h">禅易云生态加入云生态共建万亿私域资源圈获取海量资源与福利</view>
</view>
</view>
</scroll-view>
</view>
<!-- 值得关注 -->
<view class="follow-box">
<image src="../../../static/images/follow-title.png" mode="" class="title-h-img"></image>
<view class="follow-con" v-for="(item,index) in 3" :key="index">
<view class="follow-top acea-row row-between">
<view class="acea-row follow-title" >
<view class="follow-h">2021中国酒店与商用厨具行业品牌盛会</view>
<view class="follow-title-l acea-row row-between">
<view>云资讯</view>
<view>1小时前</view>
<view class="acea-row row-middle">203
<image src="../../../static/images/eye.png" mode="" ></image>
</view>
</view>
</view>
<image src="../../../static/images/home/top-bg.png" mode="" ></image>
</view>
<view class="follow-bottom acea-row row-middle">
<image src="../../../static/images/collect.png" mode=""></image>
<view class="follow-title-b">
<view class="title-s">云咨詢</view>
<view class="title-con">每天发布商业/生活等相关内容...</view>
</view>
<view class="follow-btn">关注+</view>
</view>
</view>
</view>
</view>
</template>
<script>
</script>
<style>
.information-box{
width: 100%;
height: 100vh;
position: relative;
}
.search-box{
width: 670rpx;
height: 68rpx;
border: 2rpx solid #FF5100;
border-radius: 8rpx;
margin: 52rpx auto;
font-size: 28rpx;
position: relative;
}
.search-box image{
width: 35rpx;
height: 35rpx;
margin: 0 29rpx 0 52rpx;
}
.search{
position: absolute;
right: 0;
width: 132rpx;
height: 68rpx;
background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
border-radius: 8rpx;
color: #fff;
}
.vote-box{
width: 670rpx;
height: 358rpx;
background: #FFFFFF;
box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
border-radius: 16rpx;
margin: 0 auto;
position: relative;
}
.news{
width: 100%;
height: 248rpx;
background: #D2D2D2;
border-radius: 16rpx 16rpx 0 0;
color: #FFF;
position: absolute;
padding-left: 42rpx;
}
.news-title-h{
font-size: 28rpx;
position: absolute;
bottom: 54rpx;
}
.news-title-s{
font-size: 20rpx;
position: absolute;
bottom: 18rpx;
}
.vote{
width: 100%;
height: 110rpx;
position: absolute;
bottom: 0;
border: 1rpx solid #000000;
}
.scroll-view_N{
width: 100%;
height: 228rpx;
margin: 30rpx 0 0 30rpx;
white-space: nowrap;
}
.rotaion{
width: 168rpx;
padding: 32rpx 0 16rpx 0;
background: #FFFFFF;
box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16);
border-radius: 16rpx;
margin: 10rpx 22rpx 20rpx 10rpx;
display: inline-block;
}
.rotaion image{
width: 80rpx;
height: 80rpx;
background: #FF6D2A;
border-radius: 50%;
}
.rotaion-h{
height: 34rpx;
font-size: 24rpx;
color: #333333;
margin: 12rpx 0 4rpx 0;
font-weight: 600;
}
.rotaion-s{
height: 26rpx;
font-size: 18rpx;
color: #9D9D9D;
}
/* 最新资讯 */
.newInfo-box{
margin: 44rpx 0 0rpx 0;
}
.newInfo-title-img{
width: 160rpx;
height: 52rpx;
margin: 0 0 18rpx 38rpx;
}
.newInfo{
width: 100%;
height: 528rpx;
border-top: 2rpx solid #EFEFEF;
}
.modular{
width: 100%;
height: 176rpx;
border-bottom: 2rpx solid #EFEFEF;
padding: 20rpx 40rpx 22rpx 40rpx;
}
.modular-h{
width: 392rpx;
height: 80rpx;
font-size: 28rpx;
color: #4A4A4A;
font-weight: 600;
}
.modular image{
width: 204rpx;
height: 134rpx;
}
.title{
width: 392rpx;
height: 134rpx;
}
.title-l{
width: 310rpx;
height: 34rpx;
font-size: 24rpx;
color: #707070;
}
.title-l image{
width: 24rpx;
height: 24rpx;
margin-left: 5rpx;
}
/* 热点精选 */
.hotspot-box{
width: 100%;
height: 456rpx;
}
.title-h-img{
width: 162rpx;
height: 62rpx;
margin: 32rpx 0 5rpx 40rpx;
}
.scroll-view_H{
width: 100%;
height: 344rpx;
white-space: nowrap;
}
.scroll-view_H image{
width: 670rpx;
height: 344rpx;
border-radius: 10rpx;
position: absolute;
}
.slide-box{
position: relative;
width: 670rpx;
height: 100%;
display: inline-block;
margin-right: 16rpx;
}
.hotspot-con{
width: 588rpx;
height: 130rpx;
bottom: 34rpx;
left: 24rpx;
position: absolute;
}
.hotspot-icon{
width: 72rpx;
height: 32rpx;
background: #FE3737;
border-radius: 12rpx 2rpx 12rpx 0;
position: absolute;
font-size: 22rpx;
color: #fff;
text-align: center;
}
.hotspot-title-h{
width: 588rpx;
height: 80rpx;
font-size: 28rpx;
color: #FFFFFF;
position: absolute;
bottom: 0;
white-space:pre-wrap;
}
/* 值得关注 */
.follow-box{
width: 100%;
height: 950rpx;
margin-bottom: 50rpx;
}
.follow-con{
width: 670rpx;
height: 250rpx;
margin: 0 auto;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.16);
border-radius: 16rpx;
margin-bottom: 32rpx;
}
.follow-top{
width: 100%;
height: 170rpx;
padding: 20rpx 20rpx 26rpx 20rpx;
border-bottom: 1rpx solid #DCDCDC;
}
.follow-top image{
width: 232rpx;
height: 130rpx;
border-radius: 16rpx;
}
.follow-title{
width: 370rpx;
height: 100%;
}
.follow-h{
width: 370rpx;
height: 80rpx;
font-size: 28rpx;
color: #000000;
font-weight: 600;
}
.follow-title-l{
width: 250rpx;
height: 28rpx;
font-size: 20rpx;
color: #707070;
}
.follow-title-l image{
width: 24rpx;
height: 24rpx;
margin-left: 5rpx;
}
.follow-bottom{
width: 100%;
height: 80rpx;
padding: 12rpx 20rpx 16rpx 20rpx;
}
.follow-bottom image{
width: 52rpx;
height: 52rpx;
border-radius: 50%;
margin-right: 8rpx;
}
.follow-title-b{
}
.title-s{
height: 28rpx;
font-size: 20rpx;
margin-bottom: 6rpx;
font-weight: 600;
}
.title-con{
height: 22rpx;
font-size: 16rpx;
color: #707070;
}
.follow-btn{
width: 136rpx;
height: 40rpx;
background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
border-radius: 26rpx;
font-size: 28rpx;
color: #fff;
text-align: center;
position: absolute;
right: 60rpx;
}
</style>

2
pages/life/index.vue

@ -93,7 +93,7 @@
@loadmore="addRandomData"
></u-loadmore>
</view>
<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
<tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar>
</view>
</template>
<script>

40
pages/release/index.vue

@ -2,12 +2,8 @@
<!--pages/release/index.wxml-->
<view class="release-page">
<view class="auth-btn-box acea-row row-column row-middle">
<view class="auth-btn" @tap="toCompanyAuth" v-if="authStatus == 0 || authStatus == 3">企业认证<image
src="/static/images/back.png"></image>
</view>
<view class="auth-btn bgG" @tap="toPersonlAuth" v-if="authStatus == 0 || authStatus == 3">个人认证<image
src="/static/images/back.png"></image>
</view>
<view class="auth-btn" @tap="toCompanyAuth" v-if="authStatus == 0 || authStatus == 3">企业认证<image src="/static/images/back.png"></image></view>
<view class="auth-btn bgG" @tap="toPersonlAuth" v-if="authStatus == 0 || authStatus == 3">个人认证<image src="/static/images/back.png"></image></view>
</view>
<view :class="'posi ' + (authStatus == 1 || authStatus == 2 ? 'top30' : '')">
<view class="tips-box">
@ -36,17 +32,14 @@
<view class="btn-box acea-row row-between">
<view :class="'btn ' + (authStatus == 2 && authType == 1 ? 'auth' : '' )" @tap="toResources">
<view class="tip">我能提供...</view>
<image :class="authStatus == 2 && authType == 1 ? '' : 'default'" src="/static/images/yrz1.png">
</image>
<image :class="authStatus == 2 && authType == 1 ? '' : 'default'" src="/static/images/yrz1.png"></image>
</view>
<view :class="'btn ' + (authStatus == 2 ? 'auth' : '' )" @tap="toNeeds">
<view class="tip">我有需求...</view>
<image :class="authStatus == 2 ? '' : 'default'" src="/static/images/yrz2.png"></image>
</view>
</view>
<view class="close" @tap="back">
<image src="/static/images/fabu-close.png"></image>
</view>
<view class="close" @tap="back"><image src="/static/images/fabu-close.png"></image></view>
</view>
</view>
</template>
@ -198,8 +191,7 @@
}
});
} else if (this.authStatus == 0 && (this.authType == 1 || this.authType == 0) && this.completeState ==
false) {
} else if (this.authStatus == 0 && (this.authType == 1 || this.authType == 0) && this.completeState == false) {
uni.showModal({
title: '提示!',
content: '您还未完成企业认证,点击确定去认证吧~',
@ -221,8 +213,7 @@
uni.navigateTo({
url: '/pages/user/editNeeds/index?type=2'
});
} else if (this.authStatus == 2 && (this.authType == 2 || this.authType == 0) && this.completeState ==
false) {
} else if (this.authStatus == 2 && (this.authType == 2 || this.authType == 0) && this.completeState == false) {
uni.showModal({
title: '提示!',
content: '您还未完善个人信息,点击确定去完善吧~',
@ -234,8 +225,7 @@
}
});
} else if (this.authStatus == 0 && (this.authType == 2 || this.authType == 0) && this.completeState ==
false) {
} else if (this.authStatus == 0 && (this.authType == 2 || this.authType == 0) && this.completeState == false) {
uni.showModal({
title: '提示!',
content: '您还未完成认证,点击上方按钮去认证吧!'
@ -253,7 +243,6 @@
width: 100%;
margin-top: 300rpx;
}
.auth-btn{
width: 310rpx;
height: 101rpx;
@ -265,38 +254,31 @@
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;
@ -307,19 +289,16 @@
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;
@ -327,11 +306,9 @@
left: 0;
top: 0;
}
.btn-box .default{
filter: grayscale(1);
}
.btn .tip{
color: #9C9C9C;
font-weight: 500;
@ -342,15 +319,12 @@
text-align: center;
z-index: 3;
}
.btn .auth{
color: #1D1D1D;
}
.close {
text-align: center;
}
.close image{
width: 88rpx;
height: 88rpx;

2
pages/shop/GoodsClass/index.vue

@ -79,7 +79,7 @@
</view>
</view>
<!-- <view style="height:100rpx;"></view> -->
<!-- <tabbar :pagePath="pagePath"></tabbar> -->
<tabbar :pagePath="pagePath"></tabbar>
</view>
</template>
<script>

4
pages/shop/GoodsCon/index.vue

@ -167,8 +167,8 @@
</view>
<text>购物车</text>
</view>
<view class="bnt acea-row row-right">
<view class="joinCart" @click="joinCart" v-if="!storeInfo.virtualProductId">
<view class="bnt acea-row">
<view class="joinCart" @click="joinCart">
<text>加入购物车</text>
</view>
<view class="buy" @click="tapBuy">

2
pages/user/index.vue

@ -214,7 +214,7 @@
</view>
</view>
</view>
<!-- <tabbar :current="currentTabIndex" tabBarClick="click"></tabbar> -->
<tabbar :current="currentTabIndex" tabBarClick="click"></tabbar>
</view>
</template>

Loading…
Cancel
Save