Browse Source

静态页面

master
unknown 10 months ago
parent
commit
05748d6184
  1. 22
      common/css/app.scss
  2. 20
      pages.json
  3. 91
      pages/indexEntry/findCoach/comp/coachItem.vue
  4. 190
      pages/indexEntry/findCoach/findCoach.vue
  5. 14
      pages/indexEntry/findShcool/findShcool.vue
  6. 10
      pages/indexEntry/industryPolicy/industryPolicy.vue
  7. 3
      pages/indexEntry/signIn/signIn.vue
  8. 69
      pages/mineEntry/carLearnHours/carLearnHours.vue
  9. 44
      pages/mineEntry/modelChange/modelChange.vue
  10. 9
      pages/mineEntry/myAppointment/comp/opera.vue
  11. 87
      pages/mineEntry/myAppointment/myAppointment.vue
  12. 3
      pages/mineEntry/myContract/myContract.vue
  13. 3
      pages/mineEntry/myEvaluate/myEvaluate.vue
  14. 24
      pages/mineEntry/myOrder/comp/comp.scss
  15. 18
      pages/mineEntry/myOrder/comp/opera.vue
  16. 59
      pages/mineEntry/myOrder/myOrder.vue
  17. 16
      pages/mineEntry/refund/comp/myform.vue
  18. 43
      pages/mineEntry/refund/refund.vue
  19. 29
      pages/mineEntry/schoolTransfer/schoolTransfer.vue
  20. 2
      pages/tabbar/index/comp/informaItem.vue
  21. 2
      pages/tabbar/index/comp/schoolItem.vue
  22. 35
      pages/tabbar/index/index.vue
  23. 19
      pages/tabbar/learnCar/comp/comp.scss
  24. 29
      pages/tabbar/mine/index.vue
  25. BIN
      static/images/tabbar/btn_xueche_nor - 副本.png
  26. BIN
      static/images/tabbar/btn_xueche_nor.png

22
common/css/app.scss

