|
|
@@ -151,11 +151,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
"searchInfo.category"(val){
|
|
|
-<<<<<<< HEAD
|
|
|
this.page = 1
|
|
|
-=======
|
|
|
- this.page =1
|
|
|
->>>>>>> b1b67f0ce84197f25dfa106fef82b1cbbd7887ce
|
|
|
this.getArticalList()
|
|
|
}
|
|
|
},
|
|
|
@@ -192,13 +188,8 @@ export default {
|
|
|
this.getArticalList()
|
|
|
},
|
|
|
selectDepartment(item){
|
|
|
-<<<<<<< HEAD
|
|
|
this.departmentId = +item.departmentId||0
|
|
|
this.page =1
|
|
|
-=======
|
|
|
- this.page =1
|
|
|
- this.departmentId = +item.departmentId
|
|
|
->>>>>>> b1b67f0ce84197f25dfa106fef82b1cbbd7887ce
|
|
|
localStorage.setItem("@departmentId", this.departmentId)
|
|
|
this.getArticalList()
|
|
|
},
|
