diff --git a/config/api.js b/config/api.js index dfd7d37..287791c 100644 --- a/config/api.js +++ b/config/api.js @@ -20,6 +20,12 @@ export const getexamSite = (params) => http.get('business/school/getexamSite', { export const getExamSiteDatil = (params) => http.get('business/school/getExamSiteDatil', {params: params}) // 考场资讯 export const getExamSiteInfo = (params) => http.get('business/school/getExamSiteInfo', {params: params}) +// 创建驾校评价 +export const addSchoolComment = (data={}) => http.post('business/appcomplain/addSchoolComment', data,) +// 创建教练评价 +export const addCoachComment = (data={}) => http.post('business/appcomplain/addCoachComment', data,) +// 获取已报名驾校 +export const getStudentinfo = (params) => http.get('business/appcomplain/getStudentinfo', {params: params}) // 驾校评论分页 export const getSchoolListComment = (params) => http.get('business/school/getListComment', {params: params}) // 驾校详情 diff --git a/config/site.config.js b/config/site.config.js index 54c03af..9bdc128 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,7 @@ 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.26:48080/',//非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.36:48080/',//非代理地址 TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' diff --git a/pages.json b/pages.json index 5125e95..8a450bb 100644 --- a/pages.json +++ b/pages.json @@ -42,6 +42,16 @@ } }, { + "path": "webView/webView", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + // "navigationBarLoading": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "industryPolicy/industryPolicy", "style": { "navigationBarTitleText": "行业政策", diff --git a/pages/carEntry/evaluate/comp/evaluateItem.vue b/pages/carEntry/evaluate/comp/evaluateItem.vue index 92c0e5f..9358672 100644 --- a/pages/carEntry/evaluate/comp/evaluateItem.vue +++ b/pages/carEntry/evaluate/comp/evaluateItem.vue @@ -5,31 +5,37 @@ {{ info.tit }} - + - + - 王一宝 + {{info.school? info.schoolName: info.coachName}} 服务态度 - + + + + + 驾校风貌 + + 教学安排 - + 教学质量 - + @@ -39,24 +45,38 @@ - + - - - + + + - + - + 添加图片 + + + + + 添加视频 + + + + + + + + + @@ -68,18 +88,131 @@ \ No newline at end of file diff --git a/pages/indexEntry/findShcool/comments/comments.vue b/pages/indexEntry/findShcool/comments/comments.vue index a6a37f5..1fbac3e 100644 --- a/pages/indexEntry/findShcool/comments/comments.vue +++ b/pages/indexEntry/findShcool/comments/comments.vue @@ -28,6 +28,7 @@ methods: { changeNav(item) { this.currentNav = item.id + this.$emit('changeNav', item.id) } } } diff --git a/pages/indexEntry/findShcool/shcoolComment/shcoolComment.vue b/pages/indexEntry/findShcool/shcoolComment/shcoolComment.vue index aac8792..d09173b 100644 --- a/pages/indexEntry/findShcool/shcoolComment/shcoolComment.vue +++ b/pages/indexEntry/findShcool/shcoolComment/shcoolComment.vue @@ -1,6 +1,9 @@ @@ -15,21 +18,47 @@ pageNo: 1, pageSize: 20, schoolId: '', + condition: 0 }, total: 20, - list: [] + list: [], + status: 'loading' } }, onLoad(options) { this.params.schoolId = options.id this.getSchoolListCommentFn() }, + onPullDownRefresh() { + this.getSchoolListCommentFn().then(()=>{ + uni.stopPullDownRefresh() + }) + }, + onReachBottom() { + if(this.list.length>this.total) this.getSchoolListCommentFn() + }, methods: { + changeNav(val) { + this.params.condition = val + this.initList() + }, + initList() { + this.params.pageNo = 1 + this.status = 'loading' + this.list = [] + }, async getSchoolListCommentFn() { const {data: res} = await getSchoolListComment(this.params) this.params.pageNo ++ - this.list.push(...res.list) + let arr = res.list.map(item=>{ + if(item.images) { + item.images = item.images.split(',') + } + return item + }) + this.list.push(...arr) this.total = res.total + if(this.list.length>=this.total) this.status = 'nomore' } } } diff --git a/pages/indexEntry/theory/theory.vue b/pages/indexEntry/theory/theory.vue index b82b6ba..4a9ce8c 100644 --- a/pages/indexEntry/theory/theory.vue +++ b/pages/indexEntry/theory/theory.vue @@ -12,7 +12,7 @@ - 去练习 + 去练习 @@ -32,6 +32,33 @@ methods: { changeNav(item) { this.currentId = item.id + }, + goPage() { + if(this.currentId==1) { + // let url = 'https://www.hzsjspx.com/theory/scienceStudy?token=amlhcGVpMTY5NTc3NzUzODg5ODA5NjU1&lat=30.343055&lng=120.183711&isUni=1' + let questionUrl = 'http://192.168.1.44:92/question/' + let phone = this.vuex_userInfo.mobile + let obj = { + phone, + cityCode: '3311', + } + // #ifdef MP-WEIXIN + obj.isWx = 1 + // #endif + let uniItem = encodeURIComponent(JSON.stringify(obj)) + let url = `${questionUrl}?uniItem=${uniItem}` + console.log(url) + this.$store.commit('updateWebVeiwUrl', url) + this.$goPage('/pages/indexEntry/webView/webView') + }else if(this.currentId==2) { + let theory = 'http://192.168.1.44:91/theory/' + let token = this.$store.state.user.vuex_loginInfo.accessToken + let lat = this.vuex_cityInfo.lat|| 30.27419537786047 + let lng = this.vuex_cityInfo.lng|| 120.20633397715788 + let url = `${theory}?token=${token}&lat=${lat}&lng=${lng}&isUni=1` + this.$store.commit('updateWebVeiwUrl', url) + this.$goPage('/pages/indexEntry/webView/webView') + } } } } diff --git a/pages/indexEntry/webView/webView.vue b/pages/indexEntry/webView/webView.vue new file mode 100644 index 0000000..9699c38 --- /dev/null +++ b/pages/indexEntry/webView/webView.vue @@ -0,0 +1,45 @@ + + + + +