SxhGroup / sxhPersonalCenterZLB

Download as
Browse Code »

Commit 03a79e0fdda02afff17c298632302e06b8925caa

Authored by 夏洋涛
1 parent 3adfd076
Exists in master

feat: 接口修改，联系人修改

Showing 11 changed files with 419 additions and 244 deletions   Show diff stats
package-lock.json
  Diff comments   View file @03a79e0
... ... @@ -2390,6 +2390,44 @@
2390 2390 "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
2391 2391 "dev": true
2392 2392 },
  2393 + "ansi-styles": {
  2394 + "version": "4.3.0",
  2395 + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
  2396 + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
  2397 + "dev": true,
  2398 + "optional": true,
  2399 + "requires": {
  2400 + "color-convert": "^2.0.1"
  2401 + }
  2402 + },
  2403 + "chalk": {
  2404 + "version": "4.1.2",
  2405 + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
  2406 + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
  2407 + "dev": true,
  2408 + "optional": true,
  2409 + "requires": {
  2410 + "ansi-styles": "^4.1.0",
  2411 + "supports-color": "^7.1.0"
  2412 + }
  2413 + },
  2414 + "color-convert": {
  2415 + "version": "2.0.1",
  2416 + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
  2417 + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
  2418 + "dev": true,
  2419 + "optional": true,
  2420 + "requires": {
  2421 + "color-name": "~1.1.4"
  2422 + }
  2423 + },
  2424 + "color-name": {
  2425 + "version": "1.1.4",
  2426 + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
  2427 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
  2428 + "dev": true,
  2429 + "optional": true
  2430 + },
2393 2431 "debug": {
2394 2432 "version": "4.3.1",
2395 2433 "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
... ... @@ -2399,6 +2437,13 @@
2399 2437 "ms": "2.1.2"
2400 2438 }
2401 2439 },
  2440 + "has-flag": {
  2441 + "version": "4.0.0",
  2442 + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
  2443 + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
  2444 + "dev": true,
  2445 + "optional": true
  2446 + },
2402 2447 "json5": {
2403 2448 "version": "1.0.1",
2404 2449 "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
... ... @@ -2456,6 +2501,52 @@
2456 2501 "requires": {
2457 2502 "minipass": "^3.1.1"
2458 2503 }
  2504 + },
  2505 + "supports-color": {
  2506 + "version": "7.2.0",
  2507 + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
  2508 + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
  2509 + "dev": true,
  2510 + "optional": true,
  2511 + "requires": {
  2512 + "has-flag": "^4.0.0"
  2513 + }
  2514 + },
  2515 + "vue-loader-v16": {
  2516 + "version": "npm:vue-loader@16.8.1",
  2517 + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
  2518 + "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
  2519 + "dev": true,
  2520 + "optional": true,
  2521 + "requires": {
  2522 + "chalk": "^4.1.0",
  2523 + "hash-sum": "^2.0.0",
  2524 + "loader-utils": "^2.0.0"
  2525 + },
  2526 + "dependencies": {
  2527 + "json5": {
  2528 + "version": "2.2.0",
  2529 + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
  2530 + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
  2531 + "dev": true,
  2532 + "optional": true,
  2533 + "requires": {
  2534 + "minimist": "^1.2.5"
  2535 + }
  2536 + },
  2537 + "loader-utils": {
  2538 + "version": "2.0.0",
  2539 + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
  2540 + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
  2541 + "dev": true,
  2542 + "optional": true,
  2543 + "requires": {
  2544 + "big.js": "^5.2.2",
  2545 + "emojis-list": "^3.0.0",
  2546 + "json5": "^2.1.2"
  2547 + }
  2548 + }
  2549 + }
2459 2550 }
2460 2551 }
2461 2552 },
... ... @@ -16480,75 +16571,6 @@
16480 16571 }
16481 16572 }
16482 16573 },
16483   - "vue-loader-v16": {
16484   - "version": "npm:vue-loader@16.8.1",
16485   - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
16486   - "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
16487   - "dev": true,
16488   - "optional": true,
16489   - "requires": {
16490   - "chalk": "^4.1.0",
16491   - "hash-sum": "^2.0.0",
16492   - "loader-utils": "^2.0.0"
16493   - },
16494   - "dependencies": {
16495   - "ansi-styles": {
16496   - "version": "4.3.0",
16497   - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
16498   - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
16499   - "dev": true,
16500   - "optional": true,
16501   - "requires": {
16502   - "color-convert": "^2.0.1"
16503   - }
16504   - },
16505   - "chalk": {
16506   - "version": "4.1.2",
16507   - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
16508   - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
16509   - "dev": true,
16510   - "optional": true,
16511   - "requires": {
16512   - "ansi-styles": "^4.1.0",
16513   - "supports-color": "^7.1.0"
16514   - }
16515   - },
16516   - "color-convert": {
16517   - "version": "2.0.1",
16518   - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
16519   - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
16520   - "dev": true,
16521   - "optional": true,
16522   - "requires": {
16523   - "color-name": "~1.1.4"
16524   - }
16525   - },
16526   - "color-name": {
16527   - "version": "1.1.4",
16528   - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
16529   - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
16530   - "dev": true,
16531   - "optional": true
16532   - },
16533   - "has-flag": {
16534   - "version": "4.0.0",
16535   - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
16536   - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
16537   - "dev": true,
16538   - "optional": true
16539   - },
16540   - "supports-color": {
16541   - "version": "7.2.0",
16542   - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
16543   - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
16544   - "dev": true,
16545   - "optional": true,
16546   - "requires": {
16547   - "has-flag": "^4.0.0"
16548   - }
16549   - }
16550   - }
16551   - },
16552 16574 "vue-router": {
16553 16575 "version": "3.5.1",
16554 16576 "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
... ...
src/views/PublicHome/MyClassList.vue
  Diff comments   View file @03a79e0
... ... @@ -88,19 +88,39 @@ export default {
88 88 }, 1000)
89 89 })
90 90 },
  91 + // 获取基地信息
