diff --git a/pages/index/index.vue b/pages/index/index.vue index 4b0a551..aad3555 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@ @@ -173,7 +145,9 @@ import signInOnePopup from '@/components/user/signInOnePopup.vue' import dynamicItem from '@/components/list/dynamic/dynamicItem.vue' import mixinsList from '@/mixins/list.js' - import { mapState } from 'vuex' + import { + mapState + } from 'vuex' export default { mixins: [mixinsList], components: { @@ -189,17 +163,17 @@ data() { return { // headInfo: {}, - menu : [], - mixinsListApi : 'getPostPage', - bannerList : [], - onShowData : false, + menu: [], + mixinsListApi: 'getPostPage', + bannerList: [], + onShowData: false, } }, onLoad(query) { - if(query.shareId){ + if (query.shareId) { uni.setStorageSync('shareId', query.shareId) } - + this.getData() // this.getIndexHeaderInfo() this.$store.commit('getIndexHeaderInfo') @@ -228,65 +202,75 @@ }, methods: { tabsClick(item) { - if(item.index){ + if (item.index) { this.queryParams.classId = item.id - }else{ + } else { delete this.queryParams.classId } this.getData() }, + menuClick(url) { + + if (!url){ + uni.showToast({ + title:'暂未开放,请耐心等待', + icon: 'none' + }) + return + } + // 跳转页面 if (url.includes('reLaunch:')) { uni.reLaunch({ - url : url.replace('reLaunch:', '') + url: url.replace('reLaunch:', '') }) - }else{ + } else { uni.navigateTo({ url }) } }, //获取首页头部信息 - getIndexHeaderInfo(){ - this.$api('getIndexHeaderInfo',res =>{ - if(res.code == 200){ + getIndexHeaderInfo() { + this.$api('getIndexHeaderInfo', res => { + if (res.code == 200) { this.headInfo = res.result } }) }, //获取菜单 - getClassifyList(){ - this.$api('getClassifyList',res =>{ - if(res.code == 200){ + getClassifyList() { + this.$api('getClassifyList', res => { + if (res.code == 200) { this.menu = res.result } }) }, //获取菜单 - getClassifyList(){ - this.$api('getClassifyList',res =>{ - if(res.code == 200){ + getClassifyList() { + this.$api('getClassifyList', res => { + if (res.code == 200) { this.menu = res.result } }) }, // 获取banner - getBannerList(){ - this.$api('getBannerList', res =>{ - if(res.code == 200){ + getBannerList() { + this.$api('getBannerList', res => { + if (res.code == 200) { this.bannerList = res.result } }) }, - join(){ - if(!uni.getStorageSync('token')){ + join() { + if (!uni.getStorageSync('token')) { uni.navigateTo({ url: '/pages_order/auth/wxLogin' }) return } - + // if(this.userInfo.idCardOpen == 0){ // uni.showToast({ // title: '审核中...', @@ -295,12 +279,12 @@ // }else if(!this.userInfo.idCardOpen){ // this.$refs.certificationPopup.open() // }else{ - this.$refs.sharePopup.open() + this.$refs.sharePopup.open() // } - + }, - getUserInfo(){ - if(uni.getStorageSync('token')){ + getUserInfo() { + if (uni.getStorageSync('token')) { this.$store.commit('getUserInfo') } }, @@ -309,25 +293,29 @@ \ No newline at end of file diff --git a/pages_order/components/list/cart/cartItem.vue b/pages_order/components/list/cart/cartItem.vue index 80abf10..044ab83 100644 --- a/pages_order/components/list/cart/cartItem.vue +++ b/pages_order/components/list/cart/cartItem.vue @@ -32,57 +32,80 @@ - - - 车找人 {{item.num}}空位 - - - - 联系 + + + + {{item.createBy}} + + + + + + + + + 始 - - - {{item.startAddress}} + + {{item.startAddress}} + - - - - 终 + + —— - - {{item.endAddress}} + + + 终 + + + {{item.endAddress}} + - - - 出发时间:{{item.startTime}} + + + 空位:{{item.num}} - - + + + + + @@ -123,37 +158,46 @@ .touxinag { - height: 70rpx; - width: 70rpx; - image{ + height: 150rpx; + width: 150rpx; + + image { width: 100%; height: 100%; } } - .chezhaoren { + .box { + margin-top: 20rpx; + width: 70%; display: flex; - justify-content: center; - align-items: center; - margin-right: auto; - margin-left: 10rpx; - border: 1rpx solid $uni-color; - height: 40rpx; - padding: 16rpx; - color: $uni-color; - border-radius: 10rpx; - } + justify-content: space-around; + // background-color: gold; + + .chezhaoren { + display: flex; + justify-content: center; + align-items: center; + margin-right: auto; + margin-left: 10rpx; + border: 1rpx solid $uni-color; + height: 40rpx; + padding: 16rpx; + color: $uni-color; + border-radius: 10rpx; + } - .lianxi { - color: #fff; - background-color: $uni-color; - height: 70rpx; - display: flex; - justify-content: center; - align-items: center; - width: 120rpx; - border-radius: 15rpx; - margin: 0rpx 20rpx; + .lianxi { + // color: #fff; + // background-color: $uni-color; + // height: 70rpx; + // display: flex; + // justify-content: center; + // align-items: center; + // width: 120rpx; + // border-radius: 15rpx; + // margin: 0rpx 20rpx; + } } } @@ -161,6 +205,7 @@ .address { display: flex; margin: 0rpx 10rpx; + align-items: center; .shi { margin-right: 10rpx; @@ -177,6 +222,10 @@ margin-top: 5rpx; } + + .oo { + margin: 0rpx 5rpx; + } } .ads { @@ -194,15 +243,29 @@ text-align: center; } } + .pepo{ + margin: 10rpx 10rpx; + } .time { margin: 10rpx 10rpx; } - .chexing { + .Vehicleinformation { margin: 10rpx 10rpx; + // display: flex; + + .chexing { + + } + + .Licenseplate { + margin: 5rpx 0rpx; + } } + + .chezhuxinxi { display: flex; margin: 10rpx 10rpx;