@ -50,18 +50,7 @@ view {
background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706500065446-0') #F6F7FA no-repeat; background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706500065446-0') #F6F7FA no-repeat;
background-size: 100% ; background-size: 100% ;
} }
.h1 {
text {
color: #999;
}
.active {
color: #333;
&::before {
background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706510133553-0') #F6F7FA no-repeat;
background-size: 100% 100%;
}
}
}
.pad { .pad {
padding: 0 28rpx; padding: 0 28rpx;
} }
@ -99,19 +88,19 @@ image {
.h1 { .h1 {
font-size: 32rpx; font-size: 32rpx;
color: #333;
font-weight: 500;
font-weight: 700; font-weight: 700;
padding: 0 0 0 32rpx;
padding-bottom: 10rpx;
text { text {
position: relative; position: relative;
color: #999;
&.active { &.active {
color: #333;
&::before { &::before {
position: absolute; position: absolute;
content: ''; content: '';
width: 54rpx; width: 54rpx;
height: 12rpx; height: 12rpx;
// background: url('../../static/images/icon/h1Active.png') no-repeat;
background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706510133553-0') #F6F7FA no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
@ -147,6 +136,7 @@ image {
left: 0; left: 0;
width: 100%; width: 100%;
bottom: 30rpx; bottom: 30rpx;
padding: 0 28rpx ;
.btnBg { .btnBg {
width: 100%; width: 100%;
text-align: center; text-align: center;

20
pages.json

@ -194,6 +194,15 @@
} }
}, },
{ {
"path": "findCoach/findCoach",
"style": {
"navigationBarTitleText": "找教练",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"backgroundTextStyle": "dark"
}
},
{
"path": "findShcool/shcoolDetail/shcoolDetail", "path": "findShcool/shcoolDetail/shcoolDetail",
"style": { "style": {
"navigationBarTitleText": "找驾校", "navigationBarTitleText": "找驾校",
@ -451,7 +460,6 @@
"path": "myAppointment/myAppointment", "path": "myAppointment/myAppointment",
"style": { "style": {
"navigationBarTitleText": "我的预约", "navigationBarTitleText": "我的预约",
"navigationStyle": "custom",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -478,7 +486,7 @@
"path": "myOrder/myOrder", "path": "myOrder/myOrder",
"style": { "style": {
"navigationBarTitleText": "我的订单", "navigationBarTitleText": "我的订单",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#fff",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -503,8 +511,7 @@
{ {
"path": "carLearnHours/carLearnHours", "path": "carLearnHours/carLearnHours",
"style": { "style": {
"navigationBarTitleText": "学车进度",
"navigationStyle": "custom",
"navigationBarTitleText": "我的学时",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -531,7 +538,6 @@
"path": "myEvaluate/myEvaluate", "path": "myEvaluate/myEvaluate",
"style": { "style": {
"navigationBarTitleText": "我的评价", "navigationBarTitleText": "我的评价",
"navigationStyle": "custom",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -540,7 +546,6 @@
"path": "myContract/myContract", "path": "myContract/myContract",
"style": { "style": {
"navigationBarTitleText": "我的合同", "navigationBarTitleText": "我的合同",
"navigationStyle": "custom",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -549,7 +554,6 @@
"path": "schoolTransfer/schoolTransfer", "path": "schoolTransfer/schoolTransfer",
"style": { "style": {
"navigationBarTitleText": "同城转校", "navigationBarTitleText": "同城转校",
"navigationStyle": "custom",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -558,7 +562,6 @@
"path": "modelChange/modelChange", "path": "modelChange/modelChange",
"style": { "style": {
"navigationBarTitleText": "车型变更", "navigationBarTitleText": "车型变更",
"navigationStyle": "custom",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }
@ -567,7 +570,6 @@
"path": "refund/refund", "path": "refund/refund",
"style": { "style": {
"navigationBarTitleText": "申请退款", "navigationBarTitleText": "申请退款",
"navigationStyle": "custom",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"backgroundTextStyle": "dark" "backgroundTextStyle": "dark"
} }

91
pages/indexEntry/findCoach/comp/coachItem.vue

@ -0,0 +1,91 @@
<template>
<view class="itemBox" >
<view class="img">
<image src="@/static/images/index/img_7@2x.png" mode="" ></image>
</view>
<view class="textCon">
<view class="name">{{item.shortName}}</view>
<view class="flex-b">
<view class="starBox">
<view class="num">{{item.stars}}</view>
</view>
<callPhone v-if="showPhone" :servicePhone="[{name: item.phone}]">
<view class="pozPhone">
<image src="@/static/images/indexIcon/phone.png" mode=""></image>
</view>
</callPhone>
</view>
<view class="adr"><text style="margin-right: 6rpx;">{{item.districtName}}</text> 距您{{ $u.utils.distanceFn(item.distance)}}</view>
<!-- <view class="credit">行业信用 <text v-if="item.creditrating">{{item.creditrating}}</text></view> -->
</view>
</view>
</template>
<script>
export default {
props: {
showPhone: {
type: Boolean,
default: true
},
item: {
type: Object,
default: {}
}
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.itemBox {
background: #FFFFFF;
border-radius: 16rpx;
padding: 20rpx;
position: relative;
display: flex;
// border-bottom: 1px solid #F4F4F4;
margin-bottom: 20rpx;
}
.img {
width: 200rpx;
height: 135rpx;
background: #f6f6f6;
border-radius: 20rpx;
overflow: hidden;
}
.textCon {
flex: 1;
font-size: 24rpx;
padding: 0 0 0 36rpx;
.name {
font-size: 28rpx;
margin-top: 4rpx;
color: #363A44;
}
.starBox {
margin: 10rpx 0;
}
.credit {
color: #1989FA;
margin-bottom: 4rpx;
}
.adr {
color: #999;
font-size: 24rpx;
}
}
.pozPhone {
width: 55rpx;
height: 55rpx;
}
</style>

190
pages/indexEntry/findCoach/findCoach.vue

@ -0,0 +1,190 @@
<template>
<view class="pageBg">
<view class="topBg">
<topNavbar title="找教练"></topNavbar>
<view class="searchCon pad">
<searchRow placeholder="搜索驾校名称" @searchFn="$goPage('/pages/indexEntry/findShcool/searchShcool/searchShcool')" :disable="true"></searchRow>
</view>
</view>
<view class="pad">
<view class="navBox">
<view class="tab" v-for="(item,index) in tabData" :key="index" :class="{active: (params.sercheType==item.id&&!(params.businessScope||params.district))}" @click="tabClick(item)">
{{ item.text }}</view>
</view>
<view class="ul">
<view class="li" v-for="(item,index) in listData" :key="index" >
<coachItem :item="item" @click.native="goPage(item)"/>
</view>
</view>
</view>
<view style="padding-bottom: 20rpx;" v-if="listData.length">
<u-loadmore :status="status" />
</view>
<nodata v-if="!listData.length&&status=='nomore'"></nodata>
</view>
</template>
<script>
import coachItem from './comp/coachItem.vue'
import { schoolPage } from '@/config/api.js'
export default {
components: { coachItem },
data() {
return {
currentTab: 0,
tabData: [{
text: '全部',
id: 1
},
{
text: 'C1',
id: 2
},
{
text: 'C2',
id: 3
},
],
params: {
pageNo: 1,
pageSize: 20,
lat: '',
lng: '',
sercheType: 1,
businessScope: '',
district: '',
name: ''
},
total: 20,
listData: [],
status: 'loading'
}
},
onLoad() {
let vuex_cityInfo = this.$store.state.user.vuex_cityInfo
if(!vuex_cityInfo.lat) {
this.$store.dispatch('getCity')
}else {
this.params.lat = vuex_cityInfo.lat
this.params.lng = vuex_cityInfo.lng
}
this.schoolPageFn()
uni.$on('screenConfirm',(obj)=>{
this.params = Object.assign(this.params, obj)
this.listInit()
})
},
onPullDownRefresh() {
this.listInit()
},
onReachBottom() {
if(this.total>this.listData.length) {
this.schoolPageFn()
}
},
methods: {
searchFn(val) {
this.params.name = val
this.listInit()
},
goScreen() {
let url = `/pages/indexEntry/findShcool/screen/screen?businessScope=${this.params.businessScope}&district=${this.params.district}`
this.$goPage(url)
},
goPage(item) {
this.$goPage('/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail?schoolId='+ item.id)
},
tabClick(item) {
this.params.sercheType = item.id
this.params.businessScope = ''
this.params.district = ''
this.listInit()
},
async listInit() {
this.listData = []
this.params.pageNo = 1
await this.schoolPageFn()
uni.stopPullDownRefresh()
},
//
async schoolPageFn() {
let obj = {}
for(let key in this.params) {
if(this.params[key]) {
obj[key] = this.params[key]
}
}
const {data: res} = await schoolPage(obj)
this.params.pageNo ++
this.listData.push(...res.list)
this.total = res.total
if(this.listData.length>=this.total) this.status = 'nomore'
console.log(res)
}
}
}
</script>
<style lang="scss" scoped>
.pageBg {
width: 100%;
.navBox {
display: flex;
// justify-content: space-between;
padding: 20rpx 0;
.tab {
font-size: 28rpx;
color: #999;
line-height: 50rpx;
border-radius: 10rpx;
background: #fff;
text-align: center;
height: 50rpx;
width: 126rpx;
margin-right: 30rpx;
&.active {
background: $themC;
color: #fff;
}
}
.screen {
width: 150rpx;
display: flex;
justify-content: center;
align-items: center;
position: relative;
background: #fff;
color: #999;
border-radius: 10rpx;
&.active {
background: $themC;
color: #fff;
}
.txt {
font-size: 28rpx;
margin-right: 10rpx;
}
.screenIcon {
width: 18rpx;
height: 12rpx;
}
}
}
.ul {
width: 100%;
.li {
}
}
}
.topBg {
padding-bottom: 20rpx;
}
</style>

14
pages/indexEntry/findShcool/findShcool.vue

@ -13,9 +13,7 @@
{{ item.text }}</view> {{ item.text }}</view>
<view class="screen" @click="goScreen" :class="{active: (params.businessScope||params.district)}"> <view class="screen" @click="goScreen" :class="{active: (params.businessScope||params.district)}">
<view class="txt">筛选</view> <view class="txt">筛选</view>
<view class="screenIcon">
<image src="@/static/images/carIcon/screeIcon.png" mode=""></image>
</view>
<u-icon name="arrow-down-fill" :color="(params.businessScope||params.district)?'#fff':'#999'" size="8"></u-icon>
</view> </view>
</view> </view>
@ -138,6 +136,9 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/ .itemBox {
padding: 20rpx !important;
}
.pageBg { .pageBg {
width: 100%; width: 100%;
.navBox { .navBox {
@ -145,7 +146,7 @@
justify-content: space-between; justify-content: space-between;
padding: 20rpx 0; padding: 20rpx 0;
.tab { .tab {
font-size: 28rpx;
font-size: 24rpx;
color: #999; color: #999;
line-height: 50rpx; line-height: 50rpx;
border-radius: 10rpx; border-radius: 10rpx;
@ -174,7 +175,7 @@
color: #fff; color: #fff;
} }
.txt { .txt {
font-size: 28rpx;
font-size: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
@ -188,8 +189,7 @@
.ul { .ul {
width: 100%; width: 100%;
.li { .li {
margin-bottom: 20rpx;
} }
} }
} }

10
pages/indexEntry/industryPolicy/industryPolicy.vue

@ -1,6 +1,6 @@
<template> <template>
<view class="pageBgImg"> <view class="pageBgImg">
<topNavbar title="行业政策"></topNavbar>
<topNavbar :title="params.type==1?'行业资讯':'政策法规'"></topNavbar>
<view class="pad"> <view class="pad">
<view class="card" > <view class="card" >
<view class="li" v-for="(item,index) in listData" :key="index" @click="$goPage('/pages/indexEntry/iIndustryInfo/detail/detail?id='+item.id)"> <view class="li" v-for="(item,index) in listData" :key="index" @click="$goPage('/pages/indexEntry/iIndustryInfo/detail/detail?id='+item.id)">
@ -28,14 +28,16 @@
params: { params: {
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
type: 2
type: 1
}, },
listData: [], listData: [],
total: 20, total: 20,
status: 'loading'
status: 'loading',
} }
}, },
onLoad() {
onLoad(options) {
this.params.type = options.type
this.getarticlezcListFn() this.getarticlezcListFn()
}, },
onPullDownRefresh() { onPullDownRefresh() {

3
pages/indexEntry/signIn/signIn.vue

@ -58,9 +58,8 @@
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
.card { .card {
padding-top: 20rpx;
padding: 20rpx;
.ul { .ul {
padding: 10rpx 30rpx;
.li { .li {
padding: 30rpx 0; padding: 30rpx 0;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;

69
pages/mineEntry/carLearnHours/carLearnHours.vue

@ -1,27 +1,20 @@
<template> <template>
<view class="pageBgImg">
<topNavbar title="学车学时"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="box" v-for="(item,index) in list" :key="index" :style="{ backgroundImage: `url(${imgUrl})`, backgroundSize: backgroundSize }">
<view class="card" v-for="(item,index) in list" :key="index" >
<view class="h2">{{ item.text }}</view> <view class="h2">{{ item.text }}</view>
<view class="con"> <view class="con">
<view class="item_row"> <view class="item_row">
<view class="item"> <view class="item">
<view class="lab">总学时</view>
<view class="val">{{ item.total }}分钟</view>
<view class="val">{{ item.total||366 }} <text>分钟</text></view>
<view class="lab">已完成学时</view>
</view> </view>
<view class="item"> <view class="item">
<view class="lab">已完成</view>
<view class="val">{{ item.time }}分钟</view>
<view class="val">{{ item.time }} <text>分钟</text></view>
<view class="lab">应完成学时</view>
</view> </view>
</view> </view>
</view> </view>
<view class="chain left" v-if="index!=0">
<image src="@/static/images/index/chain.png" mode=""></image>
</view>
<view class="chain right" v-if="index!=0">
<image src="@/static/images/index/chain.png" mode=""></image>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -51,7 +44,6 @@
const {data: res} = await getStudentProcess({studentId: this.studentId}) const {data: res} = await getStudentProcess({studentId: this.studentId})
console.log('基础不劳') console.log('基础不劳')
this.list = [ this.list = [
{total: res.simulateTotalTime, time: res.simulateValidTtime, text: '模拟器'},
{total: res.subjectOneTotalTime, time: res.subjectOneValidTtime, text: '科目一'}, {total: res.subjectOneTotalTime, time: res.subjectOneValidTtime, text: '科目一'},
{total: res.subjectTwoTotalTime, time: res.subjectTwoValidTtime, text: '科目二'}, {total: res.subjectTwoTotalTime, time: res.subjectTwoValidTtime, text: '科目二'},
{total: res.subjectThreeTotalTime, time: res.subjectOneValidTtime, text: '科目三'}, {total: res.subjectThreeTotalTime, time: res.subjectOneValidTtime, text: '科目三'},
@ -65,50 +57,57 @@
.pad { .pad {
marginp: 20rpx 0; marginp: 20rpx 0;
} }
.box {
.card {
width: 100%; width: 100%;
height: 400rpx;
height: 224rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 0 16rpx 52rpx 16rpx;
background: url('http://192.168.1.20:81/zhili/image/20230822/ca8f14281ac9412987b23ad43bfb50a1.png') no-repeat;
background-size: 100% 400rpx;
position: relative;
padding: 0 20rpx;
// background: url('http://192.168.1.20:81/zhili/image/20230822/ca8f14281ac9412987b23ad43bfb50a1.png') no-repeat;
.h2 { .h2 {
width: 489rpx;
height: 75rpx;
line-height: 70rpx;
margin: 0 auto;
height: 92rpx;
line-height: 92rpx;
text-align: center; text-align: center;
// background-color: #A6E2FF; // background-color: #A6E2FF;
color: #fff;
color: #333;
font-size: 32rpx; font-size: 32rpx;
font-weight: 600;
font-weight: 700;
border-bottom: 1rpx solid #F6F7FA;
} }
.con { .con {
border-radius: 16rpx;
width: 100%; width: 100%;
padding: 20rpx 0 0 0;
.item_row { .item_row {
display: flex; display: flex;
width: 100%; width: 100%;
height: 256rpx;
height: 90rpx;
align-items: center; align-items: center;
.item { .item {
flex: 1; flex: 1;
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center;
&:first-child {
border-right: 1rpx solid #F6F7FA;
}
.lab { .lab {
font-size: 28rpx;
color: #363A44;
font-size: 24rpx;
color: #999;
} }
.val { .val {
margin-top: 20rpx;
font-size: 40rpx;
color: $themC;
font-weight: 500;
font-size: 36rpx;
color: #333;
font-weight: 700;
margin-bottom: 6rpx;
text {
color: #999;
font-weight: 400;
font-size: 18rpx;
margin-left: 10rpx;
margin-top: -6rpx;
}
} }
} }
} }

44
pages/mineEntry/modelChange/modelChange.vue

@ -1,9 +1,8 @@
<template> <template>
<view class="pageBgImg">
<topNavbar title="个人中心"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="card"> <view class="card">
<view class="h2">现学驾信息</view>
<view class="h1"><text class="active">现学驾信息</text></view>
<view class="row"> <view class="row">
<view class="lab">学驾车型</view> <view class="lab">学驾车型</view>
<view class="val">C1</view> <view class="val">C1</view>
@ -18,7 +17,7 @@
</view> </view>
</view> </view>
<view class="card"> <view class="card">
<view class="h2">变更学驾信息</view>
<view class="h1"><text class="active">变更学驾信息</text></view>
<view class="row"> <view class="row">
<view class="lab">学驾车型</view> <view class="lab">学驾车型</view>
<view class="val" @click="showModel=true"> <view class="val" @click="showModel=true">
@ -42,7 +41,15 @@
<view class="val hui">-</view> <view class="val hui">-</view>
</view> </view>
</view> </view>
<view class="btnBg">下一步</view>
<view class="card">
<view class="row">
<view class="lab">补交金额</view>
<view class="val hui">-</view>
</view>
</view>
<view class="footerBtn">
<view class="btnBg">下一步</view>
</view>
</view> </view>
<u-picker :show="showModel" :columns="modelArr" keyName="lab" @confirm="confirmModel" @cancel="showModel=false"></u-picker> <u-picker :show="showModel" :columns="modelArr" keyName="lab" @confirm="confirmModel" @cancel="showModel=false"></u-picker>
</view> </view>
@ -71,24 +78,24 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.h1 {
margin-bottom: 10rpx;
}
.card { .card {
margin-bottom: 24rpx;
padding: 16rpx 28rpx;
.h2 {
color: $themC;
font-weight: 600;
margin: 10rpx 0 20rpx 0;
}
margin-bottom: 20rpx;
padding: 20rpx 20rpx 10rpx 20rpx;
.row { .row {
height: 92rpx;
line-height: 92rpx;
height: 88rpx;
line-height: 88rpx;
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1rpx solid #F6F7FA;
&:last-child {
border-bottom: none;
}
.lab { .lab {
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
font-weight: 600;
width: 160rpx; width: 160rpx;
} }
@ -118,9 +125,4 @@
} }
} }
.btnBg {
width: 396rpx;
margin: 72rpx auto;
}
</style> </style>

9
pages/mineEntry/myAppointment/comp/opera.vue

@ -17,27 +17,18 @@
<view class="target"> <view class="target">
<view class="row"> <view class="row">
<view class="leftLab"> <view class="leftLab">
<view class="icon">
<image src="@/static/images/car/ic_chexing.png" mode=""></image>
</view>
<view class="lab">预约教练</view> <view class="lab">预约教练</view>
</view> </view>
<view class="name">{{item.coachName}}</view> <view class="name">{{item.coachName}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="leftLab"> <view class="leftLab">
<view class="icon">
<image src="@/static/images/car/ic_chexing.png" mode=""></image>
</view>
<view class="lab">预约车辆</view> <view class="lab">预约车辆</view>
</view> </view>
<view class="name">{{item.carNumber}}</view> <view class="name">{{item.carNumber}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="leftLab"> <view class="leftLab">
<view class="icon">
<image src="@/static/images/car/ic_shijian.png" mode=""></image>
</view>
<view class="lab">预约日期</view> <view class="lab">预约日期</view>
</view> </view>
<view class="name">{{item.classDate}}</view> <view class="name">{{item.classDate}}</view>

87
pages/mineEntry/myAppointment/myAppointment.vue

@ -1,34 +1,17 @@
<template> <template>
<view class="pageBgImg">
<topNavbar title="我的预约"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="searcBox"> <view class="searcBox">
<searchRow placeholder="搜索考场名称、车牌号" @searchFn="searchFn" ref="searchRef"/> <searchRow placeholder="搜索考场名称、车牌号" @searchFn="searchFn" ref="searchRef"/>
</view> </view>
<view class="tabs">
<view class="tab" v-for="(item,index) in tabList" :key="index" :class="{active: currentTab==item.id}" @click="changeTab(item)">{{ item.text }}</view>
</view>
<view class="navs"> <view class="navs">
<view class="nav" v-for="(item,index) in navList" :key="index" :class="{active: currentNav===item.id}" @click="changeNav(item)">{{ item.text }}</view> <view class="nav" v-for="(item,index) in navList" :key="index" :class="{active: currentNav===item.id}" @click="changeNav(item)">{{ item.text }}</view>
</view> </view>
<view class="recordTotal" v-if="total">{{total}}条记录</view> <view class="recordTotal" v-if="total">{{total}}条记录</view>
<view class="tabCon" v-show="currentTab==1">
<view class="card" v-for="(item,index) in list" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=1&id='+item.id)">
<imitate :item="item"></imitate>
</view>
</view>
<view class="tabCon" v-if="currentTab==2">
<view class="card" v-for="(item,index) in list" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=2&id='+item.id)">
<opera :item="item"></opera>
</view>
</view>
<view class="tabCon" v-if="currentTab==3">
<view class="card" v-for="(item,index) in list" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=3&id='+item.id)">
<examin :item="item"></examin>
</view>
<view class="card" v-for="(item,index) in list" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=2&id='+item.id)">
<opera :item="item"></opera>
</view> </view>
<view style="padding: 10rpx 0 20rpx 0;" v-if="list.length"> <view style="padding: 10rpx 0 20rpx 0;" v-if="list.length">
@ -49,11 +32,7 @@
components: { imitate, opera, examin}, components: { imitate, opera, examin},
data() { data() {
return { return {
tabList: [
{text: '模拟器',id: 1},
{text: '实操训练',id: 2},
{text: '考场模拟',id: 3},
],
navList: [ navList: [
{text: '全部', id: -1}, {text: '全部', id: -1},
{text: '已签到', id: 1}, {text: '已签到', id: 1},
@ -65,13 +44,12 @@
currentTab: 2, currentTab: 2,
currentNav: 0, currentNav: 0,
params: { "pageNo": 1, "pageSize": 10, "keyWord": "", "status": '0',studentId: '', keyWord: ''}, params: { "pageNo": 1, "pageSize": 10, "keyWord": "", "status": '0',studentId: '', keyWord: ''},
list: [],
list: [{id: 1}],
total: 20, total: 20,
status: 'loading' status: 'loading'
} }
}, },
onLoad(options) { onLoad(options) {
if(options.currentTab) this.currentTab = options.currentTab
this.params.studentId = this.studentId this.params.studentId = this.studentId
}, },
onShow() { onShow() {
@ -79,7 +57,7 @@
}, },
onReachBottom() { onReachBottom() {
if(this.total>this.list.length) { if(this.total>this.list.length) {
this.inintList('onReachBottom')
this.masterPageFn()
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -87,26 +65,12 @@
}, },
methods: { methods: {
inintList(type) { inintList(type) {
if(!type) {
this.params.pageNo = 1
this.list = []
this.total = 0
}
if(this.currentTab==3) {
this.examSimulationRecordFn()
}else if(this.currentTab==1) {
this.simulationPageFn()
}else {
this.masterPageFn()
}
},
changeTab(item) {
this.params.keyWord = ''
this.currentTab = item.id
this.$refs.searchRef.keyword = ''
this.inintList()
this.params.pageNo = 1
this.list = []
this.total = 0
this.masterPageFn()
}, },
changeNav(item) { changeNav(item) {
this.currentNav = item.id this.currentNav = item.id
this.list = [] this.list = []
@ -118,28 +82,7 @@
} }
this.inintList() this.inintList()
}, },
//
async examSimulationRecordFn() {
const {data: res} = await examSimulationRecord(this.params)
this.params.pageNo ++
this.list.push(...res.list)
this.total = res.total
if(this.list.length>=this.total) this.status = 'nomore'
},
//
async simulationPageFn() {
let obj = {}
for(let k in this.params) {
if(this.params[k]!=='') {
obj[k] = this.params[k]
}
}
const {data: res} = await simulationPage(obj)
this.params.pageNo ++
this.list.push(...res.list)
this.total = res.total
if(this.list.length>=this.total) this.status = 'nomore'
},
// //
async masterPageFn() { async masterPageFn() {
let obj = {} let obj = {}
@ -166,7 +109,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.searcBox { .searcBox {
margin: 0 0 20rpx 0;
margin: 0 0 10rpx 0;
} }
.card { .card {
padding: 0 24rpx; padding: 0 24rpx;
@ -198,7 +141,7 @@
justify-content: space-between; justify-content: space-between;
color: #fff; color: #fff;
font-size: 28rpx; font-size: 28rpx;
padding: 24rpx 0 40rpx 0;
padding:0rpx 0 40rpx 0;
color: $themC; color: $themC;
.nav { .nav {
height: 80rpx; height: 80rpx;

3
pages/mineEntry/myContract/myContract.vue

@ -1,6 +1,5 @@
<template> <template>
<view class="pageBgImg ">
<topNavbar title="我的合同"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="card"> <view class="card">
<image :src="pdfUrl" mode="widthFix"></image> <image :src="pdfUrl" mode="widthFix"></image>

3
pages/mineEntry/myEvaluate/myEvaluate.vue

@ -1,6 +1,5 @@
<template> <template>
<view class="pageBgImg ">
<topNavbar title="我的评价"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="card" v-for="(item,index) in list" :key="index"> <view class="card" v-for="(item,index) in list" :key="index">
<commentItem :item="item"/> <commentItem :item="item"/>

24
pages/mineEntry/myOrder/comp/comp.scss

@ -5,7 +5,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
height: 116rpx; height: 116rpx;
border-bottom: 2rpx dashed #E8E9EC;
border-bottom: 1rpx solid #F6F7FA;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
@ -44,7 +44,8 @@
} }
.target { .target {
border-bottom: 2rpx dashed #E8E9EC;
border-bottom: 1rpx solid #F6F7FA;
} }
.row { .row {
@ -52,20 +53,9 @@
justify-content: space-between; justify-content: space-between;
padding: 24rpx 0; padding: 24rpx 0;
.leftLab {
display: flex;
align-items: center;
.icon {
width: 30rpx;
height: 30rpx;
}
.lab {
margin-left: 10rpx;
font-size: 28rpx;
color: #ADADAD;
}
.lab {
font-size: 28rpx;
color: #333;
} }
.name { .name {
@ -75,7 +65,7 @@
} }
.border_bottom { .border_bottom {
border-top: 2rpx dashed #E8E9EC;
border-top: 1rpx solid #F6F7FA;
padding: 10rpx 10rpx 16rpx 0; padding: 10rpx 10rpx 16rpx 0;
.dateBox { .dateBox {

18
pages/mineEntry/myOrder/comp/opera.vue

@ -19,21 +19,11 @@
</view> </view>
<view class="target"> <view class="target">
<view class="row"> <view class="row">
<view class="leftLab">
<view class="icon">
<image src="@/static/images/car/ic_chexing.png" mode=""></image>
</view>
<view class="lab">学驾车型</view>
</view>
<view class="lab">学驾车型</view>
<view class="name">{{item.trainType}}</view> <view class="name">{{item.trainType}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="leftLab">
<view class="icon">
<image src="@/static/images/car/ic_banxing.png" mode=""></image>
</view>
<view class="lab">所选班型</view>
</view>
<view class="lab">所选班型</view>
<view class="name">{{item.className}}</view> <view class="name">{{item.className}}</view>
</view> </view>
</view> </view>
@ -43,10 +33,6 @@
</view> --> </view> -->
<!-- <view class="btnBg">去评价</view> --> <!-- <view class="btnBg">去评价</view> -->
<view class="rows"> <view class="rows">
<view class="label">培训费总价</view>
<view class="value">{{ $u.utils.priceTo(item.totalAmount) }}</view>
</view>
<view class="rows">
<view class="label hui">实际支付</view> <view class="label hui">实际支付</view>
<view class="value blue">暂无字段</view> <view class="value blue">暂无字段</view>
</view> </view>

59
pages/mineEntry/myOrder/myOrder.vue

@ -1,17 +1,10 @@
<template> <template>
<view class="pageBgImg">
<topNavbar title="我的订单"></topNavbar>
<view class="pageBg">
<view class="navs">
<view class="nav" v-for="(item,index) in tabList" :key="index" :class="{active: params.orderStatus==item.id}" @click="changeTab(item)">{{ item.text }}</view>
</view>
<view class="pad"> <view class="pad">
<view class="searcBox">
<searchRow placeholder="搜索" @searchFn="searchFn"/>
</view>
<view class="tabs">
<view class="tab" v-for="(item,index) in tabList" :key="index" :class="{active: params.orderStatus==item.id}" @click="changeTab(item)">{{ item.text }}</view>
</view>
<view class="navs">
<view class="nav" v-for="(item,index) in navList" :key="index" :class="{active: params.orderType==item.id}" @click="changeNav(item)">{{ item.text }}</view>
</view>
<view class="recordTotal"> <text v-if="total">{{total}}条记录</text></view>
<view class="tabCon"> <view class="tabCon">
<view class="card" v-for="(item,index) in list" :key="index" @click="goDetail(item)"> <view class="card" v-for="(item,index) in list" :key="index" @click="goDetail(item)">
@ -37,8 +30,8 @@
data() { data() {
return { return {
tabList: [ tabList: [
{text: '已',id: 1},
{text: '待付',id: 0},
{text: '已完成',id: 1},
{text: '待付',id: 0},
{text: '退款',id: 3}, {text: '退款',id: 3},
],//01-12 ],//01-12
navList: [ navList: [
@ -53,14 +46,14 @@
orderType: 0, orderType: 0,
sercheValue: '' sercheValue: ''
}, },
list: [],
list: [{id: 1}],
total: 0, total: 0,
status: 'loading' status: 'loading'
} }
}, },
onLoad() { onLoad() {
this.params.studentId = this.studentId this.params.studentId = this.studentId
this.applyOrderPageFn()
// this.applyOrderPageFn()
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.initList() this.initList()
@ -123,45 +116,26 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.searcBox {
margin: 0 0 20rpx 0;
}
.card { .card {
padding: 0 24rpx; padding: 0 24rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.tabs {
display: flex;
width: 100%;
height: 72rpx;
background: #FFFFFF;
border-radius: 16rpx;
margin-top: 20rpx;
.tab {
flex: 1;
text-align: center;
line-height: 72rpx;
color: #ADADAD;
&.active {
background: rgba(25,137,250,0.1);
border-radius: 16rpx;
border: 2rpx solid #1989FA;
color: $themC;
font-weight: 600;
}
}
}
.navs { .navs {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
color: #fff; color: #fff;
font-size: 28rpx; font-size: 28rpx;
padding: 10rpx 30rpx 24rpx 30rpx;
padding: 10rpx 30rpx 20rpx 30rpx;
color: $themC; color: $themC;
background: #fff;
.nav { .nav {
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
padding: 0 20rpx; padding: 0 20rpx;
flex: 1;
text-align: center;
&.active { &.active {
font-weight: 500; font-weight: 500;
position: relative; position: relative;
@ -179,6 +153,9 @@
} }
} }
} }
.tabCon {
padding: 20rpx 0 0 0;
}
.recordTotal { .recordTotal {
font-size: 24rpx; font-size: 24rpx;
padding: 0rpx 0 28rpx 0; padding: 0rpx 0 28rpx 0;

16
pages/mineEntry/refund/comp/myform.vue

@ -15,10 +15,10 @@
<u--input placeholder="请输入" border="none" clearable type="number" maxlength="11" v-model="FormData.amount" @blur="changePrice"></u--input> <u--input placeholder="请输入" border="none" clearable type="number" maxlength="11" v-model="FormData.amount" @blur="changePrice"></u--input>
</view> </view>
</view> </view>
<view class="tpsHui">退款金额不可超过¥ {{$u.utils.priceTo(info.totalAmount)}}</view>
<!-- <view class="tpsHui">退款金额不可超过¥ {{$u.utils.priceTo(info.totalAmount)}}</view> -->
</view> </view>
<view class="h1">收款信息</view>
<view class="card"> <view class="card">
<view class="h1"><text class="active">收款信息</text></view>
<view class="row"> <view class="row">
<view class="lab">持卡人</view> <view class="lab">持卡人</view>
<view class="val"> <view class="val">
@ -62,7 +62,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btnBg" @click="applyOnlineFundFn">提交</view>
<view class="footerBtn">
<view class="btnBg" @click="applyOnlineFundFn">提交</view>
</view>
<u-picker :show="showReason" :columns="reasonArr" keyName="label" @confirm="confirmReason" @cancel="showReason=false"></u-picker> <u-picker :show="showReason" :columns="reasonArr" keyName="label" @confirm="confirmReason" @cancel="showReason=false"></u-picker>
</view> </view>
</template> </template>
@ -259,7 +262,7 @@
margin: 20rpx 0; margin: 20rpx 0;
} }
.card { .card {
padding: 12rpx 28rpx;
padding: 4rpx 20rpx 28rpx 20rpx;
margin-bottom: 24rpx; margin-bottom: 24rpx;
.row { .row {
display: flex; display: flex;
@ -312,10 +315,7 @@
padding: 0rpx 0 16rpx 0; padding: 0rpx 0 16rpx 0;
} }
} }
.btnBg {
width: 396rpx;
margin: 94rpx auto;
}

43
pages/mineEntry/refund/refund.vue

@ -1,17 +1,7 @@
<template> <template>
<view class="pageBgImg">
<topNavbar :title="title"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="card">
<view class="tpsBox">
<view class="row">
<view class="icon">
<image src="@/static/images/userCenter/warn.png" mode=""></image>
</view>
<view class="tps">请与教练协商确认达成一致后填写协商好的退款金额</view>
</view>
</view>
</view>
<view class="tps">请与教练协商确认达成一致后填写协商好的退款金额</view>
<myform :info="info" :orderId="orderId"></myform> <myform :info="info" :orderId="orderId"></myform>
</view> </view>
</view> </view>
@ -47,31 +37,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.card {
padding: 12rpx 28rpx;
margin-bottom: 24rpx;
.tpsBox {
height: 140rpx;
background: #FFFFFF;
border-radius: 16rpx;
.row {
height: 100%;
display: flex;
align-items: center;
.icon {
width: 36rpx;
height: 36rpx;
}
.tps {
padding-left: 26rpx;
font-size: 28rpx;
font-weight: 600;
color: $themC;
line-height: 1.2em;
}
}
}
.tps {
font-size: 24rpx;
color: #FF7270;
padding: 20rpx 0;
} }

29
pages/mineEntry/schoolTransfer/schoolTransfer.vue

@ -1,19 +1,7 @@
<template> <template>
<view class="pageBgImg">
<topNavbar title="同城转校"></topNavbar>
<view class="pageBg">
<view class="pad"> <view class="pad">
<view class="card"> <view class="card">
<view class="tpsBox">
<view class="row">
<view class="icon">
<image src="@/static/images/userCenter/warn.png" mode=""></image>
</view>
<view class="tps">请与教练协商确认达成一致后填写协商好的退款金额</view>
</view>
</view>
</view>
<view class="card">
<view class="row" @click="showReason=true"> <view class="row" @click="showReason=true">
<view class="lab">退款原因</view> <view class="lab">退款原因</view>
<view class="val">申请同城转校</view> <view class="val">申请同城转校</view>
@ -28,9 +16,8 @@
<u--input placeholder="请输入" border="none" clearable type="number" maxlength="11" v-model="FormData.phone"></u--input> <u--input placeholder="请输入" border="none" clearable type="number" maxlength="11" v-model="FormData.phone"></u--input>
</view> </view>
</view> </view>
<view class="tpsHui">退款金额不可超过¥2000.00</view>
<view class="tpsBlue">退款金额不可超过¥2000.00</view>
</view> </view>
<view class="h1">收款信息</view>
<view class="card"> <view class="card">
<view class="row"> <view class="row">
<view class="lab">持卡人</view> <view class="lab">持卡人</view>
@ -75,7 +62,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btnBg">提交</view>
<view class="footerBtn">
<view class="btnBg">提交</view>
</view>
</view> </view>
<u-picker :show="showReason" :columns="reasonArr" keyName="lab" @confirm="confirmReason" @cancel="showReason=false"></u-picker> <u-picker :show="showReason" :columns="reasonArr" keyName="lab" @confirm="confirmReason" @cancel="showReason=false"></u-picker>
</view> </view>
@ -179,7 +168,7 @@
} }
} }
.tpsBlue { .tpsBlue {
color: $themC;
color: #FF7270;
margin-bottom: 10rpx; margin-bottom: 10rpx;
padding-left: 152rpx; padding-left: 152rpx;
font-size: 24rpx; font-size: 24rpx;
@ -191,10 +180,4 @@
} }
} }
.btnBg {
width: 396rpx;
margin: 94rpx auto;
}
</style> </style>

2
pages/tabbar/index/comp/informaItem.vue

@ -1,5 +1,5 @@
<template> <template>
<view class="flex-b">
<view class="flex-b" @click="$goPage('pages/indexEntry/iIndustryInfo/detail/detail?id='+item.id)">
<view class="imgBox"> <view class="imgBox">
<image :src="item.picture" mode="aspectFill"></image> <image :src="item.picture" mode="aspectFill"></image>
</view> </view>

2
pages/tabbar/index/comp/schoolItem.vue

@ -44,7 +44,7 @@
.itemBox { .itemBox {
background: #FFFFFF; background: #FFFFFF;
border-radius: 16rpx; border-radius: 16rpx;
padding: 30rpx;
padding: 20rpx 0rpx;
position: relative; position: relative;
display: flex; display: flex;
border-bottom: 1px solid #F4F4F4; border-bottom: 1px solid #F4F4F4;

35
pages/tabbar/index/index.vue

@ -54,7 +54,7 @@
<!-- 优质驾校 --> <!-- 优质驾校 -->
<view class="schoolCon card"> <view class="schoolCon card">
<view class="h1_row"> <view class="h1_row">
<view class="h1" style="margin: 28rpx 0;"><text class="active">优质驾校</text></view>
<view class="h1" ><text class="active">优质驾校</text></view>
<moreRight text="查看全部"/> <moreRight text="查看全部"/>
</view> </view>
<view class="li" v-for="(item,index) in 3" :key="index"> <view class="li" v-for="(item,index) in 3" :key="index">
@ -65,7 +65,7 @@
<!-- 推荐教练 --> <!-- 推荐教练 -->
<view class="coachCon"> <view class="coachCon">
<view class="h1_row"> <view class="h1_row">
<view class="h1" style="margin: 28rpx 0;"><text class="active">推荐教练</text></view>
<view class="h1" ><text class="active">推荐教练</text></view>
<moreRight text="查看全部"/> <moreRight text="查看全部"/>
</view> </view>
@ -83,9 +83,9 @@
<view class="h1_row"> <view class="h1_row">
<view class="tabs"> <view class="tabs">
<view class="h1" @click="changeInforma(1)"><text :class="{active: informa==1}">行业资讯</text></view> <view class="h1" @click="changeInforma(1)"><text :class="{active: informa==1}">行业资讯</text></view>
<view class="h1" @click="changeInforma(2)"><text :class="{active: informa==2}">政策法规</text></view>
<view class="h1" @click="changeInforma(2)"><text :class="{active: informa==2}" style="margin-left: 30rpx;">政策法规</text></view>
</view> </view>
<moreRight text="查看全部" @click.native="$goPage('/pages/indexEntry/industryPolicy/industryPolicy')"/>
<moreRight text="查看全部" @click.native="$goPage('/pages/indexEntry/industryPolicy/industryPolicy?type='+ informa)"/>
</view> </view>
<view class="ul2"> <view class="ul2">
@ -159,7 +159,7 @@
{ {
text: '找教练', text: '找教练',
icon: require('../../../static/images/indexIcon/entryIcon (1).png'), icon: require('../../../static/images/indexIcon/entryIcon (1).png'),
url: '/pages/indexEntry/examines/examines',
url: '/pages/indexEntry/findCoach/findCoach',
goPage: ((item)=>{ goPage: ((item)=>{
this.$goPage(item.url) this.$goPage(item.url)
}) })
@ -175,7 +175,7 @@
{ {
text: '理论学习', text: '理论学习',
icon: require('../../../static/images/indexIcon/entryIcon (2).png'), icon: require('../../../static/images/indexIcon/entryIcon (2).png'),
url: '/pages/carEntry/simulateAppointment/simulateAppointment',
url: '/pages/indexEntry/theory/theory',
goPage: ((item)=>{ goPage: ((item)=>{
this.$goPage(item.url) this.$goPage(item.url)
}) })
@ -297,6 +297,7 @@
this.$goPage(item.url) this.$goPage(item.url)
}, },
changeInforma(val) { changeInforma(val) {
if(this.informa == val) return
this.informa = val this.informa = val
this.getarticleListFn() this.getarticleListFn()
}, },
@ -387,21 +388,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-right: 20rpx;
} }
.h1 { .h1 {
padding-top: 10rpx;
.active {
&::before {
background: url('../../../static/images/icon/h1Active.png') #F6F7FA no-repeat;
background-size: 52rpx 12rpx;
}
}
}
.ul2 {
padding: 10rpx 20rpx 0 20rpx;
padding: 20rpx 0 20rpx 0;
} }
.main { .main {
width: 100%; width: 100%;
background: url('../../../static/images/bigImg/homeBg.png') #F6F7FA no-repeat; background: url('../../../static/images/bigImg/homeBg.png') #F6F7FA no-repeat;
@ -460,13 +451,12 @@
background: #FFFFFF; background: #FFFFFF;
border-radius: 16rpx; border-radius: 16rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 0 20rpx;
.ul { .ul {
height: 164rpx; height: 164rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 0 20rpx;
.li { .li {
flex: 1; flex: 1;
@ -492,14 +482,13 @@
.tabs { .tabs {
display: flex; display: flex;
padding: 20rpx 0 10rpx 0;
} }
.severCon { .severCon {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 40rpx 20rpx 20rpx 20rpx;
padding: 20rpx 0rpx 20rpx 0rpx;
} }
.severItem { .severItem {
width: 320rpx; width: 320rpx;
@ -539,6 +528,6 @@
} }
.ul3 { .ul3 {
display: flex; display: flex;
margin-bottom: 20rpx;
margin: 20rpx 0;
} }
</style> </style>

19
pages/tabbar/learnCar/comp/comp.scss

@ -2,24 +2,7 @@
.h1 { .h1 {
font-size: 32rpx;
color: #333;
font-weight: 500;
position: relative;
padding: 0 0 0 32rpx;
line-height: 108rpx;
height: 108rpx;
&::before {
position: absolute;
content: '';
width: 8rpx;
height: 32rpx;
background: #1F6EFA;
border-radius: 4rpx;
top: 50%;
left: 0;
transform: translateY(-50%);
}
padding: 30rpx 0 30rpx 0;
} }
.card { .card {

29
pages/tabbar/mine/index.vue

@ -6,7 +6,7 @@
<view class="avatar"> <view class="avatar">
<image src="@/static/images/mineIcon/emtryIcon (3).png" mode=""></image> <image src="@/static/images/mineIcon/emtryIcon (3).png" mode=""></image>
</view> </view>
<view class="rightInfo">
<view class="rightInfo" @click="topClick">
<view class="name-row"> <view class="name-row">
<view class="leftTxt"> <view class="leftTxt">
<view class="name">JOE宝宝</view> <view class="name">JOE宝宝</view>
@ -33,7 +33,7 @@
</view> </view>
<view class="ul2"> <view class="ul2">
<view class="li2" v-for="(item,index) in ulData2" :key="index">
<view class="li2" v-for="(item,index) in ulData2" :key="index" @click="$goPage(item.url)">
<view class="icon"> <view class="icon">
<image :src="item.icon" mode=""></image> <image :src="item.icon" mode=""></image>
</view> </view>
@ -56,20 +56,29 @@
return { return {
ulData: [ ulData: [
{name: '学车进度', icon: require('@/static/images/mineIcon/emtryIcon (4).png'),url: '/pages/mineEntry/carLearProgress/carLearProgress'}, {name: '学车进度', icon: require('@/static/images/mineIcon/emtryIcon (4).png'),url: '/pages/mineEntry/carLearProgress/carLearProgress'},
{name: '我的预约', icon: require('@/static/images/mineIcon/emtryIcon (1).png'),url: ''},
{name: '我的订单', icon: require('@/static/images/mineIcon/emtryIcon (2).png'),url: ''},
{name: '我的合同', icon: require('@/static/images/mineIcon/emtryIcon (3).png'),url: ''},
{name: '我的预约', icon: require('@/static/images/mineIcon/emtryIcon (1).png'),url: '/pages/mineEntry/myAppointment/myAppointment'},
{name: '我的订单', icon: require('@/static/images/mineIcon/emtryIcon (2).png'),url: '/pages/mineEntry/myOrder/myOrder'},
{name: '我的合同', icon: require('@/static/images/mineIcon/emtryIcon (3).png'),url: '/pages/mineEntry/myContract/myContract'},
], ],
ulData2: [ ulData2: [
{name: '学时查询', icon: require('@/static/images/mineIcon/minIcon (4).png'),url: ''},
{name: '我的评价', icon: require('@/static/images/mineIcon/minIcon (1).png'),url: ''},
{name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: ''},
{name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: ''},
{name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: ''},
{name: '学时查询', icon: require('@/static/images/mineIcon/minIcon (4).png'),url: '/pages/mineEntry/carLearnHours/carLearnHours'},
{name: '我的评价', icon: require('@/static/images/mineIcon/minIcon (1).png'),url: '/pages/mineEntry/myEvaluate/myEvaluate'},
{name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: '/pages/mineEntry/refund/refund'},
{name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: '/pages/mineEntry/modelChange/modelChange'},
{name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'},
{name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''}, {name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''},
{name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: ''}, {name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: ''},
] ]
} }
},
methods: {
topClick() {
if(!this.vuex_userInfo.phone) {
this.$goPage('/pages/userCenter/login/login')
}else {
this.$goPage('/pages/mineEntry/personaInfo/personaInfo')
}
},
} }
} }
</script> </script>

BIN
static/images/tabbar/btn_xueche_nor - 副本.png

After

Width: 40  |  Height: 40  |  Size: 1.5 KiB

BIN
static/images/tabbar/btn_xueche_nor.png

Before

Width: 40  |  Height: 40  |  Size: 1.5 KiB

After

Width: 40  |  Height: 40  |  Size: 1.7 KiB

Loading…
Cancel
Save