91 92 GetStudyBaseDetail (baseId) {
92 93 this.$toast.loading({
93 94 message: '请求中...',
94 95 });
95   - this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${baseId}`).then((res) => {
96   - console.log(res.data)
97   - if (res.data.data) {
98   - this.$toast.clear();
99   - this.baseInfo = res.data.data;
100   - } else {
101   - this.$toast.fail(res.data.message)
  96 + this.mgop({
  97 + api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
  98 + host: 'https://mapi.zjzwfw.gov.cn/',
  99 + dataType: 'JSON',
  100 + type: 'GET',
  101 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  102 + headers: {
  103 + // 'isTestUrl': '1'
  104 + },
  105 + data: {
  106 + "userId": 0,
  107 + "cs": '绍兴市',
  108 + "id": baseId
  109 + },
  110 + onSuccess: res => {
  111 + this.$toast.clear()
  112 + console.log('基地信息：', res.data)
  113 + if (res.data.data) {
  114 + this.$toast.clear();
  115 + this.baseInfo = res.data.data;
  116 + } else {
  117 + this.$toast.fail(res.data.message)
  118 + }
  119 + },
  120 + onFail: err => {
  121 + console.log('err', err)
102 122 }
103   - })
  123 + });
104 124 },
105 125 getPosition () {
106 126 if (!this.selectedContact.travelerNum) {
... ...
src/views/PublicHome/StudentDetail.vue
  Diff comments   View file @03a79e0
... ... @@ -56,7 +56,7 @@
56 56 <van-empty v-if="baseList.length==0" description="暂无基地记录" />
57 57 </van-tab>
58 58 <van-tab title="课程记录">
59   - <div class="list_item" v-for="(item,index) in courseList" :key="index">
  59 + <div class="list_item" v-for="(item,index) in courseList" :key="index">
60 60 <div class="left">
61 61 <p class="day">{{item.day}}</p>
62 62 <p class="minute">{{item.minute}}</p>
... ... @@ -84,7 +84,7 @@ export default {
84 84 studentInfo: '',
85 85 courseList: [],//课程记录
86 86 baseList: [],//基地记录
87   - signCheckCountInfo:'',//打卡和课程天数信息
  87 + signCheckCountInfo: '',//打卡和课程天数信息
88 88 active: 0
89 89 }
90 90 },
... ... @@ -109,60 +109,103 @@ export default {
109 109 methods: {
110 110 // 获取课程记录
111 111 getCourseList () {
112   -
113   - this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseCheckDetail/List`, {
114   - "userId": this.studentInfo?.travelerNum,
115   - "pageIndex": 1,
116   - "pageSize": 999
117   - }).then((res) => {
118   - this.$toast.clear()
119   - console.log('课程记录：', res.data)
120   - if (res.data.status == 1) {
121   - let courseList = res.data.data.data
122   - for(let i in courseList){
123   - courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
124   - courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
  112 + this.mgop({
  113 + api: 'mgop.sz.hswsy.CourseCheckDetail', // 必须
  114 + host: 'https://mapi.zjzwfw.gov.cn/',
  115 + dataType: 'JSON',
  116 + type: 'POST',
  117 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  118 + headers: {
  119 + // 'isTestUrl': '1'
  120 + },
  121 + data: {
  122 + "userId": this.studentInfo?.travelerNum,
  123 + "pageIndex": 1,
  124 + "pageSize": 999
  125 + },
  126 + onSuccess: res => {
  127 + this.$toast.clear()
  128 + console.log('课程记录：', res.data)
  129 + if (res.data.status == 1) {
  130 + let courseList = res.data.data.data
  131 + for (let i in courseList) {
  132 + courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
  133 + courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
  134 + }
  135 + this.courseList = courseList
  136 + console.log(this.courseList)
  137 + } else {
  138 + this.$toast.fail(res.data.message)
125 139 }
126   - this.courseList = courseList
127   - console.log(this.courseList)
128   - } else {
129   - this.$toast.fail(res.data.message)
  140 + },
  141 + onFail: err => {
  142 + console.log('err', err)
130 143 }
131   - })
  144 + });
132 145 },
133 146 // 获取基地记录
134 147 getBaseList () {
135   - this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SignDetail/List`, {
136   - "userId": this.studentInfo?.travelerNum,
137   - "pageIndex": 1,
138   - "pageSize": 999
139   - }).then((res) => {
140   - this.$toast.clear()
141   - console.log('基地记录：', res.data)
142   - if (res.data.status == 1) {
143   - let baseList = res.data.data.data
144   - for(let i in baseList){
145   - baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
146   - baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
  148 + this.mgop({
  149 + api: 'mgop.sz.hswsy.SignDetail', // 必须
  150 + host: 'https://mapi.zjzwfw.gov.cn/',
  151 + dataType: 'JSON',
  152 + type: 'POST',
  153 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  154 + headers: {
  155 + // 'isTestUrl': '1'
  156 + },
  157 + data: {
  158 + "userId": this.studentInfo?.travelerNum,
  159 + "pageIndex": 1,
  160 + "pageSize": 999
  161 + },
  162 + onSuccess: res => {
  163 + this.$toast.clear()
  164 + console.log('基地记录：', res.data)
  165 + if (res.data.status == 1) {
  166 + let baseList = res.data.data.data
  167 + for (let i in baseList) {
  168 + baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
  169 + baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
  170 + }
  171 + console.log(baseList)
  172 + this.baseList = baseList
  173 + } else {
  174 + this.$toast.fail(res.data.message)
147 175 }
148   - console.log(baseList)
149   - this.baseList = baseList
150   - } else {
151   - this.$toast.fail(res.data.message)
  176 + },
  177 + onFail: err => {
  178 + console.log('err', err)
152 179 }
153   - })
  180 + });
154 181 },
155 182 // 根据用户编号获取打卡和课程天数信息
156 183 getSignCheckCountInfo () {
157   - this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/SignCheckCountInfo/ByUserId?userId=${this.studentInfo?.travelerNum}`).then((res) => {
158   - this.$toast.clear()
159   - console.log('天数：', res.data)
160   - if (res.data.status == 1) {
161   - this.signCheckCountInfo = res.data.data
162   - } else {
163   - this.$toast.fail(res.data.message)
  184 + this.mgop({
  185 + api: 'mgop.sz.hswsy.SignCheckCountInfoByUserId', // 必须
  186 + host: 'https://mapi.zjzwfw.gov.cn/',
  187 + dataType: 'JSON',
  188 + type: 'GET',
  189 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  190 + headers: {
  191 + // 'isTestUrl': '1'
  192 + },
  193 + data: {
  194 + "userId": this.studentInfo?.travelerNum,
  195 + },
  196 + onSuccess: res => {
  197 + this.$toast.clear()
  198 + console.log('天数：', res.data)
  199 + if (res.data.status == 1) {
  200 + this.signCheckCountInfo = res.data.data
  201 + } else {
  202 + this.$toast.fail(res.data.message)
  203 + }
  204 + },
  205 + onFail: err => {
  206 + console.log('err', err)
164 207 }
165   - })
  208 + });
166 209 },
167 210 // 研学码
168 211 handleYanxue () {
... ... @@ -175,23 +218,23 @@ export default {
175 218 // }
176 219 },
177 220 // 基地评价
178   - evaluateBase(item){
179   - this.$router.push({ name: 'evaluateBase',query:{baseId:item.baseId,signId:item.signId}})
  221 + evaluateBase (item) {
  222 + this.$router.push({ name: 'evaluateBase', query: { baseId: item.baseId, signId: item.signId } })
180 223 },
181 224 // 课程评价
182   - evaluateCourse(item){
  225 + evaluateCourse (item) {
183 226 let courseInfo = item;
184 227 courseInfo.id = courseInfo.orderId
185 228 window.sessionStorage.setItem('courseInfo', JSON.stringify(courseInfo))
186   - this.$router.push({ name: 'evaluateCourse'})
  229 + this.$router.push({ name: 'evaluateCourse' })
187 230 },
188 231 // 基地评价详情
189   - evaluateBaseDetail(item){
190   - this.$router.push({ name: 'evaluateDetail',query:{evaluationId:item.evaluationId,baseId:item.baseId}})
  232 + evaluateBaseDetail (item) {
  233 + this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId, baseId: item.baseId } })
191 234 },
192 235 // 课程评价详情
193   - evaluateCourseDetail(item){
194   - this.$router.push({ name: 'evaluateDetail',query:{evaluationId:item.evaluationId}})
  236 + evaluateCourseDetail (item) {
  237 + this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId } })
195 238 }
196 239 },
197 240 components: {
... ... @@ -236,14 +279,14 @@ export default {
236 279 font-size: 34px;
237 280 font-weight: bold;
238 281 width: 100%;
239   - span{
  282 + span {
240 283 display: inline-block;
241 284 padding: 0 14px;
242 285 margin-left: 14px;
243 286 line-height: 34px;
244 287 border-radius: 17px;
245 288 font-size: 22px;
246   - background: #2D90D2;
  289 + background: #2d90d2;
247 290 vertical-align: middle;
248 291 }
249 292 }
... ... @@ -325,10 +368,9 @@ export default {
325 368 padding-right: 30px;
326 369 text-align: right;
327 370 font-size: 34px;
328   - .day{
329   -
  371 + .day {
330 372 }
331   - .minute{
  373 + .minute {
332 374 font-size: 30px;
333 375 color: #999;
334 376 }
... ...
src/views/PublicHome/component/AddChildPopupGroup.vue
  Diff comments   View file @03a79e0
... ... @@ -27,7 +27,7 @@
27 27 <div class="child_box">
28 28 <div class="child_item" v-for="(item,index) in claimChildList" :key="index">
29 29 <p><span>姓名</span>{{item.travelerName}}</p>
30   - <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==1?'初中':'高中'}}</p>
  30 + <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==2?'初中':'高中'}}</p>
31 31 <p><span>所在地区</span>{{item.province+item.city+item.area}}</p>
32 32 <p><span>学校</span>{{item.schoolName}}</p>
33 33 <p><span>入学年份</span>{{item.enrollYear}}</p>
... ... @@ -138,7 +138,7 @@ export default {
138 138 let publicName = sessionStorage.getItem('publicName')
139 139 this.publicName = publicName
140 140 let userInfo = sessionStorage.getItem('userInfo')
141   - this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
  141 + this.userInfo = JSON.parse(userInfo);
142 142 this.initYearArr()
143 143 this.GetSysAreaList()
144 144 },
... ... @@ -198,14 +198,11 @@ export default {
198 198 duration: 0,
199 199 forbidClick: true
200 200 })
201   - const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
202   - let openId = sessionStorage.getItem('openId' + this.publicName) || 'oHHbojtmLCNmOKwYBett8dXxhMlg';
203 201  
204 202 this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
205 203 "code": this.code,
206   - "openId": openId,
207 204 "phone": this.phone,
208   - "unionId": userInfo.unionId
  205 + "unionId": sessionStorage.getItem('centerNo')
