Merge branch 'master' into iterationApp

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/main.js

@@ -9,7 +9,7 @@ import { Button, Icon, Tag, Swipe, SwipeItem, Popup, Picker,
     Collapse, CollapseItem, Tab, Tabs, Row, Col, Cell, CellGroup,
     Circle, Field, DatetimePicker, Image, Loading,
     ActionSheet, RadioGroup, Radio, Checkbox, CheckboxGroup,
-    CountDown, Panel, Dialog, Sticky, Rate, Switch, ImagePreview, NoticeBar} from 'vant'
+    CountDown, Panel, Dialog, Sticky, Rate, Switch, ImagePreview, NoticeBar, NavBar} from 'vant'
 Vue.use(Button).use(Icon).use(Tag).use(Swipe).use(SwipeItem)
    .use(Popup).use(Picker).use(DropdownMenu).use(DropdownItem).use(Search)
    .use(PullRefresh).use(Toast).use(List).use(Collapse).use(CollapseItem)
@@ -17,10 +17,7 @@ Vue.use(Button).use(Icon).use(Tag).use(Swipe).use(SwipeItem)
    .use(Circle).use(Field).use(DatetimePicker).use(Image).use(Loading)
    .use(ActionSheet).use(RadioGroup).use(Radio).use(Checkbox).use(CheckboxGroup)
    .use(CountDown).use(Panel).use(Dialog).use(Sticky).use(Rate).use(Switch).use(ImagePreview).use(NoticeBar)
-Vue.config.productionTip = false
-
-// import Vconsole from 'vconsole'
-// const vconsole = new Vconsole()
+   .use(NavBar)
 
 import VueAMap from 'vue-amap'
 Vue.use(VueAMap)

src/views/teacher/order.vue

@@ -1,13 +1,29 @@
 <template>
     <div class="order">
-        <header>缴费详情
+        <!-- <header>
+            <van-icon name="arrow-left" />
+            缴费详情
             <van-dropdown-menu>
                 <van-dropdown-item @change="onChange" v-model="voicyPart" :options="voicyPartList" />
             </van-dropdown-menu>
-        </header>
-        <h2>{{musicGroupName}}</h2>
-        <van-tabs color="#01C1B5">
-            <van-tab title="缴费信息">
+        </header> -->
+        <van-nav-bar
+            title="缴费详情"
+            right-text="按钮"
+            fixed
+            :left-arrow="plat == 'manager' ? true : false"
+            z-index="999"
+            @click-left="onClickLeft"
+        >
+            <template #right>
+                <van-dropdown-menu z-index="999">
+                    <van-dropdown-item @change="onChange" v-model="voicyPart" :options="voicyPartList" />
+                </van-dropdown-menu>
+            </template>
+        </van-nav-bar>
+        <h2 style="margin-top: 46px;">{{musicGroupName}}</h2>
+        <van-tabs color="#01C1B5" @change="onTabChange">
+            <van-tab title="缴费信息" name="1">
                 <div class="table">
                     <div class="title">
                         <span></span>
@@ -29,7 +45,7 @@
                     </div>
                 </div>
             </van-tab>
-            <van-tab title="报名信息">
+            <van-tab title="报名信息" name="2">
                 <div class="table">
                     <div class="title">
                         <span></span>
@@ -63,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>
@@ -126,9 +142,11 @@ import cleanDeep from 'clean-deep'
 export default {
     name: 'order',
     data() {
+        let query = this.$route.query
         return {
-            musicGroupId: this.$route.query.musicGroupId,
-            musicGroupName: this.$route.query.musicGroupName,
+            musicGroupId: query.musicGroupId,
+            musicGroupName: query.musicGroupName,
+            plat: query.plat,
             dataList: {}, // 订单列表
             amountCount: 0, // 总额
             studentList: {}, // 学生列表
@@ -173,11 +191,14 @@ export default {
         })
         setLoading(false)
         // 获取订单信息
-        this.getOrderList()
-        this.getOrderStudentList()
-        this.getRegisterOrPreList()
+        await this.getOrderList()
+        // await this.getOrderStudentList()
+        // await this.getRegisterOrPreList()
     },
     methods: {
+        onClickLeft() {
+            window.history.go(-1)
+        },
         adjust(item) {
             // 开始调剂
             if(item.paymentStatus != 2) {
@@ -201,9 +222,10 @@ export default {
                 }
             })
         },
-        getOrderList() {
+        async getOrderList() {
+            setLoading(true)
             // 获取订单信息
-            queryStudentApply({
+            await queryStudentApply({
                 musicGroupId: this.musicGroupId,
                 rows: 9999,
                 subjectId: this.voicyPart ? this.voicyPart : '',
@@ -218,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 : '',
@@ -232,7 +258,10 @@ export default {
                 if(result.code == 200) {
                     this.studentList = result.data.rows
                 }
+            }).catch(() => {
+                setLoading(false)
             })
+            setLoading(false)
         },
         async getRegisterOrPreList() {
             setLoading(true)
@@ -260,6 +289,8 @@ export default {
                     }
                     this.countList = tempDate.rows
                 }
+            }).catch(() => {
+                setLoading(false)
             })
             setLoading(false)
         },
@@ -270,6 +301,25 @@ export default {
             this.getOrderStudentList(this.voicyPart)
             this.getRegisterOrPreList(this.voicyPart)
         },
+        onTabChange(name) {
+            console.log(name)
+            if(name == 1) {
+                this.dataList = []
+                this.getOrderList()
+            } else if(name == 2) {
+                this.studentList = []
+                this.getOrderStudentList()
+            } else if(name == 3) {
+                this.config = {
+                    regNum: 0,
+                    firstDayPayNum: 0,
+                    payScale: 0,
+                    payNum: 0
+                }
+                this.countList = []
+                this.getRegisterOrPreList()
+            }
+        },
         onTip() {
             this.$dialog.alert({
                 message: '家长会当日缴费人数 / 缴费总人数',
@@ -312,18 +362,18 @@ export default {
 header {
     height: .40rem;
     line-height: .40rem;
-    color: #000;
+    color: #fff;
     font-size: .17rem;
-    background: #fff;
+    background: #14928a;
     box-shadow: 0px 1px 8px 0px rgba(0,0,0,0.07);
     text-align: center;
 }
 h2 {
     font-size: .16rem;
-    color: #fff;
+    color: #000;
     padding: .1rem 0;
     text-align: center;
-    background: #14928a;
+    background: #fff;
 }
 
 
@@ -357,14 +407,32 @@ h2 {
     }
 }
 /deep/.van-dropdown-menu {
-    height: .4rem;
-    position: absolute;
-    right: .15rem;
-    top: 0;
+    height: 46px;
+    // position: absolute;
+    // right: .15rem;
+    background: #14928a;
+    // top: 0;
     .van-dropdown-menu__bar {
         height: .4rem;
         box-shadow: none;
     }
+    .van-dropdown-menu__title {
+        color: #fff;
+    }
+    &::after {
+        border: 0;
+    }
+}
+
+/deep/.van-nav-bar {
+    background: #14928a;
+    .van-icon {
+        font-size: .18rem;
+        color: #fff;
+    }
+    .van-nav-bar__title {
+        color: #fff;
+    }
 }
 
 /deep/.van-col {