From 03a79e0fdda02afff17c298632302e06b8925caa Mon Sep 17 00:00:00 2001
From: xiayt <x1027869635@gmail.com>
Date: Fri, 22 Oct 2021 09:51:52 +0800
Subject: [PATCH] feat: 接口修改，联系人修改
---
package-lock.json | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
src/views/PublicHome/MyClassList.vue | 36 ++++++++++++++++++++++++++++--------
src/views/PublicHome/StudentDetail.vue | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
src/views/PublicHome/component/AddChildPopupGroup.vue | 11 ++++-------
src/views/PublicHome/component/HomeChildList.vue | 6 +++---
src/views/PublicService/evaluateBase.vue | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
src/views/PublicService/evaluateCourse.vue | 60 ++++++++++++++++++++++++++++++++++++------------------------
src/views/PublicService/evaluateDetail.vue | 63 +++++++++++++++++++++++++++++++++++++++++++++++++--------------
src/views/PublicService/evaluatePubilc.vue | 58 +++++++++++++++++++++++++++++++++++-----------------------
src/views/Service/EditContact.vue | 5 ++++-
src/views/Service/SelectContact.vue | 11 ++++++-----
11 files changed, 419 insertions(+), 244 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b1ece6e..efaeb60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2390,6 +2390,44 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true
},
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
"debug": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -2399,6 +2437,13 @@
"ms": "2.1.2"
}
},
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -2456,6 +2501,52 @@
"requires": {
"minipass": "^3.1.1"
}
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.1",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
+ "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "json5": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+ "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "loader-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ }
+ }
}
}
},
@@ -16480,75 +16571,6 @@
}
}
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.1",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
- "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
"vue-router": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
diff --git a/src/views/PublicHome/MyClassList.vue b/src/views/PublicHome/MyClassList.vue
index deea0e7..f070d69 100644
--- a/src/views/PublicHome/MyClassList.vue
+++ b/src/views/PublicHome/MyClassList.vue
@@ -88,19 +88,39 @@ export default {
}, 1000)
})
},
+ // 获取基地信息
GetStudyBaseDetail (baseId) {
this.$toast.loading({
message: '请求中...',
});
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${baseId}`).then((res) => {
- console.log(res.data)
- if (res.data.data) {
- this.$toast.clear();
- this.baseInfo = res.data.data;
- } else {
- this.$toast.fail(res.data.message)
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": 0,
+ "cs": '绍兴市',
+ "id": baseId
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('基地信息：', res.data)
+ if (res.data.data) {
+ this.$toast.clear();
+ this.baseInfo = res.data.data;
+ } else {
+ this.$toast.fail(res.data.message)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
getPosition () {
if (!this.selectedContact.travelerNum) {
diff --git a/src/views/PublicHome/StudentDetail.vue b/src/views/PublicHome/StudentDetail.vue
index 04d3025..2f2aba8 100644
--- a/src/views/PublicHome/StudentDetail.vue
+++ b/src/views/PublicHome/StudentDetail.vue
@@ -56,7 +56,7 @@
<van-empty v-if="baseList.length==0" description="暂无基地记录" />
</van-tab>
<van-tab title="课程记录">
- <div class="list_item" v-for="(item,index) in courseList" :key="index">
+ <div class="list_item" v-for="(item,index) in courseList" :key="index">
<div class="left">
<p class="day">{{item.day}}</p>
<p class="minute">{{item.minute}}</p>
@@ -84,7 +84,7 @@ export default {
studentInfo: '',
courseList: [],//课程记录
baseList: [],//基地记录
- signCheckCountInfo:'',//打卡和课程天数信息
+ signCheckCountInfo: '',//打卡和课程天数信息
active: 0
}
},
@@ -109,60 +109,103 @@ export default {
methods: {
// 获取课程记录
getCourseList () {
-
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseCheckDetail/List`, {
- "userId": this.studentInfo?.travelerNum,
- "pageIndex": 1,
- "pageSize": 999
- }).then((res) => {
- this.$toast.clear()
- console.log('课程记录：', res.data)
- if (res.data.status == 1) {
- let courseList = res.data.data.data
- for(let i in courseList){
- courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
- courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
+ this.mgop({
+ api: 'mgop.sz.hswsy.CourseCheckDetail', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": this.studentInfo?.travelerNum,
+ "pageIndex": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('课程记录：', res.data)
+ if (res.data.status == 1) {
+ let courseList = res.data.data.data
+ for (let i in courseList) {
+ courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
+ courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
+ }
+ this.courseList = courseList
+ console.log(this.courseList)
+ } else {
+ this.$toast.fail(res.data.message)
}
- this.courseList = courseList
- console.log(this.courseList)
- } else {
- this.$toast.fail(res.data.message)
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
// 获取基地记录
getBaseList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SignDetail/List`, {
- "userId": this.studentInfo?.travelerNum,
- "pageIndex": 1,
- "pageSize": 999
- }).then((res) => {
- this.$toast.clear()
- console.log('基地记录：', res.data)
- if (res.data.status == 1) {
- let baseList = res.data.data.data
- for(let i in baseList){
- baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
- baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
+ this.mgop({
+ api: 'mgop.sz.hswsy.SignDetail', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": this.studentInfo?.travelerNum,
+ "pageIndex": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('基地记录：', res.data)
+ if (res.data.status == 1) {
+ let baseList = res.data.data.data
+ for (let i in baseList) {
+ baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
+ baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
+ }
+ console.log(baseList)
+ this.baseList = baseList
+ } else {
+ this.$toast.fail(res.data.message)
}
- console.log(baseList)
- this.baseList = baseList
- } else {
- this.$toast.fail(res.data.message)
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
// 根据用户编号获取打卡和课程天数信息
getSignCheckCountInfo () {
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/SignCheckCountInfo/ByUserId?userId=${this.studentInfo?.travelerNum}`).then((res) => {
- this.$toast.clear()
- console.log('天数：', res.data)
- if (res.data.status == 1) {
- this.signCheckCountInfo = res.data.data
- } else {
- this.$toast.fail(res.data.message)
+ this.mgop({
+ api: 'mgop.sz.hswsy.SignCheckCountInfoByUserId', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": this.studentInfo?.travelerNum,
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('天数：', res.data)
+ if (res.data.status == 1) {
+ this.signCheckCountInfo = res.data.data
+ } else {
+ this.$toast.fail(res.data.message)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
// 研学码
handleYanxue () {
@@ -175,23 +218,23 @@ export default {
// }
},
// 基地评价
- evaluateBase(item){
- this.$router.push({ name: 'evaluateBase',query:{baseId:item.baseId,signId:item.signId}})
+ evaluateBase (item) {
+ this.$router.push({ name: 'evaluateBase', query: { baseId: item.baseId, signId: item.signId } })
},
// 课程评价
- evaluateCourse(item){
+ evaluateCourse (item) {
let courseInfo = item;
courseInfo.id = courseInfo.orderId
window.sessionStorage.setItem('courseInfo', JSON.stringify(courseInfo))
- this.$router.push({ name: 'evaluateCourse'})
+ this.$router.push({ name: 'evaluateCourse' })
},
// 基地评价详情
- evaluateBaseDetail(item){
- this.$router.push({ name: 'evaluateDetail',query:{evaluationId:item.evaluationId,baseId:item.baseId}})
+ evaluateBaseDetail (item) {
+ this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId, baseId: item.baseId } })
},
// 课程评价详情
- evaluateCourseDetail(item){
- this.$router.push({ name: 'evaluateDetail',query:{evaluationId:item.evaluationId}})
+ evaluateCourseDetail (item) {
+ this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId } })
}
},
components: {
@@ -236,14 +279,14 @@ export default {
font-size: 34px;
font-weight: bold;
width: 100%;
- span{
+ span {
display: inline-block;
padding: 0 14px;
margin-left: 14px;
line-height: 34px;
border-radius: 17px;
font-size: 22px;
- background: #2D90D2;
+ background: #2d90d2;
vertical-align: middle;
}
}
@@ -325,10 +368,9 @@ export default {
padding-right: 30px;
text-align: right;
font-size: 34px;
- .day{
-
+ .day {
}
- .minute{
+ .minute {
font-size: 30px;
color: #999;
}
diff --git a/src/views/PublicHome/component/AddChildPopupGroup.vue b/src/views/PublicHome/component/AddChildPopupGroup.vue
index fa856af..516b07e 100644
--- a/src/views/PublicHome/component/AddChildPopupGroup.vue
+++ b/src/views/PublicHome/component/AddChildPopupGroup.vue
@@ -27,7 +27,7 @@
<div class="child_box">
<div class="child_item" v-for="(item,index) in claimChildList" :key="index">
<p><span>姓名</span>{{item.travelerName}}</p>
- <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==1?'初中':'高中'}}</p>
+ <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==2?'初中':'高中'}}</p>
<p><span>所在地区</span>{{item.province+item.city+item.area}}</p>
<p><span>学校</span>{{item.schoolName}}</p>
<p><span>入学年份</span>{{item.enrollYear}}</p>
@@ -138,7 +138,7 @@ export default {
let publicName = sessionStorage.getItem('publicName')
this.publicName = publicName
let userInfo = sessionStorage.getItem('userInfo')
- this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
+ this.userInfo = JSON.parse(userInfo);
this.initYearArr()
this.GetSysAreaList()
},
@@ -198,14 +198,11 @@ export default {
duration: 0,
forbidClick: true
})
- const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
- let openId = sessionStorage.getItem('openId' + this.publicName) || 'oHHbojtmLCNmOKwYBett8dXxhMlg';
this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
"code": this.code,
- "openId": openId,
"phone": this.phone,
- "unionId": userInfo.unionId
+ "unionId": sessionStorage.getItem('centerNo')
}).then((res) => {
this.$toast.clear()
if (res.data.code == 200) {
@@ -388,7 +385,7 @@ export default {
schoolName: this.school,//学校名称
enrollYear: this.year,//入学年份
travelerType: this.userTypeVal,//1-小学 2-初中 3-高中
-
+ loginMobile: this.userInfo?.phone
}
this.$toast.loading({
message: '加载中',
diff --git a/src/views/PublicHome/component/HomeChildList.vue b/src/views/PublicHome/component/HomeChildList.vue
index 5b91684..794511e 100644
--- a/src/views/PublicHome/component/HomeChildList.vue
+++ b/src/views/PublicHome/component/HomeChildList.vue
@@ -74,10 +74,10 @@ export default {
data: {
"userNum": sessionStorage.getItem('centerNo')
},
- onSuccess: data => {
- console.log('getUserInfo', data)
+ onSuccess: res => {
+ console.log('getUserInfo', res)
this.$toast.clear()
- if (data.data.code == 200) {
+ if (res.data.code == 200) {
this.childList = res.data.data.userInfo.subUsers
}
},
diff --git a/src/views/PublicService/evaluateBase.vue b/src/views/PublicService/evaluateBase.vue
index d1e454e..ed5ebbe 100644
--- a/src/views/PublicService/evaluateBase.vue
+++ b/src/views/PublicService/evaluateBase.vue
@@ -42,12 +42,12 @@ import { imgCut } from 'vue-imgcut'
export default {
data () {
return {
- baseId:'',
- signId:'',
- baseInfo:'',
+ baseId: '',
+ signId: '',
+ baseInfo: '',
starsBaseNum: 0,
userInfo: '',
- studentInfo:'',
+ studentInfo: '',
courseInfo: '',
content: '',
imgsrc: [],
@@ -86,39 +86,70 @@ export default {
this.$toast.loading({
message: '请求中...',
});
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
- {
- baseId: this.baseId,
- signId:this.signId,
- evaluation: this.content,
- userId: this.studentInfo.travelerNum,
- imgList: this.imgsrc,
- baseScore: this.starsBaseNum
- }
- ).then((res) => {
- this.$toast.clear();
- if (res.data.status == 1) {
- this.$toast.success('发布成功');
- setTimeout(() => {
- this.$router.back()
- }, 1000)
+ this.mgop({
+ api: 'mgop.sz.hswsy.AddEvaluation', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "baseId": this.baseId,
+ "signId": this.signId,
+ "evaluation": this.content,
+ "userId": this.studentInfo.travelerNum,
+ "imgList": this.imgsrc,
+ "baseScore": this.starsBaseNum
+ },
+ onSuccess: res => {
+ this.$toast.clear();
+ if (res.data.status == 1) {
+ this.$toast.success('发布成功');
+ setTimeout(() => {
+ this.$router.back()
+ }, 1000)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
// 获取基地信息
GetStudyBaseDetail () {
this.$toast.loading({
message: '请求中...',
});
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
- console.log(res.data)
- if (res.data.data) {
- this.$toast.clear();
- this.baseInfo = res.data.data;
- } else {
- this.$toast.fail(res.data.message)
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": 0,
+ "cs": '绍兴市',
+ "id": this.baseId
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('基地信息：', res.data)
+ if (res.data.data) {
+ this.$toast.clear();
+ this.baseInfo = res.data.data;
+ } else {
+ this.$toast.fail(res.data.message)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
callback (img) {
this.imgsrc.push({
@@ -185,9 +216,9 @@ export default {
font-size: 30px;
text-align: center;
box-shadow: 0 0 30px #7ab1f8;
- &.disabled{
- opacity: 0.4;
- }
+ &.disabled {
+ opacity: 0.4;
+ }
}
.cont {
.van-cell {
diff --git a/src/views/PublicService/evaluateCourse.vue b/src/views/PublicService/evaluateCourse.vue
index be244b2..0fd9efb 100644
--- a/src/views/PublicService/evaluateCourse.vue
+++ b/src/views/PublicService/evaluateCourse.vue
@@ -93,28 +93,40 @@ export default {
this.$toast.loading({
message: '请求中...',
});
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
- {
- baseId: this.courseInfo.baseId,
- title: this.courseInfo.courseName,
- evaluation: this.content,
- courseId: this.courseInfo.courseId,
- orderId: this.courseInfo.id,
- userId: this.userInfo.centerNo,
- imgList: this.imgsrc,
- courseScore: this.starsCourseNum,
- baseScore: this.starsBaseNum
+ this.mgop({
+ api: 'mgop.sz.hswsy.AddEvaluation', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "baseId": this.courseInfo.baseId,
+ "title": this.courseInfo.courseName,
+ "evaluation": this.content,
+ "courseId": this.courseInfo.courseId,
+ "orderId": this.courseInfo.id,
+ "userId": this.userInfo.centerNo,
+ "imgList": this.imgsrc,
+ "courseScore": this.starsCourseNum,
+ "baseScore": this.starsBaseNum
+ },
+ onSuccess: res => {
+ this.$toast.clear();
+ if (res.data.status == 1) {
+ this.$toast.success('发布成功');
+ setTimeout(() => {
+ // this.$router.push({ name: 'ServiceOrderXST' })
+ this.$router.back()
+ }, 1000)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- ).then((res) => {
- this.$toast.clear();
- if (res.data.status == 1) {
- this.$toast.success('发布成功');
- setTimeout(() => {
- // this.$router.push({ name: 'ServiceOrderXST' })
- this.$router.back()
- }, 1000)
- }
- })
+ });
},
callback (img) {
this.imgsrc.push({
@@ -181,9 +193,9 @@ export default {
font-size: 30px;
text-align: center;
box-shadow: 0 0 30px #7ab1f8;
- &.disabled{
- opacity: 0.4;
- }
+ &.disabled {
+ opacity: 0.4;
+ }
}
.cont {
.van-cell {
diff --git a/src/views/PublicService/evaluateDetail.vue b/src/views/PublicService/evaluateDetail.vue
index 9ae2039..0fd50fe 100644
--- a/src/views/PublicService/evaluateDetail.vue
+++ b/src/views/PublicService/evaluateDetail.vue
@@ -39,7 +39,7 @@
<div class="evaluation_img_box">
<img class="evaluation_img" v-for="(imgItem,index) in evaluationData.imgList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
</div>
- <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
+ <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
</div>
</div>
</template>
@@ -50,7 +50,7 @@ export default {
data () {
return {
baseId: '',//有基地id时为基地评价
- baseInfo:'',
+ baseInfo: '',
evaluationId: '',
evaluationData: '',
starsBaseNum: 0,
@@ -92,9 +92,21 @@ export default {
duration: 0,
forbidClick: true
})
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/EvaluationDetail/ById?id=${this.evaluationId}`).then((res) => {
- this.$toast.clear()
- console.log('评价：', res.data)
+ this.mgop({
+ api: 'mgop.sz.hswsy.EvaluationDetailById', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "id": this.evaluationId
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('评价详情：', res.data)
if (res.data.status == 1) {
let evaluationData = res.data.data
evaluationData.intime = this.Moment(new Date(evaluationData.intime)).format('YYYY-MM-DD')
@@ -102,22 +114,45 @@ export default {
} else {
this.$toast.fail(res.data.message)
}
- })
+ },
+ onFail: err => {
+ console.log('err', err)
+ }
+ });
},
// 获取基地信息
GetStudyBaseDetail () {
this.$toast.loading({
message: '请求中...',
});
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
- console.log(res.data)
- if (res.data.data) {
- this.$toast.clear();
- this.baseInfo = res.data.data;
- } else {
- this.$toast.fail(res.data.message)
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": 0,
+ "cs": '绍兴市',
+ "id": this.baseId
+ },
+ onSuccess: res => {
+ this.$toast.clear()
+ console.log('基地信息：', res.data)
+ if (res.data.data) {
+ this.$toast.clear();
+ this.baseInfo = res.data.data;
+ } else {
+ this.$toast.fail(res.data.message)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
}
}
diff --git a/src/views/PublicService/evaluatePubilc.vue b/src/views/PublicService/evaluatePubilc.vue
index 0ca7d98..724b998 100644
--- a/src/views/PublicService/evaluatePubilc.vue
+++ b/src/views/PublicService/evaluatePubilc.vue
@@ -94,27 +94,39 @@ export default {
this.$toast.loading({
message: '请求中...',
});
- yxAxios.post('https://yanxue.myjxt.com/api/StudiesWap/AddEvaluation',
- {
- baseId: this.courseInfo.baseId,
- title: this.courseInfo.courseName,
- evaluation: this.content,
- courseId: this.courseInfo.courseId,
- orderId: this.courseInfo.id,
- userId: this.userInfo.centerNo,
- imgList: this.imgsrc,
- courseScore: this.starsCourseNum,
- baseScore: this.starsBaseNum
+ this.mgop({
+ api: 'mgop.sz.hswsy.AddEvaluation', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "baseId": this.courseInfo.baseId,
+ "title": this.courseInfo.courseName,
+ "evaluation": this.content,
+ "courseId": this.courseInfo.courseId,
+ "orderId": this.courseInfo.id,
+ "userId": this.userInfo.centerNo,
+ "imgList": this.imgsrc,
+ "courseScore": this.starsCourseNum,
+ "baseScore": this.starsBaseNum
+ },
+ onSuccess: res => {
+ this.$toast.clear();
+ if (res.data.status == 1) {
+ this.$toast.success('发布成功');
+ setTimeout(() => {
+ this.$router.push({ name: 'ServiceOrderXST' })
+ }, 1000)
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- ).then((res) => {
- this.$toast.clear();
- if (res.data.status == 1) {
- this.$toast.success('发布成功');
- setTimeout(() => {
- this.$router.push({ name: 'ServiceOrderXST' })
- }, 1000)
- }
- })
+ });
},
callback (img) {
this.imgsrc.push({
@@ -181,9 +193,9 @@ export default {
font-size: 30px;
text-align: center;
box-shadow: 0 0 30px #7ab1f8;
- &.disabled{
- opacity: 0.4;
- }
+ &.disabled {
+ opacity: 0.4;
+ }
}
.cont {
.van-cell {
diff --git a/src/views/Service/EditContact.vue b/src/views/Service/EditContact.vue
index 0c64949..43dd243 100644
--- a/src/views/Service/EditContact.vue
+++ b/src/views/Service/EditContact.vue
@@ -74,13 +74,16 @@ export default {
this.$toast('请输入正确的身份证号')
return;
}
+ let userInfo = sessionStorage.getItem('userInfo')
+ userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
let postData = {
userNum: this.travelerNum,
contactsName: this.travelerName,
contactsMobile: this.phone,
contactsIdCard: this.travelerIdCard,
contactsType: this.userType,
- gender:Number(this.gender)
+ gender: Number(this.gender),
+ loginMobile: userInfo?.phone
}
this.$toast.loading({
message: '加载中',
diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue
index b9fc2f9..f75037c 100644
--- a/src/views/Service/SelectContact.vue
+++ b/src/views/Service/SelectContact.vue
@@ -61,9 +61,10 @@ export default {
data: {
"userNum": sessionStorage.getItem('centerNo')
},
- onSuccess: data => {
- console.log('联系人列表：', data)
- if (data.data.code == 200) {
+ onSuccess: res => {
+ console.log('联系人列表：', res)
+ this.$toast.clear()
+ if (res.data.code == 200) {
let userInfo = res.data.data.userInfo;
let contactList = userInfo.subUsers
// 把家长添加到列表
@@ -107,7 +108,7 @@ export default {
for (let i in contactList) {
if (contactList[i]?.checked) {
if ((!contactList[i].travelerIdCard || !contactList[i].gender) && !this.hideParent) {
- this.$toast('请先完善您选择的联系人信息')
+ this.$toast('请先完善您选择的出行人信息')
return;
} else {
selectedArr.push({
@@ -120,7 +121,7 @@ export default {
}
console.log(this.limit, selectedArr.length)
if (this.limit && this.limit != selectedArr.length) {
- this.$toast(`请选择${this.limit}位联系人`)
+ this.$toast(`请选择${this.limit}位出行人`)
return;
}
// console.log(selectedArr)
--
libgit2 0.21.0