209 206 }).then((res) => {
210 207 this.$toast.clear()
211 208 if (res.data.code == 200) {
... ... @@ -388,7 +385,7 @@ export default {
388 385 schoolName: this.school,//学校名称
389 386 enrollYear: this.year,//入学年份
390 387 travelerType: this.userTypeVal,//1-小学 2-初中 3-高中
391   -
  388 + loginMobile: this.userInfo?.phone
392 389 }
393 390 this.$toast.loading({
394 391 message: '加载中',
... ...
src/views/PublicHome/component/HomeChildList.vue
  Diff comments   View file @03a79e0
... ... @@ -74,10 +74,10 @@ export default {
74 74 data: {
75 75 "userNum": sessionStorage.getItem('centerNo')
76 76 },
77   - onSuccess: data => {
78   - console.log('getUserInfo', data)
  77 + onSuccess: res => {
  78 + console.log('getUserInfo', res)
79 79 this.$toast.clear()
80   - if (data.data.code == 200) {
  80 + if (res.data.code == 200) {
81 81 this.childList = res.data.data.userInfo.subUsers
82 82 }
83 83 },
... ...
src/views/PublicService/evaluateBase.vue
  Diff comments   View file @03a79e0
... ... @@ -42,12 +42,12 @@ import { imgCut } from &#39;vue-imgcut&#39;
42 42 export default {
43 43 data () {
44 44 return {
45   - baseId:'',
46   - signId:'',
47   - baseInfo:'',
  45 + baseId: '',
  46 + signId: '',
  47 + baseInfo: '',
48 48 starsBaseNum: 0,
49 49 userInfo: '',
50   - studentInfo:'',
  50 + studentInfo: '',
51 51 courseInfo: '',
52 52 content: '',
53 53 imgsrc: [],
... ... @@ -86,39 +86,70 @@ export default {
86 86 this.$toast.loading({
87 87 message: '请求中...',
88 88 });
89   - this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
90   - {
91   - baseId: this.baseId,
92   - signId:this.signId,
93   - evaluation: this.content,
94   - userId: this.studentInfo.travelerNum,
95   - imgList: this.imgsrc,
96   - baseScore: this.starsBaseNum
97   - }
98   - ).then((res) => {
99   - this.$toast.clear();
100   - if (res.data.status == 1) {
101   - this.$toast.success('发布成功');
102   - setTimeout(() => {
103   - this.$router.back()
104   - }, 1000)
  89 + this.mgop({
  90 + api: 'mgop.sz.hswsy.AddEvaluation', // 必须
  91 + host: 'https://mapi.zjzwfw.gov.cn/',
  92 + dataType: 'JSON',
  93 + type: 'POST',
  94 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  95 + headers: {
  96 + // 'isTestUrl': '1'
  97 + },
  98 + data: {
  99 + "baseId": this.baseId,
  100 + "signId": this.signId,
  101 + "evaluation": this.content,
  102 + "userId": this.studentInfo.travelerNum,
  103 + "imgList": this.imgsrc,
  104 + "baseScore": this.starsBaseNum
  105 + },
  106 + onSuccess: res => {
  107 + this.$toast.clear();
  108 + if (res.data.status == 1) {
  109 + this.$toast.success('发布成功');
  110 + setTimeout(() => {
  111 + this.$router.back()
  112 + }, 1000)
  113 + }
  114 + },
  115 + onFail: err => {
  116 + console.log('err', err)
105 117 }
106   - })
  118 + });
107 119 },
108 120 // 获取基地信息
109 121 GetStudyBaseDetail () {
110 122 this.$toast.loading({
111 123 message: '请求中...',
112 124 });
113   - this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
114   - console.log(res.data)
115   - if (res.data.data) {
116   - this.$toast.clear();
117   - this.baseInfo = res.data.data;
118   - } else {
119   - this.$toast.fail(res.data.message)
  125 + this.mgop({
  126 + api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
  127 + host: 'https://mapi.zjzwfw.gov.cn/',
  128 + dataType: 'JSON',
  129 + type: 'GET',
  130 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  131 + headers: {
  132 + // 'isTestUrl': '1'
  133 + },
  134 + data: {
  135 + "userId": 0,
  136 + "cs": '绍兴市',
  137 + "id": this.baseId
  138 + },
  139 + onSuccess: res => {
  140 + this.$toast.clear()
  141 + console.log('基地信息：', res.data)
  142 + if (res.data.data) {
  143 + this.$toast.clear();
  144 + this.baseInfo = res.data.data;
  145 + } else {
  146 + this.$toast.fail(res.data.message)
  147 + }
  148 + },
  149 + onFail: err => {
  150 + console.log('err', err)
120 151 }
121   - })
  152 + });
122 153 },
123 154 callback (img) {
124 155 this.imgsrc.push({
... ... @@ -185,9 +216,9 @@ export default {
185 216 font-size: 30px;
186 217 text-align: center;
187 218 box-shadow: 0 0 30px #7ab1f8;
188   - &.disabled{
189   - opacity: 0.4;
190   - }
  219 + &.disabled {
  220 + opacity: 0.4;
  221 + }
191 222 }
192 223 .cont {
193 224 .van-cell {
... ...
src/views/PublicService/evaluateCourse.vue
  Diff comments   View file @03a79e0
... ... @@ -93,28 +93,40 @@ export default {
93 93 this.$toast.loading({
94 94 message: '请求中...',
95 95 });
96   - this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
97   - {
98   - baseId: this.courseInfo.baseId,
99   - title: this.courseInfo.courseName,
100   - evaluation: this.content,
101   - courseId: this.courseInfo.courseId,
102   - orderId: this.courseInfo.id,
103   - userId: this.userInfo.centerNo,
104   - imgList: this.imgsrc,
105   - courseScore: this.starsCourseNum,
106   - baseScore: this.starsBaseNum
  96 + this.mgop({
  97 + api: 'mgop.sz.hswsy.AddEvaluation', // 必须
  98 + host: 'https://mapi.zjzwfw.gov.cn/',
  99 + dataType: 'JSON',
  100 + type: 'POST',
  101 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  102 + headers: {
  103 + // 'isTestUrl': '1'
  104 + },
  105 + data: {
  106 + "baseId": this.courseInfo.baseId,
  107 + "title": this.courseInfo.courseName,
  108 + "evaluation": this.content,
  109 + "courseId": this.courseInfo.courseId,
  110 + "orderId": this.courseInfo.id,
  111 + "userId": this.userInfo.centerNo,
  112 + "imgList": this.imgsrc,
  113 + "courseScore": this.starsCourseNum,
  114 + "baseScore": this.starsBaseNum
  115 + },
  116 + onSuccess: res => {
  117 + this.$toast.clear();
  118 + if (res.data.status == 1) {
  119 + this.$toast.success('发布成功');
  120 + setTimeout(() => {
  121 + // this.$router.push({ name: 'ServiceOrderXST' })
  122 + this.$router.back()
  123 + }, 1000)
  124 + }
  125 + },
  126 + onFail: err => {
  127 + console.log('err', err)
107 128 }
108   - ).then((res) => {
109   - this.$toast.clear();
110   - if (res.data.status == 1) {
111   - this.$toast.success('发布成功');
112   - setTimeout(() => {
113   - // this.$router.push({ name: 'ServiceOrderXST' })
114   - this.$router.back()
115   - }, 1000)
116   - }
117   - })
  129 + });
118 130 },
119 131 callback (img) {
120 132 this.imgsrc.push({
... ... @@ -181,9 +193,9 @@ export default {
181 193 font-size: 30px;
182 194 text-align: center;
183 195 box-shadow: 0 0 30px #7ab1f8;
184   - &.disabled{
185   - opacity: 0.4;
186   - }
  196 + &.disabled {
  197 + opacity: 0.4;
  198 + }
187 199 }
188 200 .cont {
189 201 .van-cell {
... ...
src/views/PublicService/evaluateDetail.vue
  Diff comments   View file @03a79e0
... ... @@ -39,7 +39,7 @@
39 39 <div class="evaluation_img_box">
40 40 <img class="evaluation_img" v-for="(imgItem,index) in evaluationData.imgList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
41 41 </div>
42   - <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
  42 + <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
43 43 </div>
44 44 </div>
45 45 </template>
... ... @@ -50,7 +50,7 @@ export default {
50 50 data () {
51 51 return {
52 52 baseId: '',//有基地id时为基地评价
53   - baseInfo:'',
  53 + baseInfo: '',
54 54 evaluationId: '',
55 55 evaluationData: '',
56 56 starsBaseNum: 0,
... ... @@ -92,9 +92,21 @@ export default {
92 92 duration: 0,
93 93 forbidClick: true
94 94 })
95   - this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/EvaluationDetail/ById?id=${this.evaluationId}`).then((res) => {
96   - this.$toast.clear()
97   - console.log('评价：', res.data)
  95 + this.mgop({
  96 + api: 'mgop.sz.hswsy.EvaluationDetailById', // 必须
  97 + host: 'https://mapi.zjzwfw.gov.cn/',
  98 + dataType: 'JSON',
  99 + type: 'GET',
  100 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  101 + headers: {
  102 + // 'isTestUrl': '1'
  103 + },
  104 + data: {
  105 + "id": this.evaluationId
  106 + },
  107 + onSuccess: res => {
  108 + this.$toast.clear()
  109 + console.log('评价详情：', res.data)
98 110 if (res.data.status == 1) {
99 111 let evaluationData = res.data.data
100 112 evaluationData.intime = this.Moment(new Date(evaluationData.intime)).format('YYYY-MM-DD')
... ... @@ -102,22 +114,45 @@ export default {
102 114 } else {
103 115 this.$toast.fail(res.data.message)
104 116 }
105   - })
  117 + },
  118 + onFail: err => {
  119 + console.log('err', err)
  120 + }
  121 + });
106 122 },
107 123 // 获取基地信息
108 124 GetStudyBaseDetail () {
109 125 this.$toast.loading({
110 126 message: '请求中...',
111 127 });
112   - this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
113   - console.log(res.data)
114   - if (res.data.data) {
115   - this.$toast.clear();
116   - this.baseInfo = res.data.data;
117   - } else {
118   - this.$toast.fail(res.data.message)
  128 + this.mgop({
  129 + api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
  130 + host: 'https://mapi.zjzwfw.gov.cn/',
  131 + dataType: 'JSON',
  132 + type: 'GET',
  133 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  134 + headers: {
  135 + // 'isTestUrl': '1'
  136 + },
  137 + data: {
  138 + "userId": 0,
  139 + "cs": '绍兴市',
  140 + "id": this.baseId
  141 + },
  142 + onSuccess: res => {
  143 + this.$toast.clear()
  144 + console.log('基地信息：', res.data)
  145 + if (res.data.data) {
  146 + this.$toast.clear();
  147 + this.baseInfo = res.data.data;
  148 + } else {
  149 + this.$toast.fail(res.data.message)
  150 + }
  151 + },
  152 + onFail: err => {
  153 + console.log('err', err)
119 154 }
120   - })
  155 + });
121 156 },
122 157 }
123 158 }
... ...
src/views/PublicService/evaluatePubilc.vue
  Diff comments   View file @03a79e0
... ... @@ -94,27 +94,39 @@ export default {
94 94 this.$toast.loading({
95 95 message: '请求中...',
96 96 });
97   - yxAxios.post('https://yanxue.myjxt.com/api/StudiesWap/AddEvaluation',
98   - {
99   - baseId: this.courseInfo.baseId,
100   - title: this.courseInfo.courseName,
101   - evaluation: this.content,
102   - courseId: this.courseInfo.courseId,
103   - orderId: this.courseInfo.id,
104   - userId: this.userInfo.centerNo,
105   - imgList: this.imgsrc,
106   - courseScore: this.starsCourseNum,
107   - baseScore: this.starsBaseNum
  97 + this.mgop({
  98 + api: 'mgop.sz.hswsy.AddEvaluation', // 必须
  99 + host: 'https://mapi.zjzwfw.gov.cn/',
  100 + dataType: 'JSON',
  101 + type: 'POST',
  102 + appKey: 'fuxgnukl+2001895516+edccpx', // 必须
  103 + headers: {
  104 + // 'isTestUrl': '1'
  105 + },
  106 + data: {
  107 + "baseId": this.courseInfo.baseId,
  108 + "title": this.courseInfo.courseName,
  109 + "evaluation": this.content,
  110 + "courseId": this.courseInfo.courseId,
  111 + "orderId": this.courseInfo.id,
  112 + "userId": this.userInfo.centerNo,
  113 + "imgList": this.imgsrc,
  114 + "courseScore": this.starsCourseNum,
  115 + "baseScore": this.starsBaseNum
  116 + },
  117 + onSuccess: res => {
  118 + this.$toast.clear();
  119 + if (res.data.status == 1) {
  120 + this.$toast.success('发布成功');
  121 + setTimeout(() => {
  122 + this.$router.push({ name: 'ServiceOrderXST' })
  123 + }, 1000)
  124 + }
  125 + },
  126 + onFail: err => {
  127 + console.log('err', err)
108 128 }
109   - ).then((res) => {
110   - this.$toast.clear();
111   - if (res.data.status == 1) {
112   - this.$toast.success('发布成功');
113   - setTimeout(() => {
114   - this.$router.push({ name: 'ServiceOrderXST' })
115   - }, 1000)
116   - }
117   - })
  129 + });
118 130 },
119 131 callback (img) {
120 132 this.imgsrc.push({
... ... @@ -181,9 +193,9 @@ export default {
181 193 font-size: 30px;
182 194 text-align: center;
183 195 box-shadow: 0 0 30px #7ab1f8;
184   - &.disabled{
185   - opacity: 0.4;
186   - }
  196 + &.disabled {
  197 + opacity: 0.4;
  198 + }
187 199 }
188 200 .cont {
189 201 .van-cell {
... ...
src/views/Service/EditContact.vue
  Diff comments   View file @03a79e0
... ... @@ -74,13 +74,16 @@ export default {
74 74 this.$toast('请输入正确的身份证号')
75 75 return;
76 76 }
  77 + let userInfo = sessionStorage.getItem('userInfo')
  78 + userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
77 79 let postData = {
78 80 userNum: this.travelerNum,
79 81 contactsName: this.travelerName,
80 82 contactsMobile: this.phone,
81 83 contactsIdCard: this.travelerIdCard,
82 84 contactsType: this.userType,
83   - gender:Number(this.gender)
  85 + gender: Number(this.gender),
  86 + loginMobile: userInfo?.phone
84 87 }
85 88 this.$toast.loading({
86 89 message: '加载中',
... ...
src/views/Service/SelectContact.vue
  Diff comments   View file @03a79e0
... ... @@ -61,9 +61,10 @@ export default {
61 61 data: {
62 62 "userNum": sessionStorage.getItem('centerNo')
63 63 },
64   - onSuccess: data => {
65   - console.log('联系人列表：', data)
66   - if (data.data.code == 200) {
  64 + onSuccess: res => {
  65 + console.log('联系人列表：', res)
  66 + this.$toast.clear()
  67 + if (res.data.code == 200) {
67 68 let userInfo = res.data.data.userInfo;
68 69 let contactList = userInfo.subUsers
69 70 // 把家长添加到列表
... ... @@ -107,7 +108,7 @@ export default {
107 108 for (let i in contactList) {
108 109 if (contactList[i]?.checked) {
109 110 if ((!contactList[i].travelerIdCard || !contactList[i].gender) && !this.hideParent) {
110   - this.$toast('请先完善您选择的联系人信息')
  111 + this.$toast('请先完善您选择的出行人信息')
111 112 return;
112 113 } else {
113 114 selectedArr.push({
... ... @@ -120,7 +121,7 @@ export default {
120 121 }
121 122 console.log(this.limit, selectedArr.length)
122 123 if (this.limit && this.limit != selectedArr.length) {
123   - this.$toast(`请选择${this.limit}位联系人`)
  124 + this.$toast(`请选择${this.limit}位出行人`)
124 125 return;
125 126 }
126 127 // console.log(selectedArr)
... ...