样式兼容修改

pc/src/api/Navs.js

@@ -20,7 +20,7 @@ let navs = [
         "icon": "el-icon-user",
     },
     {
-        "clmid": "33",
+        "clmid": "3",
         "clmcode": "tempUser",
         "clmname": "临时会员",
         "clmurl": "/tempUser",
@@ -30,7 +30,7 @@ let navs = [
         "icon": "el-icon-user-solid",
     }
     , {
-        "clmid": "3",
+        "clmid": "4",
         "clmcode": "region",
         "clmname": "在线上课",
         "clmurl": "/online",
@@ -41,7 +41,7 @@ let navs = [
     }
     ,
     {
-        "clmid": "13",
+        "clmid": "5",
         "clmcode": "lesson",
         "clmname": "课目管理",
         "clmurl": "/lesson",
@@ -50,7 +50,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-collection",
     }, {
-        "clmid": "4",
+        "clmid": "6",
         "clmcode": "lessonTable",
         "clmname": "课程表模板",
         "clmurl": "/lessonTable",
@@ -59,7 +59,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-tickets",
     }, {
-        "clmid": "5",
+        "clmid": "7",
         "clmcode": "lessonManage",
         "clmname": "课程表管理",
         "clmurl": "/lessonManage",
@@ -68,7 +68,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-date",
     }, {
-        "clmid": "6",
+        "clmid": "8",
         "clmcode": "coach",
         "clmname": "教练管理",
         "clmurl": "/coach",
@@ -77,7 +77,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-medal-1",
     }, {
-        "clmid": "7",
+        "clmid": "9",
         "clmcode": "appoint",
         "clmname": "预约管理",
         "clmurl": "/appoint",
@@ -86,7 +86,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-time",
     }, {
-        "clmid": "8",
+        "clmid": "10",
         "clmcode": "record",
         "clmname": "预约记录",
         "clmurl": "/record",
@@ -95,7 +95,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-document-copy",
     }, {
-        "clmid": "9",
+        "clmid": "11",
         "clmcode": "cost",
         "clmname": "消费记录",
         "clmurl": "/cost",
@@ -105,7 +105,7 @@ let navs = [
         "icon": "el-icon-bank-card",
     },
     {
-        "clmid": "21",
+        "clmid": "12",
         "clmcode": "courses",
         "clmname": "课程管理",
         "clmurl": "/courses",
@@ -125,7 +125,7 @@ let navs = [
     //     "icon": "el-icon-bell",
     // },
     {
-        "clmid": "11",
+        "clmid": "13",
         "clmcode": "heartEquip",
         "clmname": "心率设备",
         "clmurl": "/heartEquip",
@@ -134,7 +134,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-cpu",
     }, {
-        "clmid": "12",
+        "clmid": "14",
         "clmcode": "region",
         "clmname": "区域管理",
         "clmurl": "/region",
@@ -144,7 +144,7 @@ let navs = [
         "icon": "el-icon-map-location",
     },
     {
-        "clmid": "22",
+        "clmid": "15",
         "clmcode": "setting",
         "clmname": "系统设置",
         "clmurl": "/setting",
@@ -155,7 +155,7 @@ let navs = [
     },
 
     {
-        "clmid": "12",
+        "clmid": "16",
         "clmcode": "shop",
         "clmname": "店面管理",
         "clmurl": "/shopManage",
@@ -165,7 +165,7 @@ let navs = [
         "icon": "el-icon-s-shop",
     }
     , {
-        "clmid": "13",
+        "clmid": "17",
         "clmcode": "adminManage",
         "clmname": "管理员管理",
         "clmurl": "/adminManage",
@@ -175,7 +175,7 @@ let navs = [
         "icon": "el-icon-user",
     },
     {
-        "clmid": "11",
+        "clmid": "18",
         "clmcode": "log",
         "clmname": "跨店会员",
         "clmurl": "/AcrossVip",
@@ -184,7 +184,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-user-solid",
     }, {
-        "clmid": "14",
+        "clmid": "19",
         "clmcode": "log",
         "clmname": "操作日志",
         "clmurl": "/log",
@@ -193,7 +193,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-s-claim",
     }, {
-        "clmid": "15",
+        "clmid": "20",
         "clmcode": "demoDevice",
         "clmname": "演示设备",
         "clmurl": "/demoDevice",
@@ -202,7 +202,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-video-camera",
     }, {
-        "clmid": "22",
+        "clmid": "21",
         "clmcode": "setting",
         "clmname": "系统设置",
         "clmurl": "/adminSetting",
@@ -212,7 +212,7 @@ let navs = [
         "icon": "el-icon-setting",
     },
     {
-        "clmid": "1",
+        "clmid": "22",
         "clmcode": "index",
         "clmname": "系统首页",
         "clmurl": "/",
@@ -221,7 +221,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-house",
     }, {
-        "clmid": "2",
+        "clmid": "23",
         "clmcode": "member",
         "clmname": "会员管理",
         "clmurl": "/member",
@@ -231,7 +231,7 @@ let navs = [
         "icon": "el-icon-user",
     },
     {
-        "clmid": "33",
+        "clmid": "24",
         "clmcode": "tempUser",
         "clmname": "临时会员",
         "clmurl": "/tempUser",
@@ -241,7 +241,7 @@ let navs = [
         "icon": "el-icon-user-solid",
     },
     {
-        "clmid": "3",
+        "clmid": "25",
         "clmcode": "lesson",
         "clmname": "课目管理",
         "clmurl": "/lesson",
@@ -250,7 +250,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-collection",
     }, {
-        "clmid": "5",
+        "clmid": "26",
         "clmcode": "lessonManage",
         "clmname": "课程表管理",
         "clmurl": "/lessonManage",
@@ -259,7 +259,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-date",
     }, {
-        "clmid": "7",
+        "clmid": "27",
         "clmcode": "appoint",
         "clmname": "预约管理",
         "clmurl": "/appoint",
@@ -268,7 +268,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-time",
     }, {
-        "clmid": "8",
+        "clmid": "28",
         "clmcode": "record",
         "clmname": "预约记录",
         "clmurl": "/record",
@@ -277,7 +277,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-document-copy",
     }, {
-        "clmid": "9",
+        "clmid": "29",
         "clmcode": "cost",
         "clmname": "消费记录",
         "clmurl": "/cost",
@@ -288,7 +288,7 @@ let navs = [
     },
 
     {
-        "clmid": "21",
+        "clmid": "30",
         "clmcode": "courses",
         "clmname": "课程管理",
         "clmurl": "/courses",
@@ -298,7 +298,7 @@ let navs = [
         "icon": "el-icon-data-analysis",
     },
     {
-        "clmid": "16",
+        "clmid": "31",
         "clmcode": "heartEquip",
         "clmname": "心率设备",
         "clmurl": "/heartEquip",
@@ -308,7 +308,7 @@ let navs = [
         "icon": "el-icon-cpu",
     },
     {
-        "clmid": "22",
+        "clmid": "32",
         "clmcode": "setting",
         "clmname": "系统设置",
         "clmurl": "/adminSetting",
@@ -318,5 +318,4 @@ let navs = [
         "icon": "el-icon-setting",
     },
 ];
-
 export default navs;

pc/src/assets/css/panel.css

@@ -30,16 +30,22 @@
     padding: 5px;
 }
 
-.panel /deep/ h5 {
+.panel h5 {
+    width: 100%;
     margin: 0;
     text-align: left;
-    font-size: 18px;
+    font-size: 16px;
     font-weight: normal;
-    padding-bottom: 10px;
+    padding-top: 10px;
+    padding-bottom: 5px;
     border-bottom: 1px solid #F0F2F5;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
+    float: left;
+    text-indent: 20px;
+}
+.panel em {
+    font-style: normal;
 }
-
 .panel /deep/ .el-col em {
     float: left;
     text-align: left;

pc/src/components/Headside.vue

@@ -2,6 +2,7 @@
     <div id="headside">
         <nav class="navbar user-info-navbar" role="navigation">
             <i
+                v-if="isCollapse"
                 :class="[{ 'el-icon-s-unfold left_hide_icon': left_panel_state }, { 'el-icon-s-fold left_show_icon': !left_panel_state }]"
                 @click="left_hide"
             ></i>
@@ -40,8 +41,8 @@ let qs = require('qs');
 export default {
     data() {
         return {
+            isCollapse: document.body.clientWidth < 1366,
             user: {
-                // name: localStorage.userName,
                 name: 'admin',
             },
             time: '8:30-17:30',

pc/src/components/Navside.vue

@@ -10,24 +10,11 @@
         </div>
         <el-row :class="[{ 'shortnav': isCollapse }, { 'longNav': !isCollapse }]">
             <el-col :span="24">
-                <el-menu
-                    :default-active="userLevelDeafult"
-                    class="el-menu-vertical-demo"
-                    @open="handleOpen"
-                    @close="handleClose"
-                    @select="handleSelect"
-                    :collapse="isCollapse"
-                    background-color="#ffffff"
-                    text-color="#777777"
-                    active-text-color="#fff"
-                    router
-                >
-                    <el-menu-item
-                        :index="nav.clmid"
-                        :route="nav.clmurl"
-                        v-for="nav in navs"
-                        v-if="nav.show == userLevel"
-                    >
+                <el-menu :default-active="userLevelDeafult" class="el-menu-vertical-demo" @open="handleOpen"
+                    @close="handleClose" @select="handleSelect" :collapse="isCollapse" background-color="#ffffff"
+                    text-color="#777777" active-text-color="#fff" router>
+                    <el-menu-item :index="nav.clmid" :route="nav.clmurl" v-for="nav in navs"
+                        v-if="nav.show == userLevel">
                         <i :class="nav.icon"></i>
                         <span slot="title">{{ nav.clmname }}</span>
                     </el-menu-item>
@@ -37,391 +24,407 @@
     </div>
 </template>
 <script>
-import Navs from '../api/Navs';
-import {
-    ManagerSelfQuery,
-    ShopListQuery
-} from '../api/getApiRes.js'
-
-let qs = require('qs');
-export default {
-    data() {
-        return {
-            wildState: 0,
-            navs: [],
-            ShopName: '',
-            userLevelText: '',
-            NavsideClass: 'Navside',
-            userLevel: 0,
-            userLevelDeafult: "",
-        }
-    },
-    props: ['isCollapse'],
-    mounted() {
-        this.userLevelDeafult = this.$route.meta.clmid;
-        this.getTableQuery();
-        this.getManagerSelfQuery();
-        if (document.body.clientWidth < 1024) {
-            this.NavsideClass = 'NavsideShort'
-        } else {
-            this.NavsideClass = 'Navside'
-        }
-    },
-    methods: {
-        handleSelect(i, s, t) {
-            // this.$emit('TabsAdd', i);//触发事件
+    import Navs from '../api/Navs';
+    import {
+        ManagerSelfQuery,
+        ShopListQuery
+    } from '../api/getApiRes.js'
+
+    let qs = require('qs');
+    export default {
+        data() {
+            return {
+                wildState: 0,
+                navs: [],
+                ShopName: '',
+                userLevelText: '',
+                NavsideClass: 'Navside',
+                userLevel: 0,
+                userLevelDeafult: "",
+            }
         },
-        getTableQuery() {
-            // 菜单
-            this.navs = Navs;
+        props: ['isCollapse'],
+        mounted() {
+            this.userLevelDeafult = this.$route.meta.clmid;
+            this.getTableQuery();
+            this.getManagerSelfQuery();
+            if (document.body.clientWidth < 1024) {
+                this.NavsideClass = 'NavsideShort'
+            } else {
+                this.NavsideClass = 'Navside'
+            }
         },
-        getManagerSelfQuery() {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-            };
-            let postdata = qs.stringify(param);
-            ManagerSelfQuery(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    that.userLevelText = json.Rs.Role.Name;
-                    // 1 会员 2 系统 3 店铺 4 教练
-                    switch (parseInt(json.Rs.Role.Id)) {
-                        case 1:
-                            that.userLevel = 1;
-                            break;
-                        case 2:
-                            that.userLevel = 2;
-                            break;
-                        case 3:
-                            that.userLevel = 3;
-                            break;
-                        case 4:
-                            that.userLevel = 4;
-                            break;
+        methods: {
+            handleSelect(i, s, t) {
+                // this.$emit('TabsAdd', i);//触发事件
+            },
+            getTableQuery() {
+                // 菜单
+                this.navs = Navs;
+            },
+            getManagerSelfQuery() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ManagerSelfQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.userLevelText = json.Rs.Role.Name;
+                        // 1 会员 2 系统 3 店铺 4 教练
+                        switch (parseInt(json.Rs.Role.Id)) {
+                            case 1:
+                                that.userLevel = 1;
+                                break;
+                            case 2:
+                                that.userLevel = 2;
+                                break;
+                            case 3:
+                                that.userLevel = 3;
+                                break;
+                            case 4:
+                                that.userLevel = 4;
+                                break;
+                        }
+                        localStorage.shopId = json.Rs.ShopId;
+                        this.panelSelect(json.Rs.ShopId);
+                    } else {
+                        if (json.Code == 1010) {
+                            that.$message.error(json.Memo + ' 错误码：' + json.Code);
+                            that.$router.push({ path: '/login', query: { status: 1 } });
+                            return false
+                        } else {
+                            that.$message.error(json.Memo + ' 错误码：' + json.Code);
+                        }
                     }
-                    localStorage.shopId = json.Rs.ShopId;
-                    this.panelSelect(json.Rs.ShopId);
-                } else {
-                    if (json.Code == 1010) {
-                        that.$message.error(json.Memo + ' 错误码：' + json.Code);
-                        that.$router.push({ path: '/login', query: { status: 1 } });
-                        return false
+                })
+            },
+            // 获取所属店铺
+            panelSelect(ShopId) {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ShopListQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        json.Rs.map(function (item) {
+                            if (item.ShopID == ShopId) {
+                                that.ShopName = item.ShopName;
+                            }
+                        })
                     } else {
                         that.$message.error(json.Memo + ' 错误码：' + json.Code);
                     }
-                }
-            })
-        },
-        // 获取所属店铺
-        panelSelect(ShopId) {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-            };
-            let postdata = qs.stringify(param);
-            ShopListQuery(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    json.Rs.map(function(item) {
-                        if (item.ShopID == ShopId) {
-                            that.ShopName = item.ShopName;
-                        }
-                    })
-                } else {
-                    that.$message.error(json.Memo + ' 错误码：' + json.Code);
-                }
-            })
+                })
+            },
+            handleOpen(key, keyPath) {
+                // console.log(key, keyPath);
+            },
+            handleClose(key, keyPath) {
+                // console.log(key, keyPath);
+            },
         },
-        handleOpen(key, keyPath) {
-            // console.log(key, keyPath);
+        watch: {
+            $route(to, from) {
+                // this.userLevelDeafult = to.meta.clmid
+            },
         },
-        handleClose(key, keyPath) {
-            // console.log(key, keyPath);
-        },
-    },
-    watch: {
-        $route(to, from) {
-            this.userLevelDeafult = to.meta.clmid
-        },
-    },
-}
+    }
 </script>
 <style scoped>
-/*注释*/
-.Navside {
-    width: 100%;
-    height: 910px;
-    /*height: 100%;*/
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    overflow-y: scroll;
-    /*overflow-y: hidden;*/
-    background-color: #fff;
-    z-index: 4444;
-}
-
-.NavsideShort {
-    width: 100%;
-    height: 100%;
-    /*height: 710px;*/
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    /*overflow-y: scroll;*/
-    overflow-y: scroll;
-    background-color: #fff;
-    z-index: 4444;
-}
-
-.Navside::-webkit-scrollbar {
-    /*滚动条整体样式*/
-
-    width: 3px; /*高宽分别对应横竖滚动条的尺寸*/
-
-    height: 1px;
-}
-
-.Navside::-webkit-scrollbar-thumb {
-    /*滚动条里面小方块*/
-
-    border-radius: 3px;
-
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-
-    background: #f5f5f5;
-}
-
-.Navside::-webkit-scrollbar-track {
-    /*滚动条里面轨道*/
-
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-
-    border-radius: 3px;
-
-    background: #f5f5f5;
-}
-
-.NavsideShort::-webkit-scrollbar {
-    /*滚动条整体样式*/
-
-    width: 3px; /*高宽分别对应横竖滚动条的尺寸*/
-
-    height: 1px;
-}
-
-.NavsideShort::-webkit-scrollbar-thumb {
-    /*滚动条里面小方块*/
-
-    border-radius: 3px;
-
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-
-    background: #f5f5f5;
-}
-
-.NavsideShort::-webkit-scrollbar-track {
-    /*滚动条里面轨道*/
-
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-
-    border-radius: 3px;
-
-    background: #f5f5f5;
-}
-
-.logoContainer {
-    width: 256px;
-    height: 72px;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    background: #3799ff;
-}
-
-.logoContainer img {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-top: 1px;
-}
-
-.userContainer {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-bottom: 16px;
-    padding-top: 19px;
-    padding-bottom: 19px;
-    border-bottom: 1px solid #f0f2f5;
-    background: #fff;
-}
-
-.userContainer img {
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-bottom: 16px;
-}
-
-.userContainer span {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    color: #565656;
-    font-size: 16px;
-}
-
-.userContainer em {
-    width: 125px;
-    height: 26px;
-    line-height: 26px;
-    text-align: center;
-    color: #fff;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    background: #e75296;
-    border-radius: 250px;
-    font-style: normal;
-    margin-top: 8px;
-    font-size: 16px;
-}
-
-/deep/ .el-menu {
-    border: none;
-}
-
-/deep/ .el-menu-item {
-}
-
-/deep/ .el-menu-item span {
-    text-align: left;
-    float: left;
-    margin-left: 70px;
-}
-
-/deep/ .el-menu-item.is-active {
-    background-color: #3799ff !important;
-    color: #fff !important;
-}
-
-/deep/ .el-menu-item:hover {
-    background-color: #3799ff !important;
-    color: #fff !important;
-}
-
-/deep/ .el-menu-item:hover i {
-    color: #fff !important;
-}
-
-/deep/ .el-menu-item i {
-    position: inherit;
-    float: left;
-    line-height: 25px;
-    left: 0px;
-}
-
-/*ipad only*/
-@media (min-width: 1025px) and (max-width: 1366px) {
-    .userContainer {
-        width: 80%;
-    }
-
-    .el-menu-item span {
-        text-align: left;
-        float: left;
-        margin-left: 20px;
-        line-height: 40px;
+    /*注释*/
+    .Navside {
+        width: 100%;
+        height: 910px;
+        /*height: 100%;*/
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        overflow-y: scroll;
+        /*overflow-y: hidden;*/
+        background-color: #fff;
+        z-index: 4444;
     }
 
-    .userContainer em {
+    .NavsideShort {
         width: 100%;
+        height: 100%;
+        /*height: 710px;*/
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        font-size: 12px;
+        /*overflow-y: scroll;*/
+        overflow-y: scroll;
+        background-color: #fff;
+        z-index: 4444;
     }
 
-    .el-menu-item {
-        padding: 0 !important;
-        margin: 0;
+    .Navside::-webkit-scrollbar {
+        /*滚动条整体样式*/
+
+        width: 3px;
+        /*高宽分别对应横竖滚动条的尺寸*/
+
+        height: 1px;
     }
 
-    .el-menu-item i {
-        left: 20px;
-        padding: 0;
-        margin: 0;
-        float: left;
-        line-height: 40px;
+    .Navside::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+
+        border-radius: 3px;
+
+        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+        background: #f5f5f5;
     }
 
-    /deep/ .el-tooltip {
-        padding: 0 !important;
+    .Navside::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+
+        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+        border-radius: 3px;
+
+        background: #f5f5f5;
     }
 
-    .userContainer span {
-        font-size: 12px;
+    .NavsideShort::-webkit-scrollbar {
+        /*滚动条整体样式*/
+
+        width: 3px;
+        /*高宽分别对应横竖滚动条的尺寸*/
+
+        height: 1px;
+    }
+
+    .NavsideShort::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+
+        border-radius: 3px;
+
+        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+        background: #f5f5f5;
     }
 
-    .el-menu-item,
-    .el-submenu__title {
-        height: 40px;
+    .NavsideShort::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+
+        -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+        border-radius: 3px;
+
+        background: #f5f5f5;
     }
-}
-@media (min-width: 960px) and (max-width: 1024px) {
+
     .logoContainer {
-        height: 40px;
+        width: 256px;
+        height: 72px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        background: #3799ff;
     }
-    .el-container.is-vertical {
-        left: 60px;
+
+    .logoContainer img {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 1px;
     }
-    .el-menu-item span {
-        text-align: left;
-        float: left;
-        margin-left: 5px;
-        line-height: 20px;
-        font-size: 12px;
-        height: 30px;
-        line-height: 30px;
+
+    .userContainer {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-bottom: 16px;
+        padding-top: 19px;
+        padding-bottom: 19px;
+        border-bottom: 1px solid #f0f2f5;
+        background: #fff;
     }
-    .userContainer em {
+
+    .userContainer img {
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-bottom: 16px;
+    }
+
+    .userContainer span {
         width: 100%;
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        font-size: 12px;
+        color: #565656;
+        font-size: 16px;
     }
-    .el-menu-item {
-        padding: 0 !important;
-        margin: 0;
+
+    .userContainer em {
+        width: 125px;
+        height: 26px;
+        line-height: 26px;
+        text-align: center;
+        color: #fff;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        background: #e75296;
+        border-radius: 250px;
+        font-style: normal;
+        margin-top: 8px;
+        font-size: 16px;
     }
 
-    /deep/ .el-tooltip {
-        padding: 0 !important;
+    /deep/ .el-menu {
+        border: none;
     }
 
-    .userContainer span {
-        font-size: 12px;
+    /deep/ .el-menu-item {}
+
+    /deep/ .el-menu-item span {
+        text-align: left;
+        float: left;
+        margin-left: 70px;
     }
 
-    .el-menu-item,
-    .el-submenu__title {
-        height: 30px;
-        line-height: 30px;
+    /deep/ .el-menu-item.is-active {
+        background-color: #3799ff !important;
+        color: #fff !important;
     }
-    .userContainer img {
-        display: none;
+
+    /deep/ .el-menu-item:hover {
+        background-color: #3799ff !important;
+        color: #fff !important;
+    }
+
+    /deep/ .el-menu-item:hover i {
+        color: #fff !important;
     }
-    /deep/ .el-tooltip i {
+
+    /deep/ .el-menu-item i {
+        position: inherit;
         float: left;
-        left: 10px;
-        line-height: 30px;
+        line-height: 25px;
+        margin-top: 15px;
+        left: 60px;
+    }
+
+    /*ipad only*/
+    @media (min-width: 1025px) and (max-width: 1366px) {
+        .userContainer {
+            width: 80%;
+        }
+
+        .el-menu-item span {
+            text-align: left;
+            float: left;
+            margin-left: 20px;
+            line-height: 40px;
+        }
+
+        .userContainer em {
+            width: 100%;
+            overflow: hidden;
+            display: block;
+            margin: 0 auto;
+            font-size: 12px;
+        }
+
+        .el-menu-item {
+            padding: 0 !important;
+            margin: 0;
+        }
+
+        .el-menu-item i {
+            left: 20px;
+            padding: 0;
+            margin: 0;
+            float: left;
+            line-height: 40px;
+        }
+
+        /deep/ .el-tooltip {
+            padding: 0 !important;
+        }
+
+        .userContainer span {
+            font-size: 12px;
+        }
+
+        .el-menu-item,
+        .el-submenu__title {
+            height: 40px;
+        }
+    }
+
+    @media (min-width: 960px) and (max-width: 1024px) {
+        .logoContainer {
+            height: 40px;
+        }
+
+        .el-container.is-vertical {
+            left: 60px;
+        }
+
+        .el-menu-item span {
+            text-align: left;
+            float: left;
+            margin-left: 5px;
+            line-height: 20px;
+            font-size: 12px;
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .userContainer em {
+            width: 100%;
+            overflow: hidden;
+            display: block;
+            margin: 0 auto;
+            font-size: 12px;
+        }
+
+        .el-menu-item {
+            padding: 0 !important;
+            margin: 0;
+        }
+
+        /deep/ .el-tooltip {
+            padding: 0 !important;
+        }
+
+        .userContainer span {
+            font-size: 12px;
+        }
+
+        .el-menu-item,
+        .el-submenu__title {
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .userContainer img {
+            display: none;
+        }
+
+        /deep/ .el-tooltip i {
+            float: left;
+            left: 10px;
+            line-height: 30px;
+        }
+
+        /deep/ .el-menu-item i {
+            position: inherit;
+            float: left;
+            margin-top: 3px;
+            left: 10px;
+        }
     }
-}
-</style>
+</style>

pc/src/router/index.js

@@ -26,7 +26,7 @@ const routes = [
                 component: () => import('@/views/Main.vue'),
                 meta: {
                     title: "首页",
-                    clmid: "1",
+                    // clmid: "1",
                 }
             }, {
                 path: '/member',
@@ -34,7 +34,7 @@ const routes = [
                 component: () => import('@/views/Member.vue'),
                 meta: {
                     title: "会员管理",
-                    clmid: "2",
+                    // clmid: "2",
                 }
             },
             {
@@ -43,7 +43,7 @@ const routes = [
                 component: () => import('@/views/tempUser.vue'),
                 meta: {
                     title: "临时会员",
-                    clmid: "33",
+                    // clmid: "33",
                 }
             },{
                 path: '/lesson',
@@ -51,7 +51,7 @@ const routes = [
                 component: () => import('@/views/Lesson.vue'),
                 meta: {
                     title: "课程模板",
-                    clmid: "3",
+                    // clmid: "3",
                 }
             }, {
                 path: '/lessonTable',
@@ -59,7 +59,7 @@ const routes = [
                 component: () => import('@/views/LessonTable.vue'),
                 meta: {
                     title: "课程表模板",
-                    clmid: "4",
+                    // clmid: "4",
                 }
             }, {
                 path: '/editLessonTable',
@@ -67,7 +67,7 @@ const routes = [
                 component: () => import('@/views/EditLessonTable.vue'),
                 meta: {
                     title: "编辑课程表模板",
-                    clmid: "4",
+                    // clmid: "4",
                 }
             }, {
                 path: '/editLessonManage',
@@ -75,7 +75,7 @@ const routes = [
                 component: () => import('@/views/EditLessonManage.vue'),
                 meta: {
                     title: "编辑课程表",
-                    clmid: "5",
+                    // clmid: "5",
                 }
             }, {
                 path: '/adminManage',
@@ -83,7 +83,7 @@ const routes = [
                 component: () => import('@/views/AdminManage.vue'),
                 meta: {
                     title: "管理员管理",
-                    clmid: "13",
+                    // clmid: "13",
                 }
             }, {
                 path: '/log',
@@ -91,7 +91,7 @@ const routes = [
                 component: () => import('@/views/Log.vue'),
                 meta: {
                     title: "操作日志",
-                    clmid: "14",
+                    // clmid: "14",
                 }
             }, {
                 path: '/demoDevice',
@@ -99,7 +99,7 @@ const routes = [
                 component: () => import('@/views/demoDevice.vue'),
                 meta: {
                     title: "演示设备",
-                    clmid: "15",
+                    // clmid: "15",
                 }
             }, {
                 path: '/shopManage',
@@ -107,7 +107,7 @@ const routes = [
                 component: () => import('@/views/ShopManage.vue'),
                 meta: {
                     title: "店面管理",
-                    clmid: "12",
+                    // clmid: "12",
                 }
             }, {
                 path: '/adminSetting',
@@ -115,7 +115,7 @@ const routes = [
                 component: () => import('@/views/AdminSetting.vue'),
                 meta: {
                     title: "系统设置",
-                    clmid: "22",
+                    // clmid: "22",
                 }
             }, {
                 path: '/lessonManage',
@@ -123,7 +123,7 @@ const routes = [
                 component: () => import('@/views/lessonManage.vue'),
                 meta: {
                     title: "课程表管理",
-                    clmid: "5",
+                    // clmid: "5",
                 }
             }, {
                 path: '/coach',
@@ -131,7 +131,7 @@ const routes = [
                 component: () => import('@/views/coach.vue'),
                 meta: {
                     title: "教练管理",
-                    clmid: "6",
+                    // clmid: "6",
                 }
             }, {
                 path: '/appoint',
@@ -139,7 +139,7 @@ const routes = [
                 component: () => import('@/views/appoint.vue'),
                 meta: {
                     title: "预约管理",
-                    clmid: "7",
+                    // clmid: "7",
                 }
             }, {
                 path: '/record',
@@ -147,7 +147,7 @@ const routes = [
                 component: () => import('@/views/record.vue'),
                 meta: {
                     title: "预约记录",
-                    clmid: "8",
+                    // clmid: "8",
                 }
             }, {
                 path: '/cost',
@@ -155,7 +155,7 @@ const routes = [
                 component: () => import('@/views/cost.vue'),
                 meta: {
                     title: "消费记录",
-                    clmid: "9",
+                    // clmid: "9",
                 }
             }, {
                 path: '/setting',
@@ -163,7 +163,7 @@ const routes = [
                 component: () => import('@/views/setting.vue'),
                 meta: {
                     title: "系统设置",
-                    clmid: "22",
+                    // clmid: "22",
                 }
             }, {
                 path: '/finish',
@@ -171,7 +171,7 @@ const routes = [
                 component: () => import('@/views/finish.vue'),
                 meta: {
                     title: "下课管理",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/finishDetail',
@@ -179,7 +179,7 @@ const routes = [
                 component: () => import('@/views/finishDetail.vue'),
                 meta: {
                     title: "下课管理",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/courses',
@@ -187,7 +187,7 @@ const routes = [
                 component: () => import('@/views/courses.vue'),
                 meta: {
                     title: "课程管理",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             },{
                 path: '/coursesHistory',
@@ -195,7 +195,7 @@ const routes = [
                 component: () => import('@/views/coursesHistory.vue'),
                 meta: {
                     title: "课程管理 历史记录",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/classPrepare',
@@ -203,7 +203,7 @@ const routes = [
                 component: () => import('@/views/classPrepare.vue'),
                 meta: {
                     title: "准备上课",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/classInfoDetail',
@@ -211,7 +211,7 @@ const routes = [
                 component: () => import('@/views/classInfoDetail.vue'),
                 meta: {
                     title: "课程成绩",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/courseEdit',
@@ -219,7 +219,7 @@ const routes = [
                 component: () => import('@/views/courseEdit.vue'),
                 meta: {
                     title: "课程管理",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/heartEquip',
@@ -227,7 +227,7 @@ const routes = [
                 component: () => import('@/views/heartEquip.vue'),
                 meta: {
                     title: "心率设备",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/heartEquipPerson',
@@ -235,7 +235,7 @@ const routes = [
                 component: () => import('@/views/heartEquipPerson.vue'),
                 meta: {
                     title: "私有心率设备",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/heartLog',
@@ -243,7 +243,7 @@ const routes = [
                 component: () => import('@/views/heartLog.vue'),
                 meta: {
                     title: "设备记录",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/bindRecord',
@@ -251,7 +251,7 @@ const routes = [
                 component: () => import('@/views/bindRecord.vue'),
                 meta: {
                     title: "绑定记录",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/region',
@@ -259,7 +259,7 @@ const routes = [
                 component: () => import('@/views/region.vue'),
                 meta: {
                     title: "区域管理",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             },{
                 path: '/test',
@@ -267,7 +267,7 @@ const routes = [
                 component: () => import('@/views/Test.vue'),
                 meta: {
                     title: "test",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/regionEquip',
@@ -275,7 +275,7 @@ const routes = [
                 component: () => import('@/views/regionEquip.vue'),
                 meta: {
                     title: "区域设备",
-                    clmid: "10",
+                    // clmid: "10",
                 }
             }, {
                 path: '/relevancePhone',
@@ -283,7 +283,7 @@ const routes = [
                 component: () => import('@/views/relevancePhone.vue'),
                 meta: {
                     title: "关联手机",
-                    clmid: "2",
+                    // clmid: "2",
                 }
             },{
                 path: '/AcrossVip',
@@ -291,7 +291,7 @@ const routes = [
                 component: () => import('@/views/AcrossVip.vue'),
                 meta: {
                     title: "跨店会员",
-                    clmid: "11",
+                    // clmid: "11",
                 }
             },{
                 path: '/online',
@@ -299,7 +299,7 @@ const routes = [
                 component: () => import('@/views/online.vue'),
                 meta: {
                     title: "在线上课",
-                    clmid: "3",
+                    // clmid: "3",
                 }
             },{
                 path: '/versionControlMefisto',
@@ -307,7 +307,7 @@ const routes = [
                 component: () => import('@/views/versionControlMefisto.vue'),
                 meta: {
                     title: "app版本控制",
-                    clmid: "999",
+                    // clmid: "999",
                 }
             },{
                 path: '/versionControlVideo',
@@ -315,7 +315,7 @@ const routes = [
                 component: () => import('@/views/versionControlVideo.vue'),
                 meta: {
                     title: "视频app版本控制",
-                    clmid: "999",
+                    // clmid: "999",
                 }
             },
         ]

pc/src/views/AcrossVip.vue

@@ -564,7 +564,7 @@
 
     .context {
         border-radius: 12px;
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/AdminManage.vue

@@ -706,7 +706,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
 
   display: block;

pc/src/views/AdminSetting.vue

@@ -5,7 +5,7 @@
             <div class="pages">
                 <el-tabs v-model="activeName" type="card">
                     <el-tab-pane label="密码修改" name="second">
-                        <div class="form_container" >
+                        <div class="form_container">
                             <el-form ref="form" :model="form" label-width="110px" :rules="rules">
                                 <el-form-item label="请输入原密码" prop="old">
                                     <el-input v-model="form.old" type="password"></el-input>
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-    import {PassEdit} from "../api/getApiRes";
+    import { PassEdit } from "../api/getApiRes";
 
     let qs = require('qs');
     import Global from '../Global.js'
@@ -56,7 +56,7 @@
             };
             return {
                 activeName: 'second',
-                pageApppoint:true,
+                pageApppoint: true,
                 valImgSrc: '',
                 overtime: '',
                 appoint: '0',
@@ -68,23 +68,23 @@
                 },
                 rules: {
                     old: [
-                        {required: true, message: '请输入原密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'}
+                        { required: true, message: '请输入原密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' }
                     ],
                     newpwd: [
-                        {required: true, message: '请输入新密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'},
-                        {validator: pwdPass, trigger: 'blur'}
+                        { required: true, message: '请输入新密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' },
+                        { validator: pwdPass, trigger: 'blur' }
                     ],
                     again: [
-                        {required: true, message: '请输入确认密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'},
-                        {validator: pwdPass, trigger: 'blur'},
-                        {validator: samepass, trigger: 'blur'},
+                        { required: true, message: '请输入确认密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' },
+                        { validator: pwdPass, trigger: 'blur' },
+                        { validator: samepass, trigger: 'blur' },
                     ],
                     valid: [
-                        {required: true, message: '请输入图形验证码', trigger: 'blur'},
-                        {min: 3, max: 4, message: '长度在 4 个字符', trigger: 'blur'}
+                        { required: true, message: '请输入图形验证码', trigger: 'blur' },
+                        { min: 3, max: 4, message: '长度在 4 个字符', trigger: 'blur' }
                     ],
                 }
             }
@@ -97,7 +97,7 @@
         },
         methods: {
             // 微信可见与否
-            changeWechat(e,appoint) {
+            changeWechat(e, appoint) {
                 let that = this;
                 let param = {
                     token: localStorage.token,
@@ -109,7 +109,7 @@
                     if (json.Code == 0) {
                         that.$message({
                             showClose: true,
-                            message: '本店预约已关闭' ,
+                            message: '本店预约已关闭',
                             type: 'success'
                         });
                         // 重载列表
@@ -121,7 +121,7 @@
             },
             // 跳转tab页面
             goTab(url) {
-                this.$router.push({path: url});
+                this.$router.push({ path: url });
             },
             //            点击验证码切换
             changeValImg: function () {
@@ -204,6 +204,7 @@
 </script>
 <style scoped>
     @import "../assets/css/panel.css";
+
     ul {
         margin: 0;
         padding: 0;
@@ -330,9 +331,10 @@
         float: right;
         bottom: 35px;
     }
-    .context {   height: 770px;
-         overflow-y: scroll;
 
+    .context {
+        /* height: 770px; */
+        overflow-y: scroll;
         display: block;
         margin: 0 auto;
         background-color: #fff !important;
@@ -343,17 +345,20 @@
         padding: 20px;
         background: #F0F2F5;
     }
+
     .change button {
         float: left;
         margin-right: 10px;
     }
+
     .change button.el-button--primary {
         height: 38px;
-        color:#fff;
+        color: #fff;
         background: #409EFF;
         padding: 3px 5px;
         width: 120px;
     }
+
     .form_container {
         width: 100%;
         overflow: hidden;
@@ -362,6 +367,7 @@
         padding-left: 0;
         padding-right: 0;
     }
+
     .form_container .gary {
         width: 100%;
         height: 64px;
@@ -373,13 +379,16 @@
         background: #F0F2F5;
         border-radius: 2px;
     }
+
     .gary span {
         float: left;
         margin-right: 30px;
     }
+
     /deep/ .el-switch {
         float: left;
     }
+
     .gary em {
         position: relative;
         top: -10px;
@@ -392,20 +401,24 @@
         font-size: 14px;
         font-style: normal;
     }
+
     /deep/ .el-form {
         width: 600px;
         float: left;
     }
-    /deep/  .el-form-item__content {
+
+    /deep/ .el-form-item__content {
         width: 437px;
         float: left;
     }
+
     .panel /deep/ .el-input__inner {
         width: 437px;
         float: left;
     }
+
     /deep/ .el-button {
         float: left;
         margin-left: 120px;
     }
-</style>
+</style>

pc/src/views/EditLessonManage.vue

@@ -667,7 +667,7 @@ em {
 
 .context {
     overflow: hidden;
-    height: 770px;
+    /* height: 770px; */
 
     overflow-y: scroll;
     display: block;

pc/src/views/EditLessonTable.vue

@@ -643,7 +643,7 @@
     }
 
     .context {
-        height: 770px;
+        /* height: 770px; */
 
         overflow-y: scroll;
 

pc/src/views/EditLessonTable2.vue

@@ -25,73 +25,37 @@
         </el-tabs>
         <el-button class="seeTemp">预览模板</el-button>
         <div class="table">
-            <el-table
-                    :data="tableData"
-                    border
-                    is-horizontal-resize
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    element-loading-background="rgba(0, 0, 0, 0.8)"
-                    class=""
-                    @selection-change="handleSelectionChange"                                   @current-change="clickChange"
->
-            >
-                <el-table-column
-                        prop="timeScope"
-                        label="时间"
-                        width="260px"
-                        align="center"
+            <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+                element-loading-background="rgba(0, 0, 0, 0.8)" class="" @selection-change="handleSelectionChange"
+                @current-change="clickChange">
                 >
+                <el-table-column prop="timeScope" label="时间" width="260px" align="center">
                     <template slot-scope="scope">
-                        <el-time-picker
-                                is-range
-                                v-model="scope.row.timeScope"
-                                range-separator="至"
-                                start-placeholder="开始时间"
-                                end-placeholder="结束时间"
-                                placeholder="选择时间范围">
+                        <el-time-picker is-range v-model="scope.row.timeScope" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围">
                         </el-time-picker>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="name"
-                        label="课程"
-                        align="center"
-                >
+                <el-table-column prop="name" label="课程" align="center">
                     <template slot-scope="scope">
                         <el-select v-model="scope.row.vipType">
-                            <el-option
-                                    v-for="item in panel.options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
+                            <el-option v-for="item in panel.options" :key="item.value" :label="item.label"
+                                :value="item.value">
                             </el-option>
                         </el-select>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="Recovered"
-                        label="预约名额"
-                        align="center"
-                >
+                <el-table-column prop="Recovered" label="预约名额" align="center">
                     <template slot-scope="scope">
                         <el-input-number v-model="scope.row.Recovered" :min="1" :max="9999" label=""></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="Recovered"
-                        label="消耗课时"
-                        align="center"
-                >
+                <el-table-column prop="Recovered" label="消耗课时" align="center">
                     <template slot-scope="scope">
                         <el-input-number v-model="scope.row.Recovered" :min="1" :max="9999" label=""></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="Status"
-                        label="操作"
-                        width="100px"
-                        align="center"
-                >
+                <el-table-column prop="Status" label="操作" width="100px" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" class="red">删除</el-button>
                     </template>
@@ -104,8 +68,8 @@
         </div>
         <br>
         <div v-show="true">
-            <el-pagination :total="pageination.total" :page-size="pageination.pageItem"
-                           @current-change="pageChange"></el-pagination>
+            <el-pagination :total="pageination.total" :page-size="pageination.pageItem" @current-change="pageChange">
+            </el-pagination>
         </div>
 
 
@@ -163,9 +127,9 @@
                     multipleSelection: [],
                     detectedmac: '',
                     options: [
-                        {value: 99, label: '全部'},
-                        {value: 1, label: '进行中'},
-                        {value: 2, label: '已完成'},
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
                     ],
                     time1: globalBt(),
                 },
@@ -317,8 +281,9 @@
         font-style: normal;
     }
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        /* height: 770px; */
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;
@@ -438,4 +403,4 @@
         float: left;
         margin-right: 10px;
     }
-</style>
+</style>

pc/src/views/Index.vue

@@ -13,9 +13,9 @@
                         <router-view></router-view>
                     </keep-alive>
                 </el-main>
-                <el-footer v-if="true">
+                <!-- <el-footer v-if="true">
                     <p class="footer">济南佰意兴网络科技有限公司提供技术支持</p>
-                </el-footer>
+                </el-footer>-->
             </el-container>
         </el-container>
     </div>
@@ -72,7 +72,7 @@ export default {
 }
 
 .lognElaside {
-    width: 256px !important;
+    width: 256px!important;
     overflow: hidden;
     height: 100%;
     float: left;
@@ -140,7 +140,7 @@ export default {
     }
 
     .lognElaside {
-        width: 170px !important;
+        width: 170px;
     }
 
     .logoContainer img {
@@ -153,7 +153,7 @@ export default {
         bottom: 20px;
         padding: 3px;
         padding-bottom: 60px;
-        overflow-y: scroll;
+        /*overflow-y: scroll;*/
     }
 
     .el-main > .context {
@@ -210,7 +210,6 @@ export default {
         height: 40px !important;
     }
     .shortElaside {
-        /*width: 140px !important;*/
         width: 60px !important;
         overflow: hidden;
         height: 100%;
@@ -219,6 +218,11 @@ export default {
 
     .el-container.is-vertical {
         left: 60px;
+        display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
+        display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
+        display: -ms-flexbox; /* TWEENER - IE 10 */
+        display: -webkit-flex; /* NEW - Chrome */
+        display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */
     }
 
     .el-transfer__buttons {
@@ -233,18 +237,18 @@ export default {
         float: right;
     }
 
-    .context {
+     /*.context {
         border-radius: 12px;
         height: 823px !important;
         overflow-y: scroll;
-    }
+    }*/
 
     .el-dialog {
         padding: 5px;
         padding-bottom: 15px;
     }
 
-    .lognElaside {
+    .el-aside.lognElaside {
         width: 100px !important;
     }
 
@@ -253,13 +257,18 @@ export default {
     }
 
     .el-main {
-        position: absolute;
+         /*position: absolute;
         top: 40px;
         bottom: 20px;
         width: 960px;
         padding: 3px;
         padding-bottom: 60px;
-        overflow-y: scroll;
+          height: 780px;
+      */
+      height:760px;
+      overflow-y: visible;
+      padding-bottom: 60px;
+      margin-bottom: 30px;
     }
 
     .el-main > .context {

pc/src/views/Lesson.vue

@@ -783,7 +783,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/LessonTable.vue

@@ -548,7 +548,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
 
         overflow-y: scroll;
 

pc/src/views/Log.vue

@@ -374,7 +374,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
 
   display: block;

pc/src/views/Main.vue

@@ -511,7 +511,7 @@ em {
 
 .container {
     width: 100%;
-    height: 760px;
+   /* height: 760px;*/
     overflow: hidden;
     overflow-y: scroll;
     display: block;
@@ -1098,6 +1098,8 @@ i {
 
     .lt .top {
         width: 96%;
+        float: left;
+        margin-bottom: 1px;
     }
 
     .lt .top li {
@@ -1118,6 +1120,9 @@ i {
         float: left;
         line-height: 22px;
     }
+    .finish {
+        float: left;
+    }
 
     .finish ul li {
         width: 30%;
@@ -1192,6 +1197,9 @@ i {
         padding: 2px !important;
         font-size: 12px;
     }
+    .appoint {
+        float: left;
+    }
 
     .asTitle {
         float: left;
@@ -1209,5 +1217,9 @@ i {
         font-size: 12px;
         height: 20px;
     }
+    .appoint  .appointCard {
+        padding-top: 4px;
+        padding-bottom: 4px;
+    }
 }
 </style>

pc/src/views/Member.vue

@@ -1372,7 +1372,7 @@
 
     .context {
         border-radius: 12px;
-        height: 770px;
+      /*  height: 770px;*/
         overflow-y: scroll;
         display: block;
         margin: 0 auto;
@@ -1538,4 +1538,5 @@
     .relevance {
         margin-top: 10px;
     }
+    
 </style>

pc/src/views/ShopManage.vue

@@ -503,7 +503,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/appoint.vue

@@ -1392,7 +1392,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
 
         overflow-y: scroll;
         display: block;

pc/src/views/classInfoDetail.vue

@@ -263,7 +263,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
   display: block;
   margin: 0 auto;

pc/src/views/coach.vue

@@ -11,7 +11,7 @@
                         </el-col>
                         <el-col :span="4">
                             <em>手机号:</em>
-                            <el-input v-model="panel.phone" placeholder="请输入手机号" type="number" ></el-input>
+                            <el-input v-model="panel.phone" placeholder="请输入手机号" type="number"></el-input>
                         </el-col>
                         <el-col :span="4">
                             <el-button size="" type="primary" @click="query" plain>查询</el-button>
@@ -25,56 +25,30 @@
             <el-button @click="delList">删除教练</el-button>
         </div>
         <div class="table">
-            <el-table
-                    :data="tableData"
-                    border
-                    is-horizontal-resize
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    element-loading-background="rgba(0, 0, 0, 0.8)"
-                    class=""
-                    @selection-change="handleSelectionChange"
-                    @current-change="clickChange"
->
-            >
+            <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+                element-loading-background="rgba(0, 0, 0, 0.8)" class="" @selection-change="handleSelectionChange"
+                @current-change="clickChange">
+                >
                 <el-table-column label="选择" width="55">
-    <template slot-scope="scope">
-        <el-radio  v-model="tableRadio" :label="scope.row"><i></i></el-radio>
-    </template>
-</el-table-column>
-                <el-table-column
-                        type="index"
-                        label="序号"
-                        align="center"
-
-                        width="50">
+                    <template slot-scope="scope">
+                        <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+                    </template>
                 </el-table-column>
-                <el-table-column
-                        prop="Name"
-                        label="教练"
-                >
+                <el-table-column type="index" label="序号" align="center" width="50">
                 </el-table-column>
-                <el-table-column
-                        prop="Phone"
-                        label="手机号"
-                        sortable
-                >
+                <el-table-column prop="Name" label="教练">
                 </el-table-column>
-                <el-table-column
-                        prop="TeacherId"
-                        label="操作"
-                >
+                <el-table-column prop="Phone" label="手机号" sortable>
+                </el-table-column>
+                <el-table-column prop="TeacherId" label="操作">
                     <template slot-scope="scope">
                         <el-button type="text" @click="editMember(scope.row)">编辑</el-button>
                     </template>
                 </el-table-column>
             </el-table>
             <br>
-            <el-pagination
-                    background
-                    :total="pageination.total"
-                    :page-size="pageination.pageItem"
-                    @current-change="pageChange"
-            ></el-pagination>
+            <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+                @current-change="pageChange"></el-pagination>
         </div>
 
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
@@ -144,15 +118,15 @@
                     multipleSelection: [],
                     detectedmac: '',
                     options: [
-                        {value: 99, label: '全部'},
-                        {value: 1, label: '进行中'},
-                        {value: 2, label: '已完成'},
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
                     ],
                     endTypeOptions: [
-                        {value: 99, label: '全部'},
-                        {value: 30, label: '近一个月'},
-                        {value: 7, label: '近一周'},
-                        {value: 1, label: '当日'},
+                        { value: 99, label: '全部' },
+                        { value: 30, label: '近一个月' },
+                        { value: 7, label: '近一周' },
+                        { value: 1, label: '当日' },
                     ],
                     time1: globalBt(),
                 },
@@ -179,8 +153,8 @@
                     dialogValue: [],//穿梭已选
                 },
                 memberTypes: [
-                    {value: 1, label: '年教练'},
-                    {value: 2, label: '充值教练'},
+                    { value: 1, label: '年教练' },
+                    { value: 2, label: '充值教练' },
                 ],
                 tableData: []
             }
@@ -552,8 +526,9 @@
 <style scoped>
     @import "../assets/css/panel.css";
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        /* height: 770px; */
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;
@@ -633,4 +608,4 @@
         width: 70%;
         float: right;
     }
-</style>
+</style>

pc/src/views/cost.vue

@@ -1145,7 +1145,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
 
         overflow-y: scroll;
         display: block;

pc/src/views/courseEdit.vue

@@ -1617,7 +1617,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
   display: block;
   margin: 0 auto;

pc/src/views/courses.vue

@@ -728,7 +728,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/coursesHistory.vue

@@ -630,7 +630,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/demoDevice.vue

@@ -660,7 +660,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-    height: 770px;
+    /* height: 770px; */
     overflow-y: scroll;
 
     display: block;

pc/src/views/finish.vue

@@ -276,7 +276,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
 
         overflow-y: scroll;
         display: block;

pc/src/views/finishDetail.vue

@@ -682,7 +682,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
         display: block;
         margin: 0 auto;

pc/src/views/heartEquip.vue

@@ -864,7 +864,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-    height: 770px;
+    /* height: 770px; */
     overflow-y: scroll;
 
     display: block;

pc/src/views/heartEquipPerson.vue

@@ -874,7 +874,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/heartLog.vue

@@ -574,7 +574,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/lessonManage.vue

@@ -638,7 +638,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
   display: block;
   margin: 0 auto;

pc/src/views/record.vue

@@ -408,7 +408,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/region.vue

@@ -684,7 +684,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/region2.vue

@@ -125,7 +125,7 @@ ul {
   list-style: none;
 }
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
   display: block;
   margin: 0 auto;

pc/src/views/regionEquip.vue

@@ -282,7 +282,7 @@ export default {
 @import "../assets/css/panel.css";
 
 .context {
-  height: 770px;
+  /* height: 770px; */
   overflow-y: scroll;
 
   display: block;

pc/src/views/relevancePhone.vue

@@ -561,7 +561,7 @@
     @import "../assets/css/panel.css";
 
     .context {
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
 
         display: block;

pc/src/views/setting.vue

@@ -7,21 +7,16 @@
                     <el-tab-pane label="关闭本店预约" name="first">
                         <div class="form_container">
                             <div class="gary">
-                       <span>
-                           是否关闭本店预约
-                       </span>
-                            <el-switch
-                                    v-model="appoint"
-                                    :active-value="0"
-                                    :inactive-value="1"
-                                    active-color="#409EFF"
-                                    inactive-color="#D9D9D9"
-                                    @change=changeWechat($event,appoint)
-                            >
-                            </el-switch>
-                            <em>
-                                温馨提示：默认关闭，开启后将会关闭本店的所有课程预约，请谨慎操作！
-                            </em>
+                                <span>
+                                    是否关闭本店预约
+                                </span>
+                                <el-switch v-model="appoint" :active-value="0" :inactive-value="1"
+                                    active-color="#409EFF" inactive-color="#D9D9D9"
+                                    @change=changeWechat($event,appoint)>
+                                </el-switch>
+                                <em>
+                                    温馨提示：默认关闭，开启后将会关闭本店的所有课程预约，请谨慎操作！
+                                </em>
                             </div>
                         </div>
                     </el-tab-pane>
@@ -88,23 +83,23 @@
                 },
                 rules: {
                     old: [
-                        {required: true, message: '请输入原密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'}
+                        { required: true, message: '请输入原密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' }
                     ],
                     newpwd: [
-                        {required: true, message: '请输入新密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'},
-                        {validator: pwdPass, trigger: 'blur'}
+                        { required: true, message: '请输入新密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' },
+                        { validator: pwdPass, trigger: 'blur' }
                     ],
                     again: [
-                        {required: true, message: '请输入确认密码', trigger: 'blur'},
-                        {min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur'},
-                        {validator: pwdPass, trigger: 'blur'},
-                        {validator: samepass, trigger: 'blur'},
+                        { required: true, message: '请输入确认密码', trigger: 'blur' },
+                        { min: 6, max: 32, message: '长度在 6 到 32 个字符', trigger: 'blur' },
+                        { validator: pwdPass, trigger: 'blur' },
+                        { validator: samepass, trigger: 'blur' },
                     ],
                     valid: [
-                        {required: true, message: '请输入图形验证码', trigger: 'blur'},
-                        {min: 3, max: 4, message: '长度在 4 个字符', trigger: 'blur'}
+                        { required: true, message: '请输入图形验证码', trigger: 'blur' },
+                        { min: 3, max: 4, message: '长度在 4 个字符', trigger: 'blur' }
                     ],
                 }
             }
@@ -135,8 +130,8 @@
             // 微信可见与否
             changeWechat(e, appoint) {
                 let that = this;
-                let statusText = appoint == 0 ? "关闭":"开启";
-                this.$confirm('是否'+statusText+'本店的所有课程预约?', '禁用操作', {
+                let statusText = appoint == 0 ? "关闭" : "开启";
+                this.$confirm('是否' + statusText + '本店的所有课程预约?', '禁用操作', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -152,7 +147,7 @@
                         if (json.Code == 0) {
                             that.$message({
                                 showClose: true,
-                                message: '本店预约已'+statusText+'！',
+                                message: '本店预约已' + statusText + '！',
                                 type: 'success'
                             });
                             // table 重载
@@ -171,7 +166,7 @@
             },
             // 跳转tab页面
             goTab(url) {
-                this.$router.push({path: url});
+                this.$router.push({ path: url });
             },
             //            点击验证码切换
             changeValImg: function () {
@@ -382,8 +377,9 @@
         bottom: 35px;
     }
 
-    .context {   height: 770px;
-         overflow-y: scroll;
+    .context {
+        /* height: 770px; */
+        overflow-y: scroll;
 
         display: block;
         margin: 0 auto;
@@ -466,8 +462,9 @@
         width: 437px;
         float: left;
     }
+
     /deep/ .el-button {
         float: left;
         margin-left: 120px;
     }
-</style>
+</style>

pc/src/views/tempUser.vue

@@ -750,7 +750,7 @@
 
     .context {
         border-radius: 12px;
-        height: 770px;
+        /* height: 770px; */
         overflow-y: scroll;
         display: block;
         margin: 0 auto;