lex-xin 5 years ago
parent
commit
56c43528b3

File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.c8ab09c1.css


+ 0 - 1
dist/css/order.574fbad5.css

@@ -1 +0,0 @@
-.order[data-v-769499e2]{background:#fff;min-height:100vh}header[data-v-769499e2]{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}h2[data-v-769499e2]{font-size:.16rem;color:#fff;padding:.1rem 0;text-align:center;background:#14928a}.table .title[data-v-769499e2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;border-bottom:1px solid #eaeaea}.table span[data-v-769499e2]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:.08rem 0;font-size:.14rem}.table span[data-v-769499e2]:first-child{width:.3rem;-webkit-box-flex:inherit;-ms-flex:inherit;flex:inherit}.table .content>div[data-v-769499e2]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center}.table .content>div[data-v-769499e2]:nth-child(2n+2){background:#eaeaea}[data-v-769499e2] .van-dropdown-menu{height:.4rem;position:absolute;right:.15rem;top:0}

+ 1 - 0
dist/css/order.e1668527.css

@@ -0,0 +1 @@
+.order[data-v-3671b914]{background:#fff;min-height:100vh}header[data-v-3671b914]{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}h2[data-v-3671b914]{font-size:.16rem;color:#fff;padding:.1rem 0;text-align:center;background:#14928a}.table .title[data-v-3671b914]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;border-bottom:1px solid #eaeaea}.table span[data-v-3671b914]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:.08rem 0;font-size:.14rem}.table span[data-v-3671b914]:first-child{width:.3rem;-webkit-box-flex:inherit;-ms-flex:inherit;flex:inherit}.table .content>div[data-v-3671b914]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center}.table .content>div[data-v-3671b914]:nth-child(2n+2){background:#eaeaea}[data-v-3671b914] .van-dropdown-menu{height:.4rem;position:absolute;right:.15rem;top:0}

+ 1 - 0
dist/css/privacyChild.7fb5c5b1.css

@@ -0,0 +1 @@
+.privacy[data-v-0ee431be]{background:#fff}header[data-v-0ee431be]{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}header .back[data-v-0ee431be]{width:.2rem;height:.2rem;position:absolute;left:.12rem;top:.1rem}.container[data-v-0ee431be]{padding:.22rem .2rem .3rem;font-size:.14rem}.container h1[data-v-0ee431be]{font-size:.16rem;text-align:center}.container h2[data-v-0ee431be]{font-size:.16rem;font-weight:700;padding-top:.15rem}.container h3[data-v-0ee431be]{font-size:.14rem;font-weight:700}.container .signature[data-v-0ee431be]{display:-webkit-box;display:-ms-flexbox;display:flex;padding-top:.5rem}.container .signature .sign[data-v-0ee431be]{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.container .signature span[data-v-0ee431be]{display:block;padding-left:.2rem}.container .signature .cachet[data-v-0ee431be]{position:absolute;top:-.6rem;left:0;width:1.5rem;height:1.5rem}.iInfo[data-v-0ee431be]{display:-webkit-box;display:-ms-flexbox;display:flex}.iInfo span[data-v-0ee431be]{-webkit-box-flex:1;-ms-flex:1;flex:1}.btnback[data-v-0ee431be]{display:inline-block;font-size:.18rem;color:#fff;background:#f1111b;border-radius:.04rem;-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.19);box-shadow:0 2px 4px 0 rgba(0,0,0,.19);padding:.08rem 0;margin-top:.8rem;width:100%;text-align:center}.line[data-v-0ee431be]{border-bottom:1px solid #000}

+ 0 - 1
dist/css/privacyChild.ef778d65.css

@@ -1 +0,0 @@
-.privacy[data-v-d221ead2]{background:#fff}header[data-v-d221ead2]{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}header .back[data-v-d221ead2]{width:.2rem;height:.2rem;position:absolute;left:.12rem;top:.1rem}.container[data-v-d221ead2]{padding:.22rem .2rem .3rem;font-size:.14rem}.container h1[data-v-d221ead2]{font-size:.16rem;text-align:center}.container h2[data-v-d221ead2]{font-size:.16rem;font-weight:700;padding-top:.15rem}.container h3[data-v-d221ead2]{font-size:.14rem;font-weight:700}.container .signature[data-v-d221ead2]{display:-webkit-box;display:-ms-flexbox;display:flex;padding-top:.5rem}.container .signature .sign[data-v-d221ead2]{-webkit-box-flex:1;-ms-flex:1;flex:1;position:relative}.container .signature span[data-v-d221ead2]{display:block;padding-left:.2rem}.container .signature .cachet[data-v-d221ead2]{position:absolute;top:-.6rem;left:0;width:1.5rem;height:1.5rem}.iInfo[data-v-d221ead2]{display:-webkit-box;display:-ms-flexbox;display:flex}.iInfo span[data-v-d221ead2]{-webkit-box-flex:1;-ms-flex:1;flex:1}.btnback[data-v-d221ead2]{display:inline-block;font-size:.18rem;color:#fff;background:#f1111b;border-radius:.04rem;-webkit-box-shadow:0 2px 4px 0 rgba(0,0,0,.19);box-shadow:0 2px 4px 0 rgba(0,0,0,.19);padding:.08rem 0;margin-top:.8rem;width:100%;text-align:center}.line[data-v-d221ead2]{border-bottom:1px solid #000}

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/VIPApply.c3058adc.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.d00288f3.js


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.324e173d.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.324e173d.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.bb52c812.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/privacyChild.3f74aa63.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/privacyChild.3f74aa63.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/privacyChild.597fe910.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/privacyChild.597fe910.js.map


+ 1 - 1
public/index.html

@@ -11,7 +11,7 @@
 	<meta name="fragment" content="!">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>大雅APP</title>
+    <title>管乐迷</title>
     <!-- <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.4&key=c7856e7c812d299cff150e74d60ea608"></script> -->
     <style>html{color:#000;overflow-y:scroll;overflow-x:hidden;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size:100px;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}.link,.link:hover,.link:visited,a{color:#333}body,html{font-family:"PingFang SC","Heiti SC","SF UI Text","Helvetica Neue",Roboto,"Droid Sans Fallback",arial,sans-serif;font-weight:normal}body{font-size:.12rem;line-height:1.5}*{margin:0;padding:0;outline:0;-webkit-text-size-adjust:none;-webkit-tap-highlight-color:transparent}input,select,textarea{font-size:100%}table{border-collapse:collapse;border-spacing:0}img{border:0}del{text-decoration:line-through}.link:active,a{text-decoration:none}ol,ul{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-weight:500}h1{font-size:.36rem}h2{font-size:.28rem}h3{font-size:.24rem}h4{font-size:.2rem;line-height:.26rem}h5{font-size:.18rem;line-height:.24rem}h6{font-size:.16rem;line-height:.2rem}q:after,q:before{content:''}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}.link:active{color:#e61414}ins,u{text-decoration:underline;text-decoration-color:#eee}</style>
     <script>!function(e,t){var n=t.documentElement,d=e.devicePixelRatio||1;function i(){var e=n.clientWidth/3.75;n.style.fontSize=e+"px"}if(function e(){t.body?t.body.style.fontSize="16px":t.addEventListener("DOMContentLoaded",e)}(),i(),e.addEventListener("resize",i),e.addEventListener("pageshow",function(e){e.persisted&&i()}),2<=d){var o=t.createElement("body"),a=t.createElement("div");a.style.border=".5px solid transparent",o.appendChild(a),n.appendChild(o),1===a.offsetHeight&&n.classList.add("hairlines"),n.removeChild(o)}}(window,document)</script>

+ 13 - 6
src/views/teacher/VIPApply.vue

@@ -579,6 +579,12 @@ export default {
                     endTime: endTime,
                     id: Date.now()
                 })
+
+                // scheduleList.sort((a, b) => {
+                //     return a.weekStr
+                // }) 
+
+
                 this.courseForm.teachingStatus = false
 
                 this.setTimeTable()
@@ -597,6 +603,9 @@ export default {
 
             let form = this.form,
                 scheduleList = this.scheduleList
+
+
+            console.log(JSON.stringify(scheduleList))
             // if(!form.courseStart) {
             //     this.$toast('请选择排课开始时间')
             //     return
@@ -626,9 +635,6 @@ export default {
                 for(let i = 0; i < scheduleList.length; i++) {
                     if (online == 0 && offline == 0) break
                     let num = scheduleList[i].weekIndex - dateOperation.getDay()
-                    // if(num == 0) {
-                    //     num = 7
-                    // }
                     // 如果是同一天一个周期会出现排课都排到一天
                     if(forMark > 0 && num == 0 && i == 0) {
                         num = num + 7
@@ -667,11 +673,12 @@ export default {
                 // 加一周
                 if(scheduleList.length == 1) {
                     dateOperation.setDate(dateOperation.getDate() + 7)
-                }
-                // 标记循环次数(标记判断课程安排是不是同一天)
-                if(scheduleList.every( item => item.weekStr === scheduleList[0].weekStr)) {
+                } else if(scheduleList.every( item => item.weekStr === scheduleList[0].weekStr)) {
+                    // 标记循环次数(标记判断课程安排是不是同一天)
                     forMark++
                 }
+                
+                
                 // forMark++
             }
         },

+ 75 - 87
src/views/teacher/order.vue

@@ -6,30 +6,53 @@
             </van-dropdown-menu>
         </header>
         <h2>{{musicGroupName}}</h2>
-        <div class="table">
-            <div class="title">
-                <span></span>
-                <span>姓名</span>
-                <span>班级</span>
-                <span>声部</span>
-                <span>支付金额</span>
-                <span>到账时间</span>
-                <span>备注</span>
-            </div>
-            <div class="content">
-                <div v-for="(data, index) in dataList" :key="data.id">
-                <!-- <div> -->
-                    <span> {{ ++index }} </span>
-                    <span> {{ data.userName }} </span>
-                    <span> {{ data.currentClass }} </span>
-                    <span> {{ data.subjectName }} </span>
-                    <span> {{ data.paymentAmount }} </span>
-                    <span> {{ data.payTime }} </span>
-                    <span> {{ data.remark }} </span>
+        <van-tabs>
+            <van-tab title="缴费信息">
+                <div class="table">
+                    <div class="title">
+                        <span></span>
+                        <span>姓名</span>
+                        <span>声部</span>
+                        <span>支付金额</span>
+                        <span>到账时间</span>
+                    </div>
+                    <div class="content">
+                        <div v-for="(data, index) in dataList" :key="data.id">
+                        <!-- <div> -->
+                            <span> {{ ++index }} </span>
+                            <span> {{ data.userName }} </span>
+                            <span> {{ data.subjectName }} </span>
+                            <span> {{ data.paymentAmount }} </span>
+                            <span> {{ data.payTime }} </span>
+                        </div>
+                        <p style="padding: 8px 0 0 8px;">缴费总额:{{ amountCount }}元</p>
+                    </div>
                 </div>
-                
-            </div>
-        </div>
+            </van-tab>
+            <van-tab title="报名信息">
+                <div class="table">
+                    <div class="title">
+                        <span></span>
+                        <span>姓名</span>
+                        <span>班级</span>
+                        <span>声部</span>
+                        <span>备注</span>
+                    </div>
+                    <div class="content">
+                        <div v-for="(data, index) in studentList" :key="data.id">
+                        <!-- <div> -->
+                            <span> {{ ++index }} </span>
+                            <span> {{ data.userName }} </span>
+                            <span> {{ data.currentClass }} </span>
+                            <span> {{ data.subjectName }} </span>
+                            <span> {{ data.remark }} </span>
+                        </div>
+                        
+                    </div>
+                </div>
+            </van-tab>
+        </van-tabs>
+        
         
     </div>
 </template>
@@ -43,8 +66,8 @@ export default {
             musicGroupId: this.$route.query.musicGroupId,
             musicGroupName: this.$route.query.musicGroupName,
             dataList: {}, // 订单列表
+            amountCount: 0, // 总额
             studentList: {}, // 学生列表
-            couresList: [], // 课程列表
             voicyPart: 0,
             voicyPartList: [{
                 text: '全部声部',
@@ -55,24 +78,8 @@ export default {
         }
     },
     mounted() {
-        // 获取所有课程
-        // this.$axios.post('/user/getCourses ', qs.stringify({
-        //     clazzId: this.classId
-        // })).then(c => {
-        //     let result = c.data.data
-        //     result.forEach(r => {
-        //         this.couresList.push({
-        //             name: r.subName.split('.').reverse()[0],
-        //             subId: r.subId,
-        //             id: r.id
-        //         })
-
-        //         this.voicyPartList.push({
-        //             text: r.subName.split('.').reverse()[0],
-        //             value: r.subId
-        //         })
-        //     })
-        // })
+        window.localStorage.removeItem('userInfo') // 删除用户信息
+        window.localStorage.removeItem('Authorization') // 删除用户信息
 
         querySubByMusicGroupId({ musicGroupId: this.musicGroupId }).then(res => {
             let result = res.data
@@ -88,67 +95,48 @@ export default {
         
         // 获取订单信息
         this.getOrderList()
-        // 获取学生列表信息
-        // this.getStudents()
-
+        this.getOrderStudentList()
         
     },
     methods: {
-        getOrderList(voicyPart) {
+        getOrderList() {
             // 获取订单信息
-
             queryStudentApply({
                 musicGroupId: this.musicGroupId,
                 rows: 9999,
-                subjectId: voicyPart,
+                subjectId: this.voicyPart ? this.voicyPart : '',
+                paymentStatus:  2,
                 page: 1
             }).then(res => {
                 let result = res.data
+                this.amountCount = 0
                 if(result.code == 200) {
                     this.dataList = result.data.rows
+                    result.data.rows.forEach(item => {
+                        this.amountCount += item.paymentAmount
+                    })
+                }
+            })
+        },
+        getOrderStudentList() {
+            // 获取订单信息
+            queryStudentApply({
+                musicGroupId: this.musicGroupId,
+                rows: 9999,
+                subjectId: this.voicyPart ? this.voicyPart : '',
+                page: 1
+            }).then(res => {
+                let result = res.data
+                if(result.code == 200) {
+                    this.studentList = result.data.rows
                 }
             })
         },
-        // getStudents(item) {
-        //     if(!item) {
-        //         item = {}
-        //     }
-        //     this.$axios.post('/user/getMusicTeamStu', qs.stringify({
-        //         musicTeamId: this.classId, // 乐团Id
-        //         name: '', // 学生姓名
-        //         status: '', // 学生状态
-        //         subId: item.subId ? item.subId : '', // 声部编号
-        //         page: item.page ? item.page : 1, //默认1第一页
-        //         rows: item.rows ? item.rows : 9999 // 默认20条数据
-        //     })).then(r => {
-        //         this.studentList = r.data.data.rows
-        //     })
-        // },
-        // adjustSelect(item) {
-        //     this.$axios.post('/user/updateUserSub', qs.stringify({
-        //         courseId: item.id,
-        //         subId: item.subId,
-        //         userId: this.changeStudent.id
-        //     })).then(student => {
-        //         if(student.data.code == 200) {
-        //             this.$toast(student.data.msg)
-        //             this.changeStudent.subName = item.name
-        //             this.adjustStatus = false
-        //         }
-        //     })
-        // },
-        // adjust(item) {
-        //     // 开始调剂
-        //     if(item.pushStatus <= 1 && item.status == 0) {
-        //         this.adjustStatus = true
-        //         this.changeStudent = item
-        //     }
-        // },
-        onChange(value) {
+        onChange() {
             // 切换声部时
-            let subId = value ? value : ''
-            this.getOrderList(subId)
-            
+            // let subId = value ? value : ''
+            this.getOrderList(this.voicyPart)
+            this.getOrderStudentList(this.voicyPart)
         }
     }
 }

+ 1 - 1
vue.config.js

@@ -1,5 +1,5 @@
 // let targetUrl = 'http://47.99.212.176:8000'
-// let targetUrl = 'http://192.168.3.48:8000'
+// let targetUrl = 'http://192.168.3.28:8000'
 let targetUrl = 'http://testadm.dayaedu.com/'
 module.exports = {
     // 调整内部的 webpack 配置。

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