|
@@ -107,7 +107,7 @@
|
|
|
import Vue from 'vue'
|
|
|
import { NavBar, Search, List, Cell, Icon, Popup, Button, Empty } from 'vant'
|
|
|
Vue.use(NavBar).use(Search).use(List).use(Cell).use(Icon).use(Popup).use(Button).use(Empty)
|
|
|
-import { mapGetters } from 'vuex'
|
|
|
+import { mapGetters, mapMutations } from 'vuex'
|
|
|
|
|
|
import { queryShops } from '@/api/equipmentList'
|
|
|
import { sleep } from '@/utils/util'
|
|
@@ -146,7 +146,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr']),
|
|
|
+ ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr', 'oldSmsxt', 'oldCategoryId','isGlobal']),
|
|
|
},
|
|
|
components: {},
|
|
|
created() {
|
|
@@ -155,7 +155,6 @@ export default {
|
|
|
// gcode:"6F"
|
|
|
// gname:"f6"
|
|
|
// seq:600
|
|
|
-
|
|
|
let floorList = [{ code: '全部', gcname: '全部', gcode: '全部', gname: '全部', seq: null, active: 'active' }]
|
|
|
this.floorsArr.map(({ code, gcname, gcode, gname, seq }) => {
|
|
|
floorList.push({ code, gcname, gcode, gname, seq, active: '' })
|
|
@@ -167,7 +166,16 @@ export default {
|
|
|
beforeMount() {},
|
|
|
mounted() {},
|
|
|
methods: {
|
|
|
+ ...mapMutations(['SETCATEGORYID', 'SETSMSXT', 'SETOLDCATEGORYID', 'SETOLDSMSXT']),
|
|
|
backPage() {
|
|
|
+ // 如果是全局搜索进入时,修改smsxt,categoryId为进入全局搜索之前的,
|
|
|
+ // 并将oldSmsxt, oldCategoryId设置为''
|
|
|
+ if(this.isGlobal){
|
|
|
+ this.SETSMSXT(this.oldSmsxt)
|
|
|
+ this.SETCATEGORYID(this.oldCategoryId)
|
|
|
+ this.SETOLDCATEGORYID('')
|
|
|
+ this.SETOLDSMSXT('')
|
|
|
+ }
|
|
|
this.$router.go(-1)
|
|
|
},
|
|
|
/**
|