gy-webcode2 1.0.2 → 1.0.4

package/components/breadcrumb.vue

@@ -2,12 +2,12 @@
     <div class="breadcrumb">
         <div class="row1" v-show="$store.state.breadcrumbShow">
             <div class="title ">
-                <span class="">{{headerName}}</span>
+                <span class="">{{$route.meta.headerMenuName}}</span>
                 <span class="iconBox">
                     <i class="el-icon-arrow-right"></i>
                 </span>
                 <span @click="menuClick"  :class="{myHover:breadcrumb_list.length,s1:breadcrumb_list.length == 0}" >
-                    {{$store.state.menu.menuActive.name}}
+                    {{$route.meta.name}}
                 </span>
                 <template v-for="item,index in breadcrumb_list">
                     <span class="iconBox">
@@ -32,7 +32,7 @@
                         {{breadcrumb_list[breadcrumb_list.length -1].name}}
                     </template>
                     <template v-else>
-                        {{$store.state.menu.menuActive.name}}
+                        {{$route.meta.name}}
                     </template>
                 </span>
             </div>
@@ -57,21 +57,6 @@ export default {
         },
     },
     computed:{
-        activePath() {
-            return this.$store.state.menu.activePath
-        },
-        headerName() {
-            const list = this.$store.state.menu.data[0] || [];
-            let isFind = list.list.find((item2,index2) => {
-                if(index2 == this.activePath && item2.ismy == 1){
-                    return true;
-                }
-            })
-            if(isFind){
-                return isFind.name
-            }
-            return ''
-        },
         names(){
             return this.name ? this.name.split(',') : []
         },

package/css/modules/elementUI.scss

@@ -304,18 +304,29 @@
     // .el-input__inner{
     //     // border: 1px solid #aaaaaa;
     // }
-    .el-input-group--append .el-input__inner, .el-input-group__prepend{
+    .el-input__inner{
         border-right: none;
     }
     .el-input-group__append{
         padding:0;
         // background: #19bfa5;
-        // @include themeColor('background-color','hover',0.1);
+        @include themeColor('background-color','color');
+        color: #fff;
         // @include themeColor('color','hover');
         // color:#fff;
         // border: none;
         width:35px;
+        border-radius: 0 6px 6px 0;
         text-align: center;
+        &:hover{
+            @include themeColor('background-color','hover');
+        }
+        &:active{
+            color: #fff !important;
+            @include themeColor('background-color','active');
+            // @include themeColor('background-color','hover',0.1);
+            // @include themeColor('color','active');
+        }
         .el-button--default{
             // padding: 0;
             min-width: auto;
@@ -325,11 +336,13 @@
             border-radius: 0;
             // @include themeColor('color','color');
             &:hover{
-                @include themeColor('color','hover');
+                color: #fff !important;
+                // @include themeColor('color','hover');
             }
             &:active{
-                @include themeColor('background-color','hover',0.1);
-                @include themeColor('color','active');
+                color: #fff !important;
+                // @include themeColor('background-color','hover',0.1);
+                // @include themeColor('color','active');
             }
         }
         // border: 1px solid #aaaaaa{

package/css/modules/tags.scss

@@ -34,20 +34,25 @@
     &.hong{
         background: #ff4d50;
         border-color: #ff4d50;
+    }
+    &.hong2{
+        background: #fff0f0;
+        border-color: #fff0f0; 
+        color: #f5212d;
         &.plain{
-            background: #fff1f1;
-            border-color: #ffa49f; 
-            color: #f5212d;
+            border-color: #ffa19d; 
         }
     }
+
+    
     &.lan{
         background: #1890ff;
         border-color: #1890ff;
         color: #fff;
         &.plain{
-            background: #e6f7ff;
-            border-color: #91d5fc; 
-            color: #1690fd;
+            background: #fff;
+            border-color: #1890fe; 
+            color: #1791ff;
         }
     }
     &.lan2{
@@ -68,20 +73,31 @@
         background: #353688;
         border-color: #353688;
     }
-
     &.lan4{
+        background: #f1f1f9;
+        border-color: #f1f1f9;
+        color: #373686;
+        &.plain{
+            border-color: #a4a4ca; 
+        }
+    }
+
+    &.lan5{
         background: #155bd5;
         border-color: #155bd5;
     }
+    &.lan6{
+        background: #edf3ff;
+        border-color: #edf3ff;
+        color: #125cd5;
+        &.plain{
+            border-color: #94b4ed; 
+        }
+    }
 
     &.lv{
         background: #4fc519;
         border-color: #4fc519;
-        &.plain{
-            background: #f8ffed;
-            border-color: #b8eb8e; 
-            color: #51c51a;
-        }
     }
     &.lv2{
         border-color: #f8ffed;
@@ -95,10 +111,13 @@
     &.huang{
         background: #fbad15;
         border-color: #fbad15;
+    }
+    &.huang2{
+        background: #fefbe8;
+        border-color: #fefbe8; 
+        color: #ffa83f;
         &.plain{
-            background: #fefbe8;
             border-color: #ffe58e; 
-            color: #ffa83f;
         }
     }
 
@@ -116,22 +135,29 @@
     }
 
     &.zi{
-        background: #8a40d5;
-        border-color: #8a40d5;
+        background: #893fd4;
+        border-color: #893fd4;
+    }
+    &.zi2{
+        background: #faeffd;
+        border-color: #faeffd;
+        color: #883ed3;
         &.plain{
-            background: #f8f3fa;
-            border-color: #c7a7ea; 
-            color: #883ed3;
+            border-color: #c7a8ec; 
         }
     }
 
     &.fen{
         background: #d42a8d;
         border-color: #d42a8d;
+    }
+
+    &.fen2{
+        background: #ffeefa;
+        border-color: #ffeefa;
+        color: #d5298b;
         &.plain{
-            background: #fff0fa;
             border-color: #ea9ecd; 
-            color: #d5298b;
         }
     }
 

package/extend/axios.js

@@ -154,7 +154,17 @@ http.interceptors.response.use(
         return response.data;
     },
     function (error) {
-        return "";
+        if (error.response) {
+        return error.response.data;
+    }
+    else {
+    }
+    console.log(error);
+    // 对响应错误做点什么
+    return Promise.reject({
+        status: 9999,
+        message: "服务器连接失败"
+    });
         // 对响应错误做点什么
         // return Promise.reject(error);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gy-webcode2",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "gy前端公共代码",
   "main": "index.js",
   "scripts": {

package/updateLog.txt

@@ -0,0 +1 @@
+222