Merge branch 'iterationApp' into test

src/views/teacher/order.vue

@@ -22,7 +22,7 @@
                 </van-dropdown-menu>
             </template>
         </van-nav-bar>
-        <h2 :style="{ marginTop: (46 + headTop) + 'px' }">{{musicGroupName}}</h2>
+        <h2 :style="{ marginTop: (46 + Number(headTop)) + 'px' }">{{musicGroupName}}</h2>
         <van-tabs color="#01C1B5" @change="onTabChange">
             <van-tab title="缴费信息" name="1">
                 <div class="table">
@@ -358,7 +358,7 @@ export default {
 <style lang="less" scoped>
 .order {
     background: #fff;
-    // min-height: 100vh;
+    min-height: 100vh;
 }
 header {
     height: .40rem;