Browse Source

订单详情对接,bug修改

master
unknown 9 months ago
parent
commit
7d2057a041
  1. 3
      pages/carEntry/examineAppointment/comp/step2.vue
  2. 2
      pages/carEntry/examineAppointment/examineAppointment.vue
  3. 3
      pages/carEntry/simulateAppointment/comp/pickDate.vue
  4. 2
      pages/carEntry/simulateAppointment/comp/step2.vue
  5. 2
      pages/carEntry/simulateAppointment/simulateAppointment.vue
  6. 4
      pages/indexEntry/examines/detail/detail.vue
  7. 4
      pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
  8. 1
      pages/mineEntry/myContract/myContract.vue
  9. 3
      pages/mineEntry/myEvaluate/myEvaluate.vue
  10. 30
      pages/mineEntry/myOrder/detail/detail.vue
  11. 20
      pages/tabbar/index/index.vue
  12. 3
      pages/tabbar/learnCar/index.vue
  13. 17
      pages/tabbar/mine/index.vue
  14. 11
      store/modules/user.js

3
pages/carEntry/examineAppointment/comp/step2.vue

@ -1,12 +1,13 @@
<template>
<view class="step3">
<view class="card">
<view class="list">
<view class="list" v-if="list.length">
<view class="listItem" v-for="(item,index) in list" :key="index" :class="{active: carId==item.id}" @click="chooseCar(item)">
<view class="num">{{item.carNumber}}号车</view>
<view class="text">{{ item.licnum }}</view>
</view>
</view>
<nodata v-else></nodata>
</view>
<view class="btn_row" style="margin-top: 108rpx;">

2
pages/carEntry/examineAppointment/examineAppointment.vue

