Merge remote-tracking branch 'origin/master'

src/store.js

@@ -7,6 +7,7 @@ export default new Vuex.Store({
     state: {
         bigBusinessSearch:new Map(),//大B列表搜索
         bigBusinessPage:new Map(),//大B分页页码
+        projectPage:new Map(),//小B分页页码
         searchResultBigBusiness:new Map(),//搜索结果大B分页
         searchResultSmallBusiness:new Map(),//搜索结果小B分页
         searchResult:new Map(),//搜索结果
@@ -21,6 +22,10 @@ export default new Vuex.Store({
             state.bigBusinessPage.set(path,pars)
         },
 
+        project_PAGE_NUM:(state,{path,pars})=>{ //大B记住分页
+            state.projectPage.set(path,pars)
+        },
+
         SEARCH_RESULT_BB_PAGE_NUM:(state,{path,pars})=>{ //搜索结果大B分页
             state.searchResultBigBusiness.set(path,pars)
         },
@@ -46,6 +51,9 @@ export default new Vuex.Store({
             commit('SAVE_LIST_PAGE_NUM',{ path,pars });
         },
 
+        projectPageNum: ({ commit },{path,pars}) => {
+            commit('project_PAGE_NUM',{ path,pars });
+        },
         saveSearchResultBBPageNum: ({ commit },{path,pars}) => {
             commit('SEARCH_RESULT_BB_PAGE_NUM',{ path,pars });
         },

src/views/seeprojects/seeprojectlist.vue

@@ -135,6 +135,7 @@
             // 分页导航
             handleCurrentChange(val) {
                 this.cur_page = val;
+                this.$store.dispatch('projectPageNum',{path:this.$route.path,pars:this.cur_page});
                 this.add();
             },
             //设置个数
@@ -151,6 +152,9 @@
                 this.$router.push({path:"/viewproject",query:{projectId:row.projectId,state:0}});
             },
             add(){
+                if(this.$store.state.projectPage.has(this.$route.path)) {
+                    this.cur_page=this.$store.state.projectPage.get(this.$route.path);
+                }
                 let params = {
                     pagination: {
                         number: this.numberData,
@@ -274,6 +278,7 @@
             if(to.path!="/viewproject"||to.path==undefined) {
                 window.sessionStorage.setItem("isDetailInpro",false);
                 this.$store.dispatch('projectPagePars',{path:this.$route.path,pars:{}});
+                this.$store.dispatch('projectPageNum',{path:this.$route.path,pars:1});
                 next()
             }else{
                 window.sessionStorage.setItem("isDetailInpro",true);