From 49138f178c0dbec9c2a85e31d1f0d3d811529c19 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Mon, 9 Oct 2023 19:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/commentItem/commentItem.vue | 17 ++++- components/nodata/nodata.vue | 31 ++++++++ config/api.js | 6 +- pages.json | 10 +-- pages/carEntry/evaluate/comp/evaluateItem.vue | 19 ++++- pages/carEntry/evaluate/evaluate.vue | 87 ++++++++++++---------- .../consult/pubComplaint/pubComplaint.vue | 2 +- pages/indexEntry/consult/pubConsult/pubConsult.vue | 2 +- .../consult/record/comp/complaintItem.vue | 3 +- .../indexEntry/consult/record/comp/consultItem.vue | 5 +- pages/indexEntry/consult/record/record.vue | 7 +- pages/indexEntry/enroll/registInfo/registInfo.vue | 18 +++++ .../examines/allExamines/allExamines.vue | 3 +- pages/indexEntry/examines/allNews/allNews.vue | 17 ++++- pages/indexEntry/examines/detail/detail.vue | 2 +- .../findShcool/coachComment/coachComment.vue | 64 ++++++++++++++-- pages/indexEntry/findShcool/comments/comments.vue | 14 ++-- pages/indexEntry/findShcool/comp/schoolItem.vue | 8 +- pages/indexEntry/findShcool/findShcool.vue | 14 +++- .../findShcool/shcoolComment/shcoolComment.vue | 6 +- .../findShcool/shcoolDetail/comp/tab1.vue | 12 ++- .../findShcool/shcoolDetail/comp/tab3.vue | 24 +++--- .../findShcool/shcoolDetail/shcoolDetail.vue | 17 ++--- .../publicVideo/videoDetail/videoDetail.vue | 4 + pages/mineEntry/myCollect/myCollect.vue | 57 +++++++++++++- pages/mineEntry/myEvaluate/comp/commentItem.vue | 79 ++++++++++++++++++++ pages/mineEntry/myEvaluate/myEvaluate.vue | 26 ++++++- pages/tabbar/learnCar/comp/subject2.vue | 2 +- pages/tabbar/learnCar/comp/subject3.vue | 2 +- store/modules/school.js | 87 +++------------------- .../uview-ui/components/u-album/u-album.vue | 3 +- 31 files changed, 452 insertions(+), 196 deletions(-) create mode 100644 components/nodata/nodata.vue create mode 100644 pages/mineEntry/myEvaluate/comp/commentItem.vue diff --git a/components/commentItem/commentItem.vue b/components/commentItem/commentItem.vue index dde3da7..8d72a40 100644 --- a/components/commentItem/commentItem.vue +++ b/components/commentItem/commentItem.vue @@ -10,9 +10,10 @@ {{ item.description }} - - - + + + + @@ -37,7 +38,15 @@ color: #686B73; } } - + .vdo { + width: 360rpx; + margin-top: 12rpx; + video { + width: 100%; + height: 180rpx; + display: block; + } + } .starBox { padding: 10rpx 0 24rpx 0; } diff --git a/components/nodata/nodata.vue b/components/nodata/nodata.vue new file mode 100644 index 0000000..9d911da --- /dev/null +++ b/components/nodata/nodata.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/config/api.js b/config/api.js index 61dcc6c..2cfdfba 100644 --- a/config/api.js +++ b/config/api.js @@ -30,6 +30,8 @@ export const getUsersCommentById = (params) => http.get('business/appcomplain/ge export const getStudentinfo = (params) => http.get('business/appcomplain/getStudentinfo', {params: params}) // 驾校评论分页 export const getSchoolListComment = (params) => http.get('business/school/getListComment', {params: params}) +// 教练评价分页 +export const getListCoachComment = (params) => http.get('business/school/getListCoach', {params: params}) // 驾校详情 export const getSchoolDetail = (params) => http.get('business/school/getSchool', {params: params}) // 教练列表分页 @@ -43,13 +45,15 @@ export const createUpvote = (data) => http.post('business/contentdata/createUpvo // 公益视频取消点赞 upvoteId export const deleteUpvote = (data) => http.delete(`/business/contentdata/deleteUpvote?upvoteId=${data.upvoteId}&mobile=${data.mobile}`) // 公益视频收藏 -export const createCollect = (data) => http.post('business/contentdata/createCollect', data) +export const createCollect = (data) => http.post('business/contentdata/createCollect', data) // 公益视频取消收藏 CollectId export const deleteRetransmission = (data) => http.delete(`business/contentdata/deleteCollect?collectId=${data.CollectId}&mobile=${data.mobile}`) // 公益视频分享 export const createRetransmission = (data) => http.post('business/contentdata/createRetransmission', data) // 公益视频是否点赞收藏 export const getlikesCollection = (params) => http.get('business/users/getContent', {params: params}) +// 公益视频我的收藏 +export const getcollectVideo = (params) => http.get('business/users/getcollectVideo', {params: params}) // 行业资讯， export const getarticleList = (params) => http.get('business/video/article', {params: params}) // 行业政策 diff --git a/pages.json b/pages.json index 8a450bb..6dc37a3 100644 --- a/pages.json +++ b/pages.json @@ -163,7 +163,7 @@ { "path": "findShcool/coachComment/coachComment", "style": { - "navigationBarTitleText": "教练评价", + "navigationBarTitleText": "教练详情", "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } @@ -417,7 +417,7 @@ "style": { "navigationBarTitleText": "学车进度", "navigationStyle": "custom", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } }, @@ -426,7 +426,7 @@ "style": { "navigationBarTitleText": "学车进度", "navigationStyle": "custom", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } }, @@ -444,7 +444,7 @@ "style": { "navigationBarTitleText": "我的收藏", "navigationStyle": "custom", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } }, @@ -453,7 +453,7 @@ "style": { "navigationBarTitleText": "我的评价", "navigationStyle": "custom", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } }, diff --git a/pages/carEntry/evaluate/comp/evaluateItem.vue b/pages/carEntry/evaluate/comp/evaluateItem.vue index 9358672..15c0eb9 100644 --- a/pages/carEntry/evaluate/comp/evaluateItem.vue +++ b/pages/carEntry/evaluate/comp/evaluateItem.vue @@ -4,9 +4,10 @@ {{ info.tit }} - - - + + @@ -57,7 +58,7 @@ - + @@ -99,6 +100,16 @@ } }, methods: { + // 1是匿名 2是不匿名 + changeChe(val) { + // console.log(this.info.anonymity) + console.log(val) + if(val) { + this.info.anonymity = 1 + }else { + this.info.anonymity = 2 + } + }, deleteImg(item) { let index = this.info.imgArr.findIndex(val=>val==item) this.info.imgArr.splice(index, 1) diff --git a/pages/carEntry/evaluate/evaluate.vue b/pages/carEntry/evaluate/evaluate.vue index b49b8ce..b81ae71 100644 --- a/pages/carEntry/evaluate/evaluate.vue +++ b/pages/carEntry/evaluate/evaluate.vue @@ -20,14 +20,39 @@ data() { return { checked: false, - schoolInfo: { + info: {}, + schoolInfo: {}, + coachInfo: {}, + subject: '' + } + }, + onLoad(options) { + this.subject = options.subject + + this.getStudentinfoFn() + }, + computed: { + btnActive() { + let {schoolInfo, coachInfo} = this + let num1 = schoolInfo.schoolLevel + schoolInfo.qualityLevel + schoolInfo.teachLevel + schoolInfo.serviceLevel + let num2 = coachInfo.qualityLevel + coachInfo.teachLevel + coachInfo.serviceLevel + if(num1&&num2) { + return true + }else { + return false + } + + } + }, + methods: { + initFrom() { + this.schoolInfo = { tit: '您对驾校满意吗？', school: 1, "schoolId": 8750, - "schoolName": "赵六", + "schoolName": "", "stars": 0, "studentId": '', - "studentName": "张三", "studentIdcard": "", "studentPhone": "", "serviceLevel": 0, @@ -35,20 +60,18 @@ "qualityLevel": 0, "teachLevel": 0, "subject": 0, - "description": "随便", + "description": "", "images": "", "videoUrl": "", - "anonymity": 0, + "anonymity": 2, "userId": 0, imgArr: [] - }, - coachInfo: { - tit: '您对驾校满意吗？', + } + this.coachInfo = { + tit: '您对教练满意吗？', "schoolId": 8750, - "schoolName": "赵六", "stars": 0, "studentId": '', - "studentName": "张三", "studentIdcard": "", "studentPhone": "", "schoolInfo": 0, @@ -57,43 +80,28 @@ "serviceLevel": 0, "teachLevel": 0, "subject": 0, - "description": "随便", + "description": "", "images": "", "videoUrl": "", - "anonymity": 0, + "anonymity": 2, "userId": 0, coachName: '', imgArr: [] } - } - }, - onLoad() { - this.schoolInfo.userId = this.$store.state.user.vuex_loginInfo.userId - this.coachInfo.userId = this.$store.state.user.vuex_loginInfo.userId - this.coachInfo.studentPhone = this.vuex_userInfo.studentPhone - this.getStudentinfoFn() - }, - computed: { - btnActive() { - let {schoolInfo, coachInfo} = this - let num1 = schoolInfo.schoolLevel + schoolInfo.qualityLevel + schoolInfo.teachLevel + schoolInfo.serviceLevel - let num2 = coachInfo.qualityLevel + coachInfo.teachLevel + coachInfo.serviceLevel - if(num1&&num2) { - return true - }else { - return false - } + this.coachInfo.subject = this.schoolInfo.subject = this.subject + this.coachInfo.userId = this.schoolInfo.userId = this.$store.state.user.vuex_loginInfo.userId + this.coachInfo.studentPhone = this.vuex_userInfo.studentPhone - } - }, - methods: { + this.coachInfo.schoolId = this.schoolInfo.schoolId = this.info.schoolId + this.coachInfo.schoolName = this.schoolInfo.schoolName = this.info.schoolName + this.coachInfo.coachName = this.info.coachName + this.coachInfo.coachId = this.info.coachId + }, // 获取用户驾校信息 async getStudentinfoFn() { - const {data: res} = await getStudentinfo({id: this.schoolInfo.userId}) - this.coachInfo.schoolId = this.schoolInfo.schoolId = res.schoolId - this.coachInfo.schoolName = this.schoolInfo.schoolName = res.schoolName - this.coachInfo.coachName = res.coachName - this.coachInfo.coachId = res.coachId + const {data: res} = await getStudentinfo({id: this.$store.state.user.vuex_loginInfo.userId}) + this.info = res + this.initFrom() }, async submintFn() { if(this.coachInfo.imgArr.length) { @@ -104,6 +112,7 @@ } const res = await addSchoolComment(this.schoolInfo) const res2 = await addCoachComment(this.coachInfo) + this.initFrom() this.$u.toast('评价成功') setTimeout(()=>{ this.$goPage('/pages/mineEntry/myEvaluate/myEvaluate') @@ -121,7 +130,7 @@ } .btnBg { - margin: 124rpx auto 0 auto; + margin: 90rpx auto 0 auto; width: 396rpx; opacity: 0.5; &.active { diff --git a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue index 0b4c5f4..fd323e1 100644 --- a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue +++ b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue @@ -1,6 +1,6 @@ @@ -34,9 +34,10 @@ content:'确定要关闭吗？', success: async (res)=> { if (res.confirm) { - const result = await consultationClosed({id}) + const result = await consultationClosed({id: this.item.complainDO.id}) this.$u.toast('关闭成功') this.item.complainDO.dealStatus = 3 + this.$emit('closeFn') } else if (res.cancel) { console.log('用户点击取消'); } diff --git a/pages/indexEntry/consult/record/record.vue b/pages/indexEntry/consult/record/record.vue index 448575a..6f0700e 100644 --- a/pages/indexEntry/consult/record/record.vue +++ b/pages/indexEntry/consult/record/record.vue @@ -12,19 +12,20 @@ - + - + - + + diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index 01a64a7..ca43b40 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -335,6 +335,24 @@ console.log(item) this.form.coach = item.name }) + + let schoolClass = this.$store.state.school.schoolClass + console.log(schoolClass) + if(schoolClass.id) { + this.form.classModel = schoolClass.name + this.form.school = schoolClass.schoolName + this.form.schoolId = schoolClass.schoolId + this.form.car = schoolClass.carType + } + + let schoolCoach = this.$store.state.school.schoolCoach + console.log(schoolCoach) + if(schoolCoach.id) { + this.form.classModel = schoolCoach.name + this.form.school = schoolCoach.schoolName + this.form.schoolId = schoolCoach.schoolId + // this.form.car = schoolClass.carType + } }, methods: { // 选择驾校 diff --git a/pages/indexEntry/examines/allExamines/allExamines.vue b/pages/indexEntry/examines/allExamines/allExamines.vue index fef5261..4886afc 100644 --- a/pages/indexEntry/examines/allExamines/allExamines.vue +++ b/pages/indexEntry/examines/allExamines/allExamines.vue @@ -12,9 +12,10 @@ - + + diff --git a/pages/indexEntry/examines/allNews/allNews.vue b/pages/indexEntry/examines/allNews/allNews.vue index 27bb703..d1034e4 100644 --- a/pages/indexEntry/examines/allNews/allNews.vue +++ b/pages/indexEntry/examines/allNews/allNews.vue @@ -6,27 +6,36 @@ + + + + diff --git a/pages/indexEntry/findShcool/comments/comments.vue b/pages/indexEntry/findShcool/comments/comments.vue index 1fbac3e..0134c1c 100644 --- a/pages/indexEntry/findShcool/comments/comments.vue +++ b/pages/indexEntry/findShcool/comments/comments.vue @@ -1,5 +1,5 @@