Browse Source

添加非平台学员填写信息

master
unknown 11 months ago
parent
commit
2bd8a5f024
  1. 10
      common/css/app.scss
  2. 2
      common/js/utils.js
  3. 2
      components/commentItem/commentItem.vue
  4. 4
      config/api.js
  5. 4
      config/site.config.js
  6. 2
      config/utils.js
  7. 11
      manifest.json
  8. 17
      pages/carEntry/evaluate/evaluate.vue
  9. 4
      pages/carEntry/examineAppointment/comp/pickDate.vue
  10. 4
      pages/carEntry/operaAppointment/comp/pickDate.vue
  11. 13
      pages/carEntry/simulateAppointment/comp/pickDate.vue
  12. 64
      pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue
  13. 2
      pages/indexEntry/consult/consult.vue
  14. 5
      pages/indexEntry/consult/pubComplaint/pubComplaint.vue
  15. 91
      pages/indexEntry/enroll/enroll.vue
  16. 4
      pages/indexEntry/enroll/realName/realName.vue
  17. 5
      pages/indexEntry/enroll/registInfo/registInfo.vue
  18. 3
      pages/indexEntry/examines/comp/examineItem.vue
  19. 2
      pages/indexEntry/examines/detail/detail.vue
  20. 4
      pages/indexEntry/publicVideo/videoDetail/videoDetail.vue
  21. 18
      pages/mineEntry/myEvaluate/comp/commentItem.vue
  22. 2
      pages/mineEntry/myEvaluate/myEvaluate.vue
  23. 8
      pages/mineEntry/personaInfo/personaInfo.vue
  24. 27
      pages/tabbar/index/index.vue
  25. 2
      pages/tabbar/learnCar/comp/subject0.vue
  26. 4
      pages/tabbar/learnCar/comp/subject2.vue
  27. 2
      pages/tabbar/learnCar/comp/subject3.vue

10
common/css/app.scss

