更多...
@@ -200,10 +204,12 @@ export default {
console.log(this.labelGroup);
},
- toList ({ tag, dept }) {
- tag?.id ? this.$store.commit('reception/SET_SELECTED',{ key: 'tag_id', value: tag.id }) : ''
- dept?.id ? this.$store.commit('reception/SET_SELECTED',{ key: 'dept_id', value: dept.id }) : ''
-
+ toList ({ tag, dept, leixing, sort_name }) {
+ console.log(111, sort_name, leixing)
+ tag?.id ? this.$store.commit('reception/SET_SELECTED',{ key: 'tag_id', value: tag.id, refresh: true }) : ''
+ dept?.id ? this.$store.commit('reception/SET_SELECTED',{ key: 'dept_id', value: dept.id, refresh: true }) : ''
+ leixing ? this.$store.commit('reception/SET_SELECTED',{ key: 'leixing', value: leixing }) : ''
+ sort_name ? this.$store.commit('reception/SET_SELECTED',{ key: 'sort_name', value: sort_name, refresh: true }) : ''
this.$router.push(`/index/list1?${this.$store.getters.select}`)
}
},
@@ -269,10 +275,14 @@ export default {
}
&--line {
flex: 1;
- height: 1px;
- background: #c7d9e5;
+ color: #999;
+ text-align: right;
+ border-bottom: 1px solid #c7d9e5;
margin-left: 10px;
+ & > span {
+ cursor: pointer;
+ }
}
}
@@ -389,26 +399,29 @@ export default {
}
&__list {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- align-items: center;
+ display: grid;
+ grid-template-columns: repeat(5, 1fr);
+ grid-gap: 17px;
margin-top: 41px;
&--item {
background: #fff;
- width: 176px;
+ //width: 176px;
height: 80px;
color: #1a5ca3;
font-size: 16px;
- line-height: 80px;
text-align: center;
font-weight: 500;
cursor: pointer;
transition: all 0.2ms;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ justify-content: center;
margin-bottom: 20px;
+ padding: 0 10px;
&:hover {
color: #fff;
@@ -459,7 +472,7 @@ export default {
transition: all 0.4s;
&:hover {
- transform: scale(1.1, 1.1);
+ transform: scale(1.05, 1.05);
}
}
&__left--single {
diff --git a/src/views/reception/label/index.vue b/src/views/reception/label/index.vue
index cebe8cf..f13bf9e 100644
--- a/src/views/reception/label/index.vue
+++ b/src/views/reception/label/index.vue
@@ -75,7 +75,7 @@ export default {
},
toList (i) {
- this.$store.commit('reception/SET_SELECTED', { key: 'tag_id', value: i.id })
+ this.$store.commit('reception/SET_SELECTED', { key: 'tag_id', value: i.id, refresh: true })
this.$router.push(`/index/list1?${this.$store.getters.select}`)
}
},
diff --git a/src/views/reception/list1/index.vue b/src/views/reception/list1/index.vue
index c6b3682..1f26acb 100644
--- a/src/views/reception/list1/index.vue
+++ b/src/views/reception/list1/index.vue
@@ -1,6 +1,6 @@
-