Browse Source

协议报错

lex-xin 5 years ago
parent
commit
979d246357

File diff suppressed because it is too large
+ 0 - 0
dist/css/app.812dfc6b.css


+ 1 - 1
dist/css/chunk-6b971d50.9201e029.css → dist/css/chunk-7250dad6.59e5c7d6.css

@@ -1 +1 @@
-.register[data-v-6768dee0]{margin-bottom:.3rem}header[data-v-6768dee0]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.banner[data-v-6768dee0]{font-size:0}.banner img[data-v-6768dee0]{width:100%}.reg-title[data-v-6768dee0]{padding:0 .12rem;position:relative;height:.4rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#666;font-size:.14rem}.reg-title span[data-v-6768dee0]{color:#9b9b9b}.reg-title .card_icon[data-v-6768dee0]{display:inline-block;width:.23rem;height:.2rem;margin-right:.1rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAUCAYAAABmvqYOAAACFUlEQVRIS72TP2gTYRjGn+eOYKSm6uXUIbYglM7+WdxEHEVHwYKCOAnmNJqkLSjGQdqLreSSZtDBohQUxMlOKoog6OIoOghqGxThYhqkFM3dvZKUSpDr3Uml3/i+v/f5ft8LHxHh6Nb4kECZpoKaCDXXdfYsZEY/hY0yDGj3k1ZxjESfnc6d0CvXv0LkuH1u+HnYLLVyoVdVe7cHgeI6WQBDELyAwsMCnFQU9fVqM79cR5obPswxWSnWKEgFhgNfCPn2hxEOgEgEzginqZeLEvY8ADepKjMrnLieBWBviNBjJq1ii5QnES6IjAi4BcCPtnnTNvKbI09GALWyuZ/g1fUL7yld2xFn7FiQnKNwtpnOfQxifM21srmT4JnAl7syU88Mv2szWnWyj647BpG5emPpEgoFr1P/H2tJWuZtkqeWZXjUNnKPVg3fWhrvVxT1op+557kPGudHXnb3tIp5msJbAJoOuW9lXb7miYkJPRZzj/iFU1Ff1dPZ9+2ebpoJbGSGas8NcRYvC+Whq6hxel6qYeTvrWktumUeBPlMiFF6OADwjlCuAIjXjfwu33B9anIQnlPqNhfwft3I3+2uJafMQ/T4FAJbiFkhbEWQFWC+buT7fcO3VaubgKXd3UEtwfzC2exn3/BOUWoQEkQqMDzC5+sgyxKLA3/z7k+v9f3CyNs17TxMYt3C3wAyGGbzb31SiOpvlWIPRlUdpeMAAAAASUVORK5CYII=) no-repeat 50%;background-size:contain}.btn-group[data-v-6768dee0]{margin:.3rem .3rem 0}.btn-group .btn-submit[data-v-6768dee0]{background:#14928a;border-radius:1rem;color:#fff;font-size:.18rem}.van-cell[data-v-6768dee0]{font-size:.16rem;padding:.13rem .11rem}[data-v-6768dee0] .van-field--disabled .van-field__control{color:#444!important}.van-field__controll[data-v-6768dee0]{color:#323233}
+.register[data-v-fd1161f0]{margin-bottom:.3rem}header[data-v-fd1161f0]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.banner[data-v-fd1161f0]{font-size:0}.banner img[data-v-fd1161f0]{width:100%}.reg-title[data-v-fd1161f0]{padding:0 .12rem;position:relative;height:.4rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#666;font-size:.14rem}.reg-title span[data-v-fd1161f0]{color:#9b9b9b}.reg-title .card_icon[data-v-fd1161f0]{display:inline-block;width:.23rem;height:.2rem;margin-right:.1rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAUCAYAAABmvqYOAAACFUlEQVRIS72TP2gTYRjGn+eOYKSm6uXUIbYglM7+WdxEHEVHwYKCOAnmNJqkLSjGQdqLreSSZtDBohQUxMlOKoog6OIoOghqGxThYhqkFM3dvZKUSpDr3Uml3/i+v/f5ft8LHxHh6Nb4kECZpoKaCDXXdfYsZEY/hY0yDGj3k1ZxjESfnc6d0CvXv0LkuH1u+HnYLLVyoVdVe7cHgeI6WQBDELyAwsMCnFQU9fVqM79cR5obPswxWSnWKEgFhgNfCPn2hxEOgEgEzginqZeLEvY8ADepKjMrnLieBWBviNBjJq1ii5QnES6IjAi4BcCPtnnTNvKbI09GALWyuZ/g1fUL7yld2xFn7FiQnKNwtpnOfQxifM21srmT4JnAl7syU88Mv2szWnWyj647BpG5emPpEgoFr1P/H2tJWuZtkqeWZXjUNnKPVg3fWhrvVxT1op+557kPGudHXnb3tIp5msJbAJoOuW9lXb7miYkJPRZzj/iFU1Ff1dPZ9+2ebpoJbGSGas8NcRYvC+Whq6hxel6qYeTvrWktumUeBPlMiFF6OADwjlCuAIjXjfwu33B9anIQnlPqNhfwft3I3+2uJafMQ/T4FAJbiFkhbEWQFWC+buT7fcO3VaubgKXd3UEtwfzC2exn3/BOUWoQEkQqMDzC5+sgyxKLA3/z7k+v9f3CyNs17TxMYt3C3wAyGGbzb31SiOpvlWIPRlUdpeMAAAAASUVORK5CYII=) no-repeat 50%;background-size:contain}.btn-group[data-v-fd1161f0]{margin:.3rem .3rem 0}.btn-group .btn-submit[data-v-fd1161f0]{background:#14928a;border-radius:1rem;color:#fff;font-size:.18rem}.van-cell[data-v-fd1161f0]{font-size:.16rem;padding:.13rem .11rem}[data-v-fd1161f0] .van-field--disabled .van-field__control{color:#444!important}.van-field__controll[data-v-fd1161f0]{color:#323233}

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.02688714.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.02688714.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.da59c410.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.da59c410.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-6b971d50.f69c6208.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-6b971d50.f69c6208.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-7250dad6.bc91fc16.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-7250dad6.bc91fc16.js.map


+ 1 - 0
src/views/Home.vue

@@ -217,6 +217,7 @@ export default {
                 classAmount: r.fee_amount_, // 课程费用
                 course_id: r.course_id_, // 课程组
             }
+            // console.log(this.orderInfo)
             this.instrument = instruments[this.cnToEn(this.result.voicyPart)]
             if(r.fee_type_ == 25 || r.fee_type_ == 26) {
                 this.instrument.config.forEach(el => {

+ 11 - 6
src/views/login.vue

@@ -49,20 +49,24 @@ export default {
                 schoolName: '', // 乐团名称
                 phoneNumber: '', // 手机号
                 branchId: '', // 分部编号
+                classId: '', // 乐团编号
             }
         }
     },
     mounted() {
         let route = this.$route.query
         let params = {
-            clazzId: route.classId,
             schoolId: route.schoolId
         }
         axios.post(`/user/getClassDetail`,qs.stringify(params)).then((response) => {
             let result = response.data
-            this.dataList.schoolName = result.data.name
-            this.dataList.branchId = result.data.branchId
-            this.dataList.status = result.data.status
+            this.dataList = {
+                status: result.data.status,
+                schoolName: result.data.name,
+                phoneNumber: '',
+                branchId: result.data.branchId,
+                classId: result.data.id
+            }
         })
     },
     methods: {
@@ -74,7 +78,8 @@ export default {
                 return false; 
             }
             let params = this.$route.query
-            axios.get(`/user/getUserDetailByPhone?clazzId=${params.classId}&phone=${this.dataList.phoneNumber}&cityId=${params.cityId}`).then((res) => {
+            console.log(this.dataList)
+            axios.get(`/user/getUserDetailByPhone?clazzId=${this.dataList.classId}&phone=${this.dataList.phoneNumber}&cityId=${params.cityId}`).then((res) => {
                 let result = res.data
                 // 判断是否有数据
                 if(result.status) {
@@ -109,7 +114,7 @@ export default {
                                 query: {
                                     phone: this.dataList.phoneNumber,
                                     cityId: params.cityId,
-                                    classId: params.classId,
+                                    classId: this.dataList.classId,
                                     schoolId: params.schoolId,
                                     branchId: this.dataList.branchId
                                 }

+ 1 - 1
src/views/protocol.vue

@@ -68,7 +68,7 @@
                 <div class="sign">甲方签章 <img class="cachet" src="../assets/cachet.png" alt=""> 
                     <span>{{nowDate}}</span>
                 </div>
-                <div class="sign">乙方签字:{{ dataList.realName }}
+                <div class="sign">乙方签字:{{ proto.stuName }}
                     <span> {{ nowDate }} </span>
                 </div>
             </div>

+ 0 - 1
src/views/register.vue

@@ -212,7 +212,6 @@ export default {
                         // 跳转到登录页面
                         this.$router.push({ path: 'login', query: {
                             schoolId: params.schoolId, // 学校编号
-                            classId: params.classId, // 乐团编号
                             cityId: params.cityId // 城市编号
                         } })
                     })

+ 5 - 5
vue.config.js

@@ -7,8 +7,8 @@ module.exports = {
         // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/cli-service.md#配置代理
         proxy: {
             '/user': {
-                target: 'https://pay.dayaedu.com',
-                // target: 'http://192.168.3.27:8005',
+                // target: 'https://pay.dayaedu.com',
+                target: 'http://192.168.3.38:9000',
                 // target: 'http://192.168.3.27:9000',
                 changeOrigin: true,
                 ws: true,
@@ -16,8 +16,8 @@ module.exports = {
                 xfwd: true
             },
             '/yqpay': {
-                target: 'https://pay.dayaedu.com',
-                // target: 'http://192.168.3.27:9000',
+                // target: 'https://pay.dayaedu.com',
+                target: 'http://192.168.3.38:9000',
                 // target: 'http://192.168.3.28:8005',
                 changeOrigin: true,
                 ws: true,
@@ -25,7 +25,7 @@ module.exports = {
                 xfwd: true
             },
             '/order': {
-                target: 'http://192.168.3.38:8088',
+                target: 'http://192.168.3.38:9000',
                 // target: 'http://192.168.3.27:9000',
                 // target: 'http://192.168.3.28:8005',
                 changeOrigin: true,

Some files were not shown because too many files changed in this diff