diff --git a/common/js/mixins.js b/common/js/mixins.js index 8338488..ecffd6d 100644 --- a/common/js/mixins.js +++ b/common/js/mixins.js @@ -6,7 +6,8 @@ export default { ...mapState({ city: state=> state.user.vuex_cityInfo.city, vuex_cityInfo: state=> state.user.vuex_cityInfo, - vuex_userInfo: state=> state.user.vuex_userInfo + vuex_userInfo: state=> state.user.vuex_userInfo, + apiOk: state=> state.user.apiOk, }), }, data() { diff --git a/components/pickDateTimer/pickDateTimer.vue b/components/pickDateTimer/pickDateTimer.vue index f15f7af..fad5f18 100644 --- a/components/pickDateTimer/pickDateTimer.vue +++ b/components/pickDateTimer/pickDateTimer.vue @@ -15,6 +15,7 @@ + {{ item.week }} {{ item.num }} @@ -50,6 +51,12 @@ + + + + + + @@ -170,6 +177,15 @@ justify-content: center; font-size: 28rpx; color: #333; + .dian { + width: 12rpx; + height: 12rpx; + background: #D8D8D8; + border-radius: 50%; + &.active { + background: #1989FA; + } + } &.active { background: rgba(25,137,250,0.1); border: 2rpx solid #1989FA; @@ -245,4 +261,7 @@ line-height: 72rpx; margin: 108rpx auto 50rpx auto; } + .noDate { + + } \ No newline at end of file diff --git a/config/api.js b/config/api.js index f5a2c26..1ecf84a 100644 --- a/config/api.js +++ b/config/api.js @@ -20,12 +20,19 @@ export const coachPage = (params) => http.get('business/coach/page', {params: pa export const publicVideoPage = (params) => http.get('business/video/page', {params: params}) // 公益视频 详情 export const publicGetvideo = (params) => http.get('business/video/getvideo', {params: params}) +// 公益视频点赞 +export const createUpvote = (data) => http.post('business/contentdata/createUpvote', data) +// 公益视频收藏 +export const createCollect = (data) => http.post('business/contentdata/createCollect', data) +// 公益视频是否点赞收藏 +export const getlikesCollection = (params) => http.get('business/users/getContent', {params: params}) // 行业资讯， export const getarticleList = (params) => http.get('business/video/article', {params: params}) // 行业政策 export const getarticlezcList = (params) => http.get('business/video/articlezc', {params: params}) // 行业资讯，行业政策 详情 export const getarticle = (params) => http.get('business/video/getarticle', {params: params}) + // 驾照类型 export const licenseType = () => http.get('system/dict/licenseType', ) // 区域 diff --git a/config/request.js b/config/request.js index 69cf8f3..69af3c0 100644 --- a/config/request.js +++ b/config/request.js @@ -79,6 +79,8 @@ module.exports = (vm) => { console.log(response.config.url) if(!noToken&&response.config.url!=='member/auth/logout') { checkToken(vm) + }else { + vm.$store.commit('update_apiOk', true) } return data === undefined ? {} : data }, (response) => { diff --git a/config/utils.js b/config/utils.js index 7674692..b93d870 100644 --- a/config/utils.js +++ b/config/utils.js @@ -6,7 +6,7 @@ export function checkToken(vm) { if (nowTime > expiresTime * 1) { vm.$store.commit('goLogin') // 如果小于20分钟就刷新一下token && - } else if ((expiresTime * 1 - nowTime) / 60000 < 30) { + } else if ((expiresTime * 1 - nowTime) / 60000 < 10) { vm.$store.dispatch('refreshToken') } } diff --git a/pages/carEntry/examineAppointment/comp/step1.vue b/pages/carEntry/examineAppointment/comp/step1.vue index e618893..318e431 100644 --- a/pages/carEntry/examineAppointment/comp/step1.vue +++ b/pages/carEntry/examineAppointment/comp/step1.vue @@ -6,8 +6,8 @@ 江西省江西市江西区尚坤丁兰国际1190 - - + + diff --git a/pages/carEntry/examineAppointment/comp/step2.vue b/pages/carEntry/examineAppointment/comp/step2.vue index 71f6d7d..f3c976f 100644 --- a/pages/carEntry/examineAppointment/comp/step2.vue +++ b/pages/carEntry/examineAppointment/comp/step2.vue @@ -1,15 +1,19 @@ @@ -17,12 +21,18 @@ export default { data() { return { - dateArr: [ - {week: '一', num: '08'}, - {week: '二', num: '09'}, - {week: '三', num: '10'}, - {week: '四', num: '11'}, - {week: '五', num: '12'}, + list: [{ + text: '00001', + id: 1 + }, + { + text: '00002', + id: 1 + }, + { + text: '00003', + id: 1 + }, ], show: true } @@ -37,26 +47,47 @@ \ No newline at end of file diff --git a/pages/carEntry/examineAppointment/comp/step3.vue b/pages/carEntry/examineAppointment/comp/step3.vue index 7c42326..0c25941 100644 --- a/pages/carEntry/examineAppointment/comp/step3.vue +++ b/pages/carEntry/examineAppointment/comp/step3.vue @@ -1,19 +1,48 @@ @@ -21,20 +50,8 @@ export default { data() { return { - list: [{ - text: '00001', - id: 1 - }, - { - text: '00002', - id: 1 - }, - { - text: '00003', - id: 1 - }, - ], - show: true + + show: false } }, methods: { @@ -47,47 +64,90 @@ \ No newline at end of file diff --git a/pages/carEntry/examineAppointment/examineAppointment.vue b/pages/carEntry/examineAppointment/examineAppointment.vue index fb3a0f9..7581ea1 100644 --- a/pages/carEntry/examineAppointment/examineAppointment.vue +++ b/pages/carEntry/examineAppointment/examineAppointment.vue @@ -15,10 +15,10 @@ 3 - + 选择考场 - 选择车型 + 选择车辆 选择时间 @@ -36,7 +36,7 @@ - + diff --git a/pages/carEntry/operaAppointment/comp/coachInfo.vue b/pages/carEntry/operaAppointment/comp/coachInfo.vue new file mode 100644 index 0000000..f77fd12 --- /dev/null +++ b/pages/carEntry/operaAppointment/comp/coachInfo.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/pages/carEntry/operaAppointment/operaAppointment.vue b/pages/carEntry/operaAppointment/operaAppointment.vue index e18ea49..0c769ec 100644 --- a/pages/carEntry/operaAppointment/operaAppointment.vue +++ b/pages/carEntry/operaAppointment/operaAppointment.vue @@ -1,48 +1,40 @@ \ No newline at end of file diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index bd331b1..01a64a7 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -259,9 +259,9 @@ - + - + @@ -269,9 +269,9 @@ - + - + diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue index 144ea2c..9157ee5 100644 --- a/pages/indexEntry/findShcool/findShcool.vue +++ b/pages/indexEntry/findShcool/findShcool.vue @@ -8,7 +8,7 @@ {{ item.text }} - + 筛选 @@ -59,6 +59,8 @@ lat: '', lng: '', sercheType: 1, + businessScope: '', + district: '' }, total: 20, listData: [], @@ -89,6 +91,10 @@ } }, methods: { + 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) }, @@ -97,7 +103,6 @@ this.listInit() }, async listInit() { - this.listData = [] this.params.pageNo = 1 await this.schoolPageFn() diff --git a/pages/indexEntry/findShcool/screen/screen.vue b/pages/indexEntry/findShcool/screen/screen.vue index 7a31d41..00728b2 100644 --- a/pages/indexEntry/findShcool/screen/screen.vue +++ b/pages/indexEntry/findShcool/screen/screen.vue @@ -35,7 +35,14 @@ areTypeArr: [] } }, - onLoad() { + onLoad(options) { + if(options.businessScope) { + this.driverTypeArr = options.businessScope.split(',') + } + if(options.district) { + this.areTypeArr = options.district.split(',').map(item=>item*1) + console.log(this.areTypeArr) + } this.licenseTypeFn() this.nachangListFn() }, diff --git a/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue b/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue index 0d91d83..a46c255 100644 --- a/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue +++ b/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + 点赞 - + @@ -36,7 +36,7 @@ 分享 - + diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 9a2aa92..275250c 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -71,19 +71,19 @@ - - + - + - {{ item.text }} - {{ item.date}} + {{ item.title }} + {{ $u.timeFormat(item.createTime, 'yyyy/mm/dd') }} @@ -117,6 +117,7 @@