@ -103,12 +103,14 @@
this.FormData.examSiteId = item.id
this.FormData.siteName = item.name
this.carParams.pageNo = 1
this.carList = []
this.examCarPageFn()
},
//
async examSitePageFn() {
const {data: res} = await examSitePage(this.siteParams)
this.siteList = res
},
//
async examCarPageFn() {

3
pages/carEntry/simulateAppointment/comp/pickDate.vue

@ -89,6 +89,7 @@
radioVal: '',
}
},
mounted() {
this.initDate()
},
@ -172,7 +173,7 @@
},
//
chooseDate(item) {
this.FormData.courseIds = []
this.FormData.courseIds = ''
this.chooseDay = item.date
this.simulationClassFn()
this.$emit('updatedForm', this.FormData)

2
pages/carEntry/simulateAppointment/comp/step2.vue

@ -1,7 +1,7 @@
<template>
<view class="step1">
<pickDate :FormData="FormData" @updatedForm="updatedForm"/>
<pickDate :FormData="FormData" @updatedForm="updatedForm" />
<view class="poz_btn">
<view class="btn_row" >

2
pages/carEntry/simulateAppointment/simulateAppointment.vue

@ -24,7 +24,7 @@
</view>
<step1 v-if="currentStep==1" @changeStep="changeStep" :list="list1" :FormData="FormData" @choosePoint="choosePoint"></step1>
<step2 v-if="currentStep==2" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm"></step2>
<step2 v-if="currentStep==2" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm" ></step2>
<step3 v-if="currentStep==3" @changeStep="changeStep" :FormData="FormData" @updatedForm="updatedForm"></step3>
</view>
</view>

4
pages/indexEntry/examines/detail/detail.vue

@ -1,7 +1,7 @@
<template>
<!-- 考场详情 -->
<view class="pageBg">
<view class="swiper-box" :style="{ backgroundImage: `url(${detailInfo.images})`, backgroundSize: '100% 100%' }">
<view class="swiper-box" :style="{ backgroundImage: `url(${detailInfo.images})`, backgroundSize: '100% ' }">
<view class="navPoz">
<topNavbar title=" "></topNavbar>
</view>
@ -91,6 +91,8 @@
this.infoList = res.list
},
async goExamine() {
const res = await this.$store.dispatch('checkLogin')
if(!res) return
// uni.navigateTo({
// url: '/pages/indexEntry/enroll/enroll?tit='
// })

4
pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue

@ -16,7 +16,9 @@
export default {
props: ['classList'],
methods: {
goSign(item) {
async goSign(item) {
const res = await this.$store.dispatch('checkLogin')
if(!res) return
this.$store.commit('upDateSchoolCoach', {})
this.$store.commit('upDateSchoolClass', item)
this.$goPage('/pages/indexEntry/enroll/enroll')

1
pages/mineEntry/myContract/myContract.vue

@ -6,6 +6,7 @@
<image :src="pdfUrl" mode="widthFix"></image>
<!-- <web-view :src="pdfUrl"></web-view> -->
<!-- <mumu-previewOffce :fileUrl='pdfUrl' v-model='showPreview' @change="change"></mumu-previewOffce> -->
<nodata v-if="!pdfUrl" style="margin-bottom: 40rpx;">暂无合同</nodata>
</view>
</view>
</view>

3
pages/mineEntry/myEvaluate/myEvaluate.vue

@ -5,6 +5,9 @@
<view class="card" v-for="(item,index) in list" :key="index">
<commentItem :item="item"/>
</view>
<view class="card" v-if="!list.length">
<nodata>暂无评价</nodata>
</view>
</view>
<view style="padding-bottom: 20rpx;" v-if="list.length>4">
<u-loadmore :status="status" />

30
pages/mineEntry/myOrder/detail/detail.vue

@ -88,16 +88,24 @@
<view class="label hui">实际支付</view>
<view class="value hui">{{$u.utils.priceTo(info.payActual)}}</view>
</view>
<view class="rows">
<view class="rows" v-if="info.payMent">
<view class="label hui">已支付定金</view>
<view class="value blue">没字段</view>
<view class="value blue">{{$u.utils.priceTo(info.payMent)}}</view>
</view>
<view class="rows">
<view class="rows" v-if="info.payTail">
<view class="label hui">待支付尾款</view>
<view class="value blue">没字段</view>
<view class="value blue">{{$u.utils.priceTo(info.payTail)}}</view>
</view>
<view class="btn_row">
<view class="" style="min-width: 120rpx;">
<view class="refundBtn" @click="goFund" v-if="!info.refundId">申请退款</view>
</view>
<view class="rightBtn">
<view class="btnBorder">下载发票</view>
<view class="btnBorder">培训缴费电子凭证</view>
</view>
</view>
</view>
</view>
</view>
<refundInfo :info="refundData" v-if="refundData.id" />
@ -189,7 +197,19 @@
<style lang="scss" scoped>
@import '../comp/comp.scss';
.btn_row {
display: flex;
justify-content: space-between;
.rightBtn {
display: flex;
justify-content: flex-end;
.btnBorder {
margin-left: 14rpx;
padding: 0 16rpx;
font-size: 24rpx;
}
}
}
.feeIcon {
width: 28rpx;
height: 28rpx;

20
pages/tabbar/index/index.vue

@ -97,7 +97,7 @@
<view class="card serviceCon">
<view class="h1">服务专区</view>
<view class="ul2">
<view class="li2" v-for="(item,index) in serviceSector" :key="index" :class="'li2Bg' + index" @click="$goPage(item.url)">
<view class="li2" v-for="(item,index) in serviceSector" :key="index" :class="'li2Bg' + index" @click="goServiceSector(item)">
<view class="icon">
<image :src="item.icon" mode=""></image>
</view>
@ -291,8 +291,13 @@
},
methods: {
entrySectionClick(item) {
async entrySectionClick(item) {
if(item.text=='我要报名') {
let token = this.$store.state.user.vuex_loginInfo.accessToken
if(!token) {
this.$store.commit('goLogin')
return
}
// this.$goPage(item.url)
this.$store.commit('updateNonPlatformStudent', false)
@ -308,6 +313,17 @@
return this.$goPage('/pages/indexEntry/enroll/payment/payment')
}
}
if(item.text=='找驾驶馆') {
const res = await this.$store.dispatch('checkLogin')
if(!res) return
}
this.$goPage(item.url)
},
async goServiceSector(item) {
if(item.text=='咨询投诉') {
const res = this.$store.dispatch('checkLogin')
if(!res) return
}
this.$goPage(item.url)
},
async getarticleListFn() {

3
pages/tabbar/learnCar/index.vue

@ -68,7 +68,8 @@
onLoad() {
},
onShow() {
// uni.hideTabBar();
// console.log('')
this.$store.dispatch('checkLogin')
},
methods: {
changeNav(id) {

17
pages/tabbar/mine/index.vue

@ -51,7 +51,7 @@
<view class="business ">
<view class="h1">业务办理</view>
<view class="card">
<view class="item" v-for="(item,index) in businessEntry" :key="index" @click="$goPage(item.url)">
<view class="item" v-for="(item,index) in businessEntry" :key="index" @click="goBusinessEntry(item)">
<view class="icon">
<image :src="item.icon" mode=""></image>
</view>
@ -151,14 +151,15 @@
console.log('this.pdfUrl')
console.log(this.pdfUrl)
},
async goBusinessEntry(item) {
const res = await this.$store.dispatch('checkLogin')
console.log('res')
console.log(res)
if(!res) return
this.$goPage(item.url)
},
async myPageEntryClick(item) {
// if(item.text=='') {
// this.showPreview = false
// this.pdfUrl = ''
// await this.selectContractPdfBase64Fn()
// this.showPreview = true
// return
// }
await this.$store.dispatch('checkLogin')
this.$goPage(item.url)
}
}

11
store/modules/user.js

@ -34,6 +34,7 @@ const user = {
url: '/pages/userCenter/login/loginByPhone'
})
},
// 为非平台学员开一条路
updateNonPlatformStudent(state, val) {
state.NonPlatformStudent = val
@ -73,8 +74,18 @@ const user = {
// #endif
})
},
checkLogin({state, commit}) {
let token = state.vuex_loginInfo.accessToken
if(!token) {
commit('goLogin')
return false
}
return true
},
// 获取用户信息
async getUserInfo({state, commit}) {
let token = state.vuex_loginInfo.accessToken
if(!token) return
const http = uni.$u.http
let config = { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} }
const res = await http.get('app/student-record/get')

Loading…
Cancel
Save