diff --git a/src/api/herbalMedicine.js b/src/api/herbalMedicine.js index 566993d..2340e41 100644 --- a/src/api/herbalMedicine.js +++ b/src/api/herbalMedicine.js @@ -18,23 +18,15 @@ const queryGetLawDetails = params => api('/index/getLawDetails.do', params, 'get /** 查询驾校列表||首页驾校查询 */ // const queryTrainingSchoolList = params => api('/index/queryTrainingSchoolList.do', params) -/** 查询官网驾校信息 */ -const queryGetSchoolDetailById = params => api('/index/getSchoolDetailById.do', params, 'get') -/** 查询驾校场地图片列表 */ -const queryGetSiteBySchoolId = params => api('/index/getSiteBySchoolId.do', params, 'get') + + /** 查询驾校教练员详情 */ // const queryQueryList = params => api('/coach/manage/queryList.do', params, 'get') -/** 根据驾校查询班型列表 */ -const queryTrainingClasss = params => api('/index/getTrainingClasss.do', params, 'get') -/** 地图驾校搜索 */ -const queryGetSchoolByName = params => api('/index/getSchoolByName.do', params, 'get', false) -/** 创建投诉咨询 */ -const queryCreateComplaint = params => api('/index/createComplaint.do', params) /** 首页驾培统计 */ // const queryIndexCollectList = params => api('/index/indexCollectList.do', params, 'post', false) @@ -45,8 +37,6 @@ const queryGetHospitalList = params => api('/index/getHospitalList.do', params, /** 查询体检地址列表无loading */ const queryNoLoadingGetHospitalList = params => api('/index/getHospitalList.do', params, 'get', false) -/** 根据区域分组查询驾校数量 */ -const queryIndexSchoolGroupList = params => api('/index/indexSchoolGroupList.do', params, 'get') /** 学车须知或者驾驶常识列表接口 */ const queryEssayList = params => api('/ar/essay/essayList.do', params, 'get') @@ -100,6 +90,23 @@ const queryQueryList = params => api('/website/luoyang/getCoachListWebPage', par const querySimpleIndustryDynamics = params => api('/website/luoyang/articlezcWebsite', params, 'get') // 获得行业资讯-政策管理-详情 const queryIndustryDynamicDetails = params => api('/website/luoyang/getarticleWebsite', params, 'get') +/** 创建投诉咨询 */ +const queryCreateComplaint = params => api('/website/luoyang/createconsultWebsite', params, 'post') +/** 根据区域分组查询驾校数量 */ +const queryIndexSchoolGroupList = params => api('/website/luoyang/getDistricetSchoolList', params, 'post') +/** 驾校详情 */ +const queryGetSchoolDetailById = params => api('/website/luoyang/getselectDetailOne', params, 'get') +/** 根据驾校查询班型列表 */ +const queryTrainingClasss = params => api('/website/luoyang/getSchoolClassListWebPage', params, 'get') +/** 查询驾校场地图片列表 */ +const queryGetSiteBySchoolId = params => api('/website/luoyang/getTrainingSitePage', params, 'post') +// 驾校详情里的统计车辆与教练数 +const getWebsiteSchoolDetailRespVO = params => api('/website/luoyang/getWebsiteSchoolDetailRespVO', params, 'get') +/** 地图驾校搜索 */ +const queryGetSchoolByName = params => api('/website/luoyang/getWebsiteSchoolMapList', params, 'get', ) + + + @@ -137,4 +144,5 @@ export { recommendSchoolList1, recommendCoachList, + getWebsiteSchoolDetailRespVO, } diff --git a/src/components/dstributiondMap.vue b/src/components/dstributiondMap.vue index f29f495..988db62 100644 --- a/src/components/dstributiondMap.vue +++ b/src/components/dstributiondMap.vue @@ -163,8 +163,6 @@ export default { type: Array, default: function () { return [ - // 坐标点数据，格式 {name: 'xxx', value: [经度,纬度]} - // 散点数据,地图上的数量 { name: "老城区", LngAndLat: [112.477298,34.682945], num: 0 }, { name: "西工区", LngAndLat: [112.443232,34.667847], num: 0 }, { name: "瀍河回族区", LngAndLat: [112.491625, 34.684738], num: 0 }, diff --git a/src/components/swiper.vue b/src/components/swiper.vue index 752ab48..d37d4f8 100644 --- a/src/components/swiper.vue +++ b/src/components/swiper.vue @@ -35,10 +35,10 @@ >
- + > -->

关爱生命 关注安全

diff --git a/src/components/swiperSchool.vue b/src/components/swiperSchool.vue index 7960bdf..38aecf7 100644 --- a/src/components/swiperSchool.vue +++ b/src/components/swiperSchool.vue @@ -63,7 +63,7 @@ export default { this.$router.push({ name: 'Drivedetail', query: { - id: item.trainingSchoolId + id: item.id } }) } diff --git a/src/views/contact/index.vue b/src/views/contact/index.vue index add3adc..a883db9 100644 --- a/src/views/contact/index.vue +++ b/src/views/contact/index.vue @@ -19,9 +19,9 @@
-

服务

-

教学质量

-

费用

+

服务态度

+

教学质量

+

退费问题

 @@ -42,9 +42,9 @@ - + 提交 重置 @@ -126,13 +126,14 @@ export default { // 创建投诉咨询 getQueryCreateComplaint () { queryCreateComplaint({ - complaintId: this.ruleForm.complaint, + complainType: this.ruleForm.complaint, + userType: this.ruleForm.beau=='驾校'?1:2 , content: this.ruleForm.desc, // image: this.dialogImageUrl, coachName: this.ruleForm.coachName, schoolName: this.ruleForm.schoolName, phone: this.ruleForm.connect, - types: this.ruleForm.type == '咨询' ? 0 : 1 + type: this.ruleForm.type == '咨询' ? 1 : 2 }).then(res => { if (res.code == 0) { this.$alert('提交成功', this.ruleForm.type, { @@ -149,7 +150,7 @@ export default { submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { - this.showMessage("正在开发中！"); + this.getQueryCreateComplaint() } else { console.log('error submit!!'); return false; diff --git a/src/views/driveDetail/index.scss b/src/views/driveDetail/index.scss index d717e09..dd6a9fd 100644 --- a/src/views/driveDetail/index.scss +++ b/src/views/driveDetail/index.scss @@ -203,9 +203,10 @@ height: 340px; margin: 0 24px 22px 0; - .driving-imgz { + .driving-img { width: 100%; height: 100%; + display: block; } } } diff --git a/src/views/driveDetail/index.vue b/src/views/driveDetail/index.vue index eab5f97..84d077e 100644 --- a/src/views/driveDetail/index.vue +++ b/src/views/driveDetail/index.vue @@ -15,19 +15,19 @@
-
- +
+
-
{{ dataSheetDetail.schoolName }}
+
{{ dataSheetDetail.name }}
-

{{ dataSheetDetail.starLevel }}分

+

{{ dataSheetDetail.stars }}分

-

{{dataSheetDetail.commonPhone ? dataSheetDetail.commonPhone : dataSheetDetail.contactPhone}}

+

{{dataSheetDetail.phone}}

-
报名咨询
+
-
0
+
{{ carCoachObj.entryFee }}
元
报名费
-
+
-
100
+
{{ carCoachObj.classPrice }}
元
课时单价
-
100
-
元
+
{{ carCoachObj.carTotal }}
+
辆
车辆数
-
100
-
元
+
{{ carCoachObj.coachTotal }}
+
人
教练数
-
-
-
100
-
元
+
+
+
{{ carCoachObj.reserveTotal }}
+
人
预约数
@@ -92,13 +92,13 @@
- +

驾校简介

-

{{dataSheetDetail.introduce ? dataSheetDetail.introduce : ''}}

+

{{dataSheetDetail.schoolIntroduce.introduce}}

 @@ -108,11 +108,9 @@
-
- +
+
@@ -120,9 +118,9 @@
- + - + @@ -143,16 +141,16 @@ />

{{ dataSheetDetail.address }}

-
+
-

{{ dataSheetDetail.commonPhone ? dataSheetDetail.commonPhone : dataSheetDetail.contactPhone }}

+

{{ dataSheetDetail.phone }}

@@ -167,6 +165,7 @@ import { queryGetSchoolDetailById, queryGetSiteBySchoolId, queryQueryList, + getWebsiteSchoolDetailRespVO, queryTrainingClasss } from "@/api/herbalMedicine"; import { formatTime } from "@/utils/common.js"; @@ -209,16 +208,18 @@ export default { }, ], // 驾校详情 - dataSheetDetail: null, + dataSheetDetail: {}, // 场地图片列表 dataSpaceList: [], // 驾校教练列表 coachList: [], + carCoachObj: {}, //统计信息 }; }, created() { // 官网驾校信息 this.getQueryGetSchoolDetailById(); + this.getWebsiteSchoolDetailRespVOFn() }, methods: { handleClick(tab, event) { @@ -234,7 +235,7 @@ export default { // 官网驾校信息 getQueryGetSchoolDetailById() { queryGetSchoolDetailById({ - schoolId: this.$route.query.id, + id: this.$route.query.id, }).then((res) => { this.dataSheetDetail = res.data; @@ -243,12 +244,19 @@ export default { } }); }, + // 统计教练车辆信息 + async getWebsiteSchoolDetailRespVOFn() { + const {data: res} = await getWebsiteSchoolDetailRespVO({ schoolId: this.$route.query.id,}) + console.log('++++++++++') + this.carCoachObj = res + console.log(res) + }, // 查询驾校场地图片列表 getQueryGetSiteBySchoolId() { queryGetSiteBySchoolId({ schoolId: this.$route.query.id, }).then((res) => { - this.dataSpaceList = res.data; + this.dataSpaceList = res.data.list; }); }, // 查询驾校教练员详情 @@ -264,10 +272,9 @@ export default { queryTrainingClasss({ schoolId: this.$route.query.id, }).then((res) => { - this.tableData = res.data; - + this.tableData = res.data.list; for (var item of this.tableData ) { - item.totalPrice = (item.totalPrice/100).toFixed(2); + item.totalPrice = (item.totalAmount/100).toFixed(2); } }); diff --git a/src/views/drivingMap/index.vue b/src/views/drivingMap/index.vue index c18a944..a9717c6 100644 --- a/src/views/drivingMap/index.vue +++ b/src/views/drivingMap/index.vue @@ -5,7 +5,7 @@
- + @@ -97,11 +97,11 @@ export default { // 全部区域列表 getQueryIndexOrignList () { queryIndexOrignList().then(res => { - res.data.unshift({regionCode: "all", regionName: "全城"}) + res.data.unshift({areaCode: "all", areaName: "全城"}) this.orignList = res.data if (this.$route.query && this.$route.query.city) { this.orignList.map(item => { - if (item.regionName === this.$route.query.city) this.scity = item.regionCode + if (item.areaName === this.$route.query.city) this.scity = item.areaCode }) } this.selectBlur = true @@ -130,7 +130,7 @@ export default { this.dropShow = true } else { this.dataSheetList = res.data - this.showMessage('未找到结果', "error"); + // this.showMessage('未找到结果', "error"); } }) }, @@ -162,9 +162,8 @@ export default { this.selectBlur=true this.Location='' this.dropShow = false - if (this.Location != '') { - this.getQueryGetSchoolByName() - } + this.getQueryGetSchoolByName() + }, tapInputFocus (e) { if (this.selectBlur) { @@ -187,7 +186,7 @@ export default { }) if (_name == '全城') _name = '洛阳市' window.open( - `https://api.map.baidu.com/geocoder?address=${_name}驾校&output=html®ion=杭州&src=我的位置`, + `https://api.map.baidu.com/geocoder?address=${_name}驾校&output=html®ion=洛阳&src=我的位置`, "_blank" ); } else { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 86248db..2a0af88 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -44,7 +44,7 @@
- +
@@ -395,7 +395,7 @@ export default { this.queryIndexCollectList() }, 300000); // 查询体检地址列表 - this.geyQueryGetHospitalList() + // this.geyQueryGetHospitalList() // 查询驾校数量 this.geyQueryIndexSchoolGroupList() // 行业动态列表 @@ -498,23 +498,24 @@ export default { geyQueryIndexSchoolGroupList () { queryIndexSchoolGroupList({}).then(res => { let _sanData = [ - { name: "富阳区", LngAndLat: [119.75, 30.030339], num: 0 }, - { name: "拱墅区", LngAndLat: [120.14, 30.293843], num: 0 }, - { name: "滨江区", LngAndLat: [120.21, 30.204415], num: 0 }, - { name: "淳安县", LngAndLat: [119.0, 29.576045], num: 0 }, - { name: "建德市", LngAndLat: [119.45, 29.559729], num: 0 }, - { name: "临安区", LngAndLat: [119.37, 30.183843], num: 0 }, - { name: "上城区", LngAndLat: [120.3, 30.288198], num: 0 }, - { name: "桐庐县", LngAndLat: [119.42, 29.899843], num: 0 }, - { name: "西湖区", LngAndLat: [120.06, 30.193843], num: 0 }, - { name: "萧山区", LngAndLat: [120.44, 30.193843], num: 0 }, - { name: "余杭区", LngAndLat: [119.91, 30.323843], num: 0 }, - { name: "临平区", LngAndLat: [120.29, 30.419025], num: 0 }, - { name: "钱塘区", LngAndLat: [120.49, 30.322904], num: 0 }, + { name: "老城区", LngAndLat: [112.477298,34.682945], num: 0 }, + { name: "西工区", LngAndLat: [112.443232,34.667847], num: 0 }, + { name: "瀍河回族区", LngAndLat: [112.491625, 34.684738], num: 0 }, + { name: "涧西区", LngAndLat: [112.399243, 34.654251], num: 0 }, + { name: "孟津区", LngAndLat: [112.443892, 34.826485], num: 0 }, + { name: "洛龙区", LngAndLat: [112.456634, 34.618557], num: 0 }, + { name: "新安县", LngAndLat: [112.141403, 34.728679], num: 0 }, + { name: "栾川县", LngAndLat: [111.618386, 33.783195], num: 0 }, + { name: "嵩县", LngAndLat: [112.087765, 34.131563], num: 0 }, + { name: "汝阳县", LngAndLat: [112.473789, 34.15323], num: 0 }, + { name: "宜阳县", LngAndLat: [112.179989, 34.516478], num: 0 }, + { name: "洛宁县", LngAndLat: [111.655399, 34.387179], num: 0 }, + { name: "伊川县", LngAndLat: [112.429384, 34.423416], num: 0 }, + { name: "偃师区", LngAndLat: [112.787739, 34.723042], num: 0 }, ] res.data.map(item => { _sanData.forEach(ele => { - if (ele.name === item.regionName) ele.num = item.count + if (ele.name === item.districtName) ele.num = item.schoolTotal }) }) this.sanData = _sanData diff --git a/src/views/instructor/index.scss b/src/views/instructor/index.scss index cb659ec..435f913 100644 --- a/src/views/instructor/index.scss +++ b/src/views/instructor/index.scss @@ -35,7 +35,7 @@ width: 100%; .demeanor { - width: 816px; + // width: 816px; .demeanor-search { width: 100%; diff --git a/src/views/instructor/index.vue b/src/views/instructor/index.vue index fd4e666..cd148a0 100644 --- a/src/views/instructor/index.vue +++ b/src/views/instructor/index.vue @@ -72,7 +72,7 @@
-
+ -
+
+
-->
@@ -215,12 +215,13 @@ export default { }, // 查询教练列表 getQueryQueryList () { - queryQueryList({ + let obj = { pageNo: this.pageObj.pageNo, pageSize: this.pageObj.pageSize, - district: this.orignCode == 'all' ? '' : this.orignCode, - teachCarType: this.licenseCode == 'all' ? '' : this.licenseCode - }).then(res => { + } + if(this.orignCode != 'all') obj.district = this.orignCode + if(this.licenseCode != 'all') obj.teachCarType = this.licenseCode + queryQueryList(obj).then(res => { if (res.data.list.length > 0) { this.pageObj.total = res.data.total this.dataSheetList = res.data.list diff --git a/src/views/layout/Wrapper.vue b/src/views/layout/Wrapper.vue index 8e86cec..e09615b 100644 --- a/src/views/layout/Wrapper.vue +++ b/src/views/layout/Wrapper.vue @@ -1,49 +1,28 @@