Merge branch 'dev_xll' into 'master'

Dev xll

See merge request !14

src/config/menu.js

@@ -62,14 +62,14 @@ export const menuList = [
                 children: [
                     { name: '视频审核', icon: 'icon-video', color: 'index-blue', url: '/checkVideo' },
                     { name: '展板审核', icon: 'icon-screen', color: 'index-green', url: '/checkDisplay' },
-                    { name: '平台学习内容审核', icon: 'icon-magnifier', color: 'index-pink', url: '/checkLearn' },
+                    { name: '学习内容审核', icon: 'icon-magnifier', color: 'index-pink', url: '/checkLearn' },
                     { name: '账号禁用审核', icon: 'icon-disable', color: 'index-red', url: '/checkLearn' }
                 ]
             }
         ]
     },
     {
-        title: '单位用户管理',
+        name: '单位用户管理',
         icon: 'icon-headUser',
         avatar: 'user_head_picture.png',
         color: '',
@@ -82,7 +82,7 @@ export const menuList = [
                 color: '',
                 url: '',
                 children: [
-                    { label: '互动管理', icon: 'icon-interaction', color: 'index-purple', url: '/interactive' }
+                    { name: '互动管理', icon: 'icon-interaction', color: 'index-purple', url: '/interactive' }
                 ]
             },
             {
@@ -92,7 +92,7 @@ export const menuList = [
                 color: '',
                 url: '',
                 children: [
-                    { label: '账号管理', icon: 'icon-account', color: 'index-blue', url: '/unitAdmin' }
+                    { name: '账号管理', icon: 'icon-account', color: 'index-blue', url: '/unitAdmin' }
                 ]
             }
         ]
@@ -135,7 +135,7 @@ export const menuList = [
         avatar: 'statistics_head_picture.png',
         color: '',
         url: '',
-        menu: [
+        children: [
             {
                 name: '统计图表',
                 icon: '',
@@ -166,7 +166,7 @@ export const menuList = [
         avatar: 'system_head_picture.png',
         color: '',
         url: '',
-        menu: [
+        children: [
             {
                 name: '机构及信息管理',
                 icon: '',

src/page/accounts/users.vue

@@ -50,7 +50,7 @@ export default {
     return {
       form: {
         userName: "",
-        type: 1,  //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
+        type: 1,  //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
       },
       feildList: [
         { prop: "userName", label: "平台用户名" },

src/page/index/index.vue

@@ -17,9 +17,10 @@
                  <span class="panel-box-sub-title_name">{{subItem.name}}</span>
              </div>
              <ul >
-                 <li v-for="(menu,mIndex) in subItem.children" :key="mIndex" @click="goPage(menu.url)" :class="menu.color">
-
-                    <i :class="menu.icon" class="icon-memu"></i>
+                 <li v-for="(menu,mIndex) in subItem.children" :key="mIndex" @click="goPage(menu.url)" >
+                    <div :class="menu.color" class="icon-div">
+                         <i :class="menu.icon" class="icon-memu"></i>
+                    </div>
                     <span class="menu-label">{{menu.name}}</span>
                  </li>
              </ul>
@@ -54,37 +55,13 @@ export default{
 <style lang="less" scoped>
 @import '~@/style/menu.less';
 @media screen and (max-width: 1440px) {
-    .index-container{
-        width: 100%;
-    }
-   .panel-sub-box ul li{
-        padding:1.25vw 10px;
-        .menu-label{
-            font-size: 14px;
-        }
-   }
+    .index-container{  width: 100%; }
 }
 @media  (min-width:1441px) and (max-width:1680px)  {
-    .index-container{
-        width: 96%;
-    }
-     .panel-sub-box ul li{
-        padding:1.25vw 20px;
-        .menu-label{
-            font-size: 14px;
-        }
-   }
+    .index-container{ width: 96%;  }
 }
 @media  (min-width:1681px){
-   .index-container{
-        width: 92%;
-    }
-    .panel-sub-box ul li{
-        padding:1.25vw;
-        .menu-label{
-            font-size: 16px;
-        }
-   }
+   .index-container{ width: 92%; }
 }
 .index-container{
     margin: 0 auto;
@@ -163,6 +140,7 @@ export default{
             ul{
                 display: flex;
                 padding-top: 20px;
+                margin-left: -20px;
                 li{
                     width: 6.67vw;
                     height:8.33vw ;
@@ -171,26 +149,22 @@ export default{
                     text-align: center;
                     border-radius: 8px;
                     color: @font-color;
+                    cursor: pointer;
                     &:not(:first-child){
                         margin-left: 20px;
                     }
-                    &.active,&:hover{
-                        background: @party-red;
-                        box-shadow: 0 8px 4px -4px rgba(155,30,35,0.40);
-                        border-radius: 8px;
-                        border-radius: 8px;
-                        color: @party-white;
-                        cursor: pointer;
-                         color:@party-white;
+                    .icon-div{
+                        padding-top: 0.94vw;
+                        height: 4.79vw;
+                        width: 4.79vw;
+                        border-radius: 16px;
+                        margin: 0 auto 0.8vw ;
                     }
                     .icon-memu{
                         display: block;
-                        width: 2.08vw;
-                        height: 2.08vw;
-                        border-radius:50%;
-                        margin: 0 auto 0.83vw;
-                        background-image: linear-gradient(180deg, #FFF7E8 0%, #FFEDCC 100%);
-                        box-shadow: 0 4px 8px 0 rgba(0,0,0,0.20);
+                        margin: 0 auto;
+                        width: 2.91vw;
+                        height: 2.91vw;
                     }
                     .menu-label{                
                         line-height: 24px;

src/style/menu.less

@@ -2,7 +2,9 @@
 @party-pink:#CF6BA4;
 @party-blue:#5E8DE5;
 @party-green:#3DD0C6;
-@colors: purple, pink, blue, green,red;
+@party-red:#B93838;
+@colors: @party-purple, @party-pink, @party-blue, @party-green,@party-red;
+@colorName:-purple,-pink,-blue,-green,-red;
 @iconList:headContent,copyrights,classify,content,plane,
   pen,data,headAudit,video,screen,magnifier,disable,headUser,interaction,
   account,headStb,radio,message,gear,appversion,interface,headStatistics,overview,tend,
@@ -16,9 +18,8 @@
     }
   });
 
-  each(@colors, {
-    // .index-@{value}{
-    //     background-color: @{party-@{value}}
-    // }
-   
+  each(@colorName, {
+    .index@{value}{
+        background-color: extract(@colors, @index);
+    }  
   });
\ No newline at end of file