@ -133,13 +133,3 @@ image {
input::-ms-input-placeholder {
color: #CDCDCD !important;
}
// /* webkit专用 */
.input1::-webkit-input-placeholder { color:#00f; }
// #input2::-webkit-input-placeholder { color:#090; background:lightgreen; text-transform:uppercase; }
// #input3::-webkit-input-placeholder { font-style:italic; text-decoration:overline; color:#999; }
// /* mozilla专用 */
// #input1::-moz-placeholder { color:#00f; }
// #input2::-moz-placeholder { color:#090; background:lightgreen; text-transform:uppercase; }
// #input3::-moz-placeholder { font-style:italic; text-decoration:overline; color:#999; }

2
common/js/utils.js

@ -14,7 +14,7 @@ const install = (Vue, vm) => {
const distanceFn = (val) => {
if(!val) return
if (val * 1 < 1000) {
return val + '米'
return val.toFixed(2) + '米'
} else {
return (val / 1000).toFixed(2) + '公里'
}

2
components/commentItem/commentItem.vue

@ -5,7 +5,7 @@
<view class="date">{{ $u.date(item.createTime ,'yyyy/mm/dd' ) }}</view>
</view>
<view class="starBox">
<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.stars" :count="5" :readonly="true" ></u-rate>
<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.stars" :count="5" :readonly="true" allowHalf></u-rate>
<view class="num">{{ item.stars }}</view>
</view>
<view class="text">{{ item.description }}</view>

4
config/api.js

@ -7,11 +7,11 @@ export const getAgreement = (params, config = {}) => http.post('/util/manage/get
// 验证码登录
export const loginSMS = (data) => http.post('member/auth/sms-login', data, { custom: { noToken: true }})
// 登录发验证码
export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data, { custom: { noToken: true }})
export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data, { custom: { noToken: true, }})
// 获取个人信息
export const getUserInfo = (data) => http.post('member/user/get', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
// 退出登录
export const logOut = (data={}) => http.post('member/auth/logout', data,)
export const logOut = (data={}) => http.post('member/auth/logout', data, {custom: {catch: true, toast: false }})
// 驾校列表分页
export const schoolPage = (params) => http.get('business/school/page', {params: params})
// 附近场地

4
config/site.config.js

@ -2,8 +2,8 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
// localIp = false
module.exports = {
H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48080/',//非代理地址
website: 'http://192.168.1.44:8001/h5/#',
WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.36:48080/',//非代理地址
website: 'http://192.168.1.44:90/h5/#',
httpPrefix: 'app-api/',
imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/'
};

2
config/utils.js

@ -118,7 +118,7 @@ export function uploadImgApi(filePath, imgName) {
},
header: {
Authorization: token,
'tenant-id': 1
'tenant-id': '1704459882232553474'
},
success(res) {
console.log('上传成功')

11
manifest.json

@ -43,7 +43,9 @@
]
},
/* ios */
"ios" : {},
"ios" : {
"dSYMs" : false
},
/* SDK */
"sdkConfigs" : {
"share" : {
@ -51,7 +53,8 @@
"appid" : "wxae509f512c11c039",
"UniversalLinks" : ""
}
}
},
"ad" : {}
}
}
},
@ -89,12 +92,12 @@
"vueVersion" : "2",
"h5" : {
"devServer" : {
"port" : 8000,
"port" : 90,
"disableHostCheck" : true,
"proxy" : {
"/api" : {
// "target" : "http://192.168.1.26:48080/",
"target" : "http://192.168.1.39:48080/",
"target" : "http://192.168.1.36:48080/",
"changeOrigin" : true,
"secure" : true,
"pathRewrite" : {

17
pages/carEntry/evaluate/evaluate.vue

@ -13,6 +13,7 @@
<script>
import evaluateItem from './comp/evaluateItem'
import { getStudentinfo, addSchoolComment,addCoachComment } from '@/config/api.js'
import school from '../../../store/modules/school'
export default {
components: {
evaluateItem
@ -24,7 +25,8 @@
schoolInfo: {},
coachInfo: {},
subject: '',
showSchool: true
showSchool: true,
coachType: '', //1. 2. 3.
}
},
onLoad(options) {
@ -32,6 +34,7 @@
this.tit = options.tit
this.showSchool = false
}
if(options.coachType) this.coachType = options.coachType
this.subject = options.subject
this.getStudentinfoFn()
@ -41,6 +44,8 @@
let {schoolInfo, coachInfo} = this
let num1 = schoolInfo.schoolLevel + schoolInfo.qualityLevel + schoolInfo.teachLevel + schoolInfo.serviceLevel
let num2 = coachInfo.qualityLevel + coachInfo.teachLevel + coachInfo.serviceLevel
console.log(num1)
console.log(num2)
if(num1&&num2) {
return true
}else {
@ -70,7 +75,8 @@
"videoUrl": "",
"anonymity": 2,
"userId": 0,
imgArr: []
imgArr: [],
coachType: this.coachType
}
this.coachInfo = {
tit: '您对教练满意吗?',
@ -91,7 +97,8 @@
"anonymity": 2,
"userId": 0,
coachName: '',
imgArr: []
imgArr: [],
coachType: this.coachType
}
if(this.tit=='模拟器老师') {
this.coachInfo.tit = '您对模拟器老师满意吗?'
@ -121,6 +128,10 @@
if(this.schoolInfo.imgArr.length) {
this.schoolInfo.images = this.schoolInfo.imgArr.join(',')
}
let schoolScore = [this.schoolInfo.serviceLevel,this.schoolInfo.schoolLevel,this.schoolInfo.teachLevel,this.schoolInfo.qualityLevel].some(item=>item*1>0)
let coachInfoScore = [this.coachInfo.serviceLevel,this.coachInfo.teachLevel,this.coachInfo.qualityLevel].some(item=>item*1>0)
if(!schoolScore) return this.$u.toast('请对驾校评分')
if(!coachInfoScore) return this.$u.toast('请对教练评分')
const res = await addSchoolComment(this.schoolInfo)
const res2 = await addCoachComment(this.coachInfo)
this.initFrom()

4
pages/carEntry/examineAppointment/comp/pickDate.vue

@ -142,8 +142,10 @@
//
async initDate() {
this.startDate = this.$u.timeFormat(new Date()*1, 'yyyy-mm-dd');
this.maxDate = this.endDate = new Date('2023-11-30')*1
//
this.minDate = new Date()*1
const oneMonthMilliseconds = 30 * 24 * 60 * 60 * 1000;
this.maxDate = this.endDate = this.minDate + oneMonthMilliseconds
this.dateArr = getDates(this.startDate, this.endDate);
this.chooseDay = this.dateArr[0][0].date

4
pages/carEntry/operaAppointment/comp/pickDate.vue

@ -163,8 +163,10 @@
//
async initDate() {
this.startDate = this.$u.timeFormat(new Date()*1, 'yyyy-mm-dd');
this.maxDate = this.endDate = new Date('2023-11-30')*1
//
this.minDate = new Date()*1
const oneMonthMilliseconds = 30 * 24 * 60 * 60 * 1000;
this.maxDate = this.endDate = this.minDate + oneMonthMilliseconds
this.dateArr = getDates(this.startDate, this.endDate);
this.chooseDay = this.dateArr[0][0].date

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

@ -142,16 +142,17 @@
//
async initDate() {
this.startDate = this.$u.timeFormat(new Date()*1, 'yyyy-mm-dd');
let startArr = this.startDate.split('-')
startArr[1] = startArr[1]*1+1
let startStr = startArr.join('-')
this.maxDate = this.endDate = new Date(startStr)*1
//
this.minDate = new Date()*1
const oneMonthMilliseconds = 30 * 24 * 60 * 60 * 1000;
this.maxDate = this.endDate = this.minDate + oneMonthMilliseconds
console.log('**************')
console.log(this.startDate)
console.log(this.endDate)
this.dateArr = getDates(this.startDate, this.endDate);
this.chooseDay = this.dateArr[0][0].date
console.log(this.startDate)
console.log(this.endDate)
this.simulationClassFn()
},
//

64
pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue

@ -5,11 +5,11 @@
<view class="card">
<view class="row">
<view class="lab">姓名</view>
<view class="value">李轻云</view>
<view class="value">{{form.name}}</view>
</view>
<view class="row">
<view class="lab">证件号</view>
<view class="value">4310271992365685</view>
<view class="value">{{form.idcard}}</view>
</view>
<view class="row">
<view class="lab">证件类型</view>
@ -22,7 +22,7 @@
<view class="lab">手机号</view>
<view class="rightCon">
<view class="val">
<input v-model="form.classModel" placeholder="请输入手机号" /></input>
<input v-model="form.phone" placeholder="请输入手机号" /></input>
</view>
</view>
</view>
@ -30,7 +30,7 @@
<view class="lab">驾校名称</view>
<view class="rightCon">
<view class="val">
<input v-model="form.classModel" placeholder="请输入手机号" /></input>
<input v-model="form.schoolName" placeholder="请输入驾校名称" /></input>
</view>
</view>
</view>
@ -38,7 +38,7 @@
<view class="lab">学驾车型</view>
<view class="rightCon">
<view class="val" @click="showType=true">
<input v-model="form.classModel" placeholder="请选择" disabled=""/></input>
<input v-model="form.trainType" placeholder="请选择" disabled="" style="pointer-events: none;"/></input>
</view>
<view class="icon" @click="showType=true">
<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;"></u-icon>
@ -58,16 +58,20 @@
<script>
import {
getpersonface,
GetDetectInfoEnhanced,
getCardType
applyOnline
} from '@/config/api.js'
export default {
data() {
return {
form: {
value: 1,
typeName: '身份证'
cardType: '身份证',
phone: '',
trainType: '',
name: '',
idcard: '',
schoolName: '',
applyType: 5,//12345
},
showType: false,
typeArr: [
@ -77,40 +81,32 @@
// 0123456
},
onLoad(options) {
this.form.userId = this.userId
this.form.phone = this.vuex_userInfo.phone
this.form.accountId = this.vuex_userInfo.accountId
this.form.address = this.vuex_userInfo.address
this.form.name = this.vuex_userInfo.name
this.form.idcard = this.vuex_userInfo.idcard
this.form.nationality = this.vuex_userInfo.nationality || '中国'
this.form.cardType = this.vuex_userInfo.cardType || '1'
},
methods: {
confirmType(val) {
let item = val.value[0]
// this.form.value = item.value
console.log(item)
this.form.trainType = item.value
// this.form.typeName = item.label
this.showType = false
},
goNext() {
// return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
if (!this.form.value) return this.$u.toast('请选择证件类型')
//
if (this.vuex_userInfo.applyStep == 3) {
return this.$goPage('/pages/indexEntry/enroll/signContract/signContract')
}
//
if (this.vuex_userInfo.applyStep == 2) {
if (this.title == '学员信息') {
//
return his.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
}
return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
}
//
if (this.vuex_userInfo.applyStep == 4 || this.vuex_userInfo.applyStep == 5) {
return this.$goPage('/pages/indexEntry/enroll/payment/payment')
}
if (!this.vuex_userInfo.applyStep || this.vuex_userInfo.applyStep < 2) {
// return this.$goPage('/pages/indexEntry/enroll/realName/realName')
this.getpersonfaceFn()
}
async goNext() {
if(!this.form.phone) return this.$u.toast('请输入手机号')
if(!this.form.schoolName) return this.$u.toast('请输入驾校名称')
if(!this.form.trainType) return this.$u.toast('请选择学驾车型')
const {data: res} = await applyOnline(this.form)
await this.$store.dispatch('getUserInfo')
// this.$goPage('/pages/indexEntry/enroll/signContract/signContract')
// this.$goPage('/pages/indexEntry/enroll/uploadAvatar/uploadAvatar')

2
pages/indexEntry/consult/consult.vue

@ -13,7 +13,7 @@
</view>
</view>
<view class="question">
<view class="h1">问题</view>
<view class="h1">问题</view>
<view class="card que">
<u-collapse :body-style="itemStyle" :border="false">
<u-collapse-item :title="item.question" v-for="(item, index) in itemList" :key="index" style="border-bottom: 1rpx solid #E8E9EC;">

5
pages/indexEntry/consult/pubComplaint/pubComplaint.vue

@ -123,7 +123,7 @@
schoolName: '',
schoolId: '',
content: '',
type: 2
type: 2,
},
radiolist1: [{
name: '投诉驾校',
@ -210,9 +210,10 @@
if(!this.form.content) return this.$u.toast('请输入内容')
this.form.images = this.imgArr.join(',')
let obj = Object.assign({}, this.form)
obj.studentPhone = this.vuex_userInfo.phone,
delete obj.value
delete obj.complainTypeName
const {data: res} = await createcomplain(this.form)
const {data: res} = await createcomplain(obj)
this.$u.toast('发布成功')
setTimeout(()=>{
this.$goPage('/pages/indexEntry/consult/record/record?tab=2')

91
pages/indexEntry/enroll/enroll.vue

@ -14,22 +14,49 @@
</view>
</view>
</view>
<view class="row" v-if="form.value==7">
<view class="lab">国籍</view>
<view class="rightCon">
<view class="val">
<input v-model="form.classModel" placeholder="请选择" @click="showType=true" disabled/></input>
<view class="" v-if="form.value!=1">
<!-- <view class="row" v-if="form.value==7">
<view class="lab">国籍</view>
<view class="rightCon">
<view class="val">
<input v-model="form.nationality" placeholder="请选择" @click="showType=true" disabled/></input>
</view>
<view class="icon">
<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
</view>
</view>
<view class="icon">
<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
</view> -->
<view class="row">
<view class="lab">证件号码</view>
<view class="rightCon">
<view class="val">
<input v-model="form.idcard" placeholder="请输入" /></input>
</view>
</view>
</view>
</view>
<view class="row" v-if="form.value!=1">
<view class="lab">证件号码</view>
<view class="rightCon">
<view class="val">
<input v-model="form.a" placeholder="请输入" /></input>
<view class="row">
<view class="lab">真实姓名</view>
<view class="rightCon">
<view class="val">
<input v-model="form.name" placeholder="请输入" /></input>
</view>
</view>
</view>
<view class="row">
<view class="lab">性别</view>
<view class="rightCon">
<u-radio-group v-model="form.sex">
<u-radio shape="circle" label="男" name="1"></u-radio>
<u-radio shape="circle" label="女" name="2" style="margin-left: 54rpx;"></u-radio>
</u-radio-group>
</view>
</view>
<view class="row">
<view class="lab">户籍地址</view>
<view class="rightCon">
<view class="val">
<input v-model="form.address" placeholder="请输入" /></input>
</view>
</view>
</view>
</view>
@ -61,7 +88,18 @@
return {
form: {
value: 1,
typeName: '身份证'
nationality: '中国',
idcard: '',
name: '',
sex: '1',
address: '',
typeName: '身份证',
},
formToast: {
idcard: '请输入证件号码',
name: '请输入真实姓名',
sex: '请选择性别',
address: '请输入户籍地址',
},
showType: false,
typeArr: [],
@ -135,8 +173,11 @@
},
goNext() {
// return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
if(!this.form.value) return this.$u.toast('请选择证件类型')
// if(!this.form.value) return this.$u.toast('')
// this.$goPage('/pages/indexEntry/enroll/signContract/signContract?schoolId='+this.vuex_userInfo.schoolId)
// return
//
if(this.vuex_userInfo.applyStep==3) {
return this.$goPage('/pages/indexEntry/enroll/signContract/signContract')
}
@ -152,8 +193,24 @@
if(this.vuex_userInfo.applyStep==4||this.vuex_userInfo.applyStep==5) {
return this.$goPage('/pages/indexEntry/enroll/payment/payment')
}
//
if(this.form.value!==1) {
for(let key in this.formToast) {
if(!this.form[key]) {
return this.$u.toast(this.formToast[key])
}
}
this.vuex_userInfo.address = this.form.address
this.vuex_userInfo.name = this.form.name
this.vuex_userInfo.sex = this.form.sex
this.vuex_userInfo.idcard = this.form.idcard
this.vuex_userInfo.nationality = (this.form.value==7||this.form.value==2)?'外国':'中国'
this.vuex_userInfo.cardType = this.form.value
return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
}
//
if(!this.vuex_userInfo.applyStep||this.vuex_userInfo.applyStep<2) {
// return this.$goPage('/pages/indexEntry/enroll/realName/realName')
this.getpersonfaceFn()
}
@ -198,7 +255,7 @@
width: 30rpx;
height: 30rpx;
u-icon {
color: #fff;
}
}
}

4
pages/indexEntry/enroll/realName/realName.vue

@ -39,8 +39,8 @@
}
// console.log(obj2)
alert('请求结果来了')
alert(obj2.Text.ErrMsg)
// alert('')
// alert(obj2.Text.ErrMsg)
// alert(obj2.Text.name)
// uni.setStorageSync(obj2)
},

5
pages/indexEntry/enroll/registInfo/registInfo.vue

@ -309,7 +309,7 @@
driveLicence: '',//
firstDriveDate: '',//
sex: 2,
phone: '18267103167',
phone: '',
applyType: 1,
name: '',
oldTrainType: '',//
@ -338,6 +338,9 @@
this.form.address = this.vuex_userInfo.address
this.form.name = this.vuex_userInfo.name
this.form.idcard = this.vuex_userInfo.idcard
this.form.phone = this.vuex_userInfo.phone
this.form.nationality = this.vuex_userInfo.nationality || '中国'
this.form.cardType = this.vuex_userInfo.cardType || '1'
uni.$on('upDateCoachItem',(item)=>{
console.log(item)
this.form.coach = item.name

3
pages/indexEntry/examines/comp/examineItem.vue

@ -2,7 +2,7 @@
<view class="li" @click="$goPage('/pages/indexEntry/examines/detail/detail?id='+ item.id)">
<view class="flex">
<view class="cover">
<image src="@/static/images/logo.png" mode=""></image>
<image :src="item.images" mode="" v-if="item.images"></image>
</view>
<view class="textCon">
<view class="name">{{ item.name}}</view>
@ -51,6 +51,7 @@
.cover {
width: 204rpx;
height: 140rpx;
background-color: #f5f5f5;
border-radius: 8rpx;
overflow: hidden;
}

2
pages/indexEntry/examines/detail/detail.vue

@ -13,7 +13,7 @@
<view <view class="pad traTop">
<view class="card info">
<view class="cover">
<image :src="detailInfo.images" mode="widthFix"></image>
<image :src="detailInfo.images" mode="aspectFill"></image>
</view>
<view class="textCon">
<view class="name">{{detailInfo.name}}</view>

4
pages/indexEntry/publicVideo/videoDetail/videoDetail.vue

@ -75,7 +75,7 @@
},
onLoad(options) {
this.id = options.id
this.params = {knowledge: this.id, mobile: this.vuex_userInfo.mobile}
this.params = {knowledge: this.id, mobile: this.vuex_userInfo.phone}
this.publicGetvideoFn()
},
@ -106,7 +106,7 @@
async createCollectFn() {
if(this.operateInfo.collect) {
this.operateInfo.collect = 0
await deleteRetransmission({mobile: this.vuex_userInfo.mobile, CollectId: this.operateInfo.collectId})
await deleteRetransmission({mobile: this.vuex_userInfo.phone, CollectId: this.operateInfo.collectId})
}else {
this.operateInfo.collect = 1
await createCollect(this.params)

18
pages/mineEntry/myEvaluate/comp/commentItem.vue

@ -7,8 +7,8 @@
<view class="textInfo">
<view class="name oneRowText">{{ item.name}}</view>
<view class="starBox">
<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.stars" :count="5" :readonly="true" ></u-rate>
<view class="num">{{ item.stars }}</view>
<u-rate active-color="#1989FA" inactive-color="#1989FA" gutter="1" :size="16" :value="item.score" :readonly="true" allowHalf></u-rate>
<view class="num">{{ item.score?item.score.toFixed(1):0 }}</view>
</view>
</view>
<view class="date">{{ $u.date(item.createTime ,'yyyy/mm/dd' ) }}</view>
@ -17,6 +17,9 @@
<view class="imgBox" v-if="item.images&&item.images.length">
<u-album :urls="item.images" :multipleSize="'160rpx'"></u-album>
</view>
<view class="vdo" v-if="item.videoUrl">
<video :src="item.videoUrl" objectFit="fill"></video>
</view>
</view>
</template>
@ -76,4 +79,15 @@
margin-right: 24rpx;
}
}
.vdo {
margin-top: 12rpx;
width: 360rpx;
height: 296rpx;
border-radius: 8rpx;
overflow: hidden;
video {
width: 100%;
height: 100%;
}
}
</style>

2
pages/mineEntry/myEvaluate/myEvaluate.vue

@ -6,7 +6,7 @@
<commentItem :item="item"/>
</view>
</view>
<view style="padding-bottom: 20rpx;">
<view style="padding-bottom: 20rpx;" v-if="list.length>4">
<u-loadmore :status="status" />
</view>
</view>

8
pages/mineEntry/personaInfo/personaInfo.vue

@ -58,8 +58,12 @@
content: '确定要退出登录吗?',
success: async function (res) {
if (res.confirm) {
await logOut()
_this.$store.commit('goLogin')
logOut().then(()=>{
_this.$store.commit('goLogin')
}).catch(()=>{
_this.$store.commit('goLogin')
})
} else if (res.cancel) {
console.log('用户点击取消');
}

27
pages/tabbar/index/index.vue

@ -293,7 +293,20 @@
methods: {
entrySectionClick(item) {
if(item.text=='我要报名') {
this.$goPage(item.url)
this.$store.commit('updateNonPlatformStudent', false)
if(this.vuex_userInfo.applyStep==3) {
return this.$goPage('/pages/indexEntry/enroll/signContract/signContract')
}
//
if(this.vuex_userInfo.applyStep==2) {
return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
}
//
if(this.vuex_userInfo.applyStep==4||this.vuex_userInfo.applyStep==5) {
return this.$goPage('/pages/indexEntry/enroll/payment/payment')
}
}
this.$goPage(item.url)
},
@ -326,11 +339,15 @@
uni.scanCode({
success: function(res) {
console.log('条码类型:' + res.scanType);
console.log('条码内容:' + res.result);
_this.$store.commit('updateWebVeiwUrl', res.result)
uni.navigateTo({
url: '/pages/other/webView/webView'
})
console.log('条码内容6:' + res.result);
let coderes = JSON.parse(res.result)
console.log(coderes)
console.log(decodeURIComponent(coderes.like))
// _this.$store.commit('updateWebVeiwUrl', res.result)
// uni.navigateTo({
// url: '/pages/other/webView/webView'
// })
}
});
},

2
pages/tabbar/learnCar/comp/subject0.vue

@ -29,7 +29,7 @@
<view class="flex-b bg">
<view class="row">
<view class="text">评价模拟器教学老师</view>
<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?tit=模拟器老师')">去评价</view>
<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?coachType=3&tit=模拟器老师&')">去评价</view>
</view>
</view>
</view>

4
pages/tabbar/learnCar/comp/subject2.vue

@ -9,7 +9,7 @@
<view class="btn">去预约</view>
</view>
</view>
<view class="card mb0">
<view class="card mb0" @click="$goPage('/pages/carEntry/examineAppointment/examineAppointment')">
<view class="flex-b">
<view class="lab">考场模拟训练</view>
<view class="btn disable">去预约</view>
@ -35,7 +35,7 @@
<view class="flex-b bg">
<view class="row">
<view class="text">考试成绩100</view>
<view class="btn" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate?subject=2')">去评价</view>
<view class="btn" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate?subject=2&coachType=1')">去评价</view>
</view>
</view>
</view>

2
pages/tabbar/learnCar/comp/subject3.vue

@ -60,7 +60,7 @@
</view>
<view class="flex-b bg">
<view class="row oneBtn">
<view class="btn" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate?tit=考场模拟老师')">去评价</view>
<view class="btn" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate?tit=考场模拟老师&coachType=2')">去评价</view>
</view>
</view>
</view>

Loading…
Cancel
Save