Merge branch '03/18VipActive' into test

src/App.vue

@@ -11,6 +11,18 @@
   </div>
 </template>
 
+
+<script>
+export default {
+    name: 'app',
+    mounted() {
+      if(document.querySelector('#m_loading')) {
+        document.querySelector('#m_loading').remove()
+      }
+    }
+}
+</script>
+
 <style lang="less">
 @import url("./assets/commonLess/common");
 #app {

src/views/teacher/order.vue

@@ -23,7 +23,7 @@
         </van-nav-bar>
         <h2 style="margin-top: 46px;">{{musicGroupName}}</h2>
         <van-tabs color="#01C1B5">
-            <van-tab title="缴费信息">
+            <van-tab title="缴费信息" name="1">
                 <div class="table">
                     <div class="title">
                         <span></span>
@@ -45,7 +45,7 @@
                     </div>
                 </div>
             </van-tab>
-            <van-tab title="报名信息">
+            <van-tab title="报名信息" name="2">
                 <div class="table">
                     <div class="title">
                         <span></span>
@@ -79,7 +79,7 @@
                     @cancel="adjustStatus = false"
                     @select="adjustSelect" />
             </van-tab>
-            <van-tab title="数据统计">
+            <van-tab title="数据统计" name="3">
                 <van-cell class="countInfo" title="报名总人数" :value="config.regNum + '人'"></van-cell>
                 <van-cell class="countInfo" title="缴费总人数" :value="config.payNum + '人'"></van-cell>
                 <van-cell class="countInfo" title="家长会当日缴费人数" :value="config.firstDayPayNum + '人'"></van-cell>
@@ -191,9 +191,9 @@ export default {
         })
         setLoading(false)
         // 获取订单信息
-        this.getOrderList()
-        this.getOrderStudentList()
-        this.getRegisterOrPreList()
+        await this.getOrderList()
+        await this.getOrderStudentList()
+        await this.getRegisterOrPreList()
     },
     methods: {
         onClickLeft() {
@@ -222,9 +222,10 @@ export default {
                 }
             })
         },
-        getOrderList() {
+        async getOrderList() {
+            setLoading(true)
             // 获取订单信息
-            queryStudentApply({
+            await queryStudentApply({
                 musicGroupId: this.musicGroupId,
                 rows: 9999,
                 subjectId: this.voicyPart ? this.voicyPart : '',
@@ -239,11 +240,15 @@ export default {
                         this.amountCount += item.paymentAmount
                     })
                 }
+            }).catch(() => {
+                setLoading(false)
             })
+            setLoading(false)
         },
-        getOrderStudentList() {
+        async getOrderStudentList() {
+            setLoading(true)
             // 获取订单信息
-            queryStudentApply({
+            await queryStudentApply({
                 musicGroupId: this.musicGroupId,
                 rows: 9999,
                 subjectId: this.voicyPart ? this.voicyPart : '',
@@ -253,7 +258,10 @@ export default {
                 if(result.code == 200) {
                     this.studentList = result.data.rows
                 }
+            }).catch(() => {
+                setLoading(false)
             })
+            setLoading(false)
         },
         async getRegisterOrPreList() {
             setLoading(true)
@@ -281,6 +289,8 @@ export default {
                     }
                     this.countList = tempDate.rows
                 }
+            }).catch(() => {
+                setLoading(false)
             })
             setLoading(false)
         },