diff --git a/src/components/hzwlComponents/phone/PhoneScroll.vue b/src/components/hzwlComponents/phone/PhoneScroll.vue
index 0d83b6446..bb47a19bb 100644
--- a/src/components/hzwlComponents/phone/PhoneScroll.vue
+++ b/src/components/hzwlComponents/phone/PhoneScroll.vue
@@ -85,9 +85,7 @@ export default {
this.bs.finishPullUp()
})
- this.bs.on('scroll', (x, y ,z) => {
- console.log(x,y,z)
- })
+ this.bs.on('scroll', ({x, y}) => { })
} else {
this.bs.refresh()
diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue
index 9c680cfd3..2f7c8f733 100644
--- a/src/pages/phone/components/standardSystemPopup.vue
+++ b/src/pages/phone/components/standardSystemPopup.vue
@@ -39,7 +39,7 @@ export default {
return {
popupShow: true,
checkedKeys: [], // 选择的标准体系
- textStatusName: '现行有效',
+ textStatusName: '全部',
standardSystemTreeData: [],
loading: false,
api: {
@@ -55,7 +55,7 @@ export default {
required: true
}
},
- created () {
+ activated () {
this.getData()
},
methods: {
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index 06cb55bd8..ac79f84f6 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -133,7 +133,7 @@
-
@@ -144,7 +144,7 @@
- {{ file.oldFileName | ellipsis50}}
@@ -3565,7 +3565,6 @@
location['child5'] = childList
}
- //修订本
if (!list[0].child) {
location['child6'] = []
} else {
@@ -3591,7 +3590,6 @@
location['child2'] = childList
}
}
-
for (let i = 0; i < displayLocation.length; i++) {
// sss
if (displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') {
diff --git a/src/pages/phone/domesticStand/index.vue b/src/pages/phone/domesticStand/index.vue
index 50e2138e5..0e597c8ed 100644
--- a/src/pages/phone/domesticStand/index.vue
+++ b/src/pages/phone/domesticStand/index.vue
@@ -110,7 +110,7 @@ export default {
selectIndex: 'stand',
selectValue: '',
standSystem: [],
- textStatus: '现行有效',
+ textStatus: '全部',
selectType: 'titleSearch',
standType: 'INLAND',
page: 1,
@@ -127,23 +127,54 @@ export default {
lawsMap:{},
}
},
+ beforeRouteEnter (to, from, next) {
+ next(vm => {
+ // 首页进入 重新加载
+ if (from.name === 'phoneHome') {
+ switch (to.query.standType) {
+ case 'INLAND':
+ vm.titleName = '国内标准法规库'
+ break
+ case 'FOREIGN':
+ vm.titleName = '海外标准法规库'
+ break
+ case 'bussstand':
+ vm.titleName = '企业标准'
+ break
+ case 'POLICY':
+ vm.titleName = '国内外政策库'
+ break
+ }
+ vm.searchQuery.page = 1
+ vm.$refs.standardSystemPopupRef.popupShow = true
+ vm.$refs.scroll.scrollTo(0, 0)
+ vm.getData()
+ }
+ })
+ },
+ activated () {
+ console.log('activated')
+ },
+ deactivated () {
+ console.log('deactivated')
+ },
created() {
- switch (this.$route.query.standType) {
- case 'INLAND':
- this.titleName = '国内标准法规库'
- break
- case 'FOREIGN':
- this.titleName = '海外标准法规库'
- break
- case 'bussstand':
- this.titleName = '企业标准'
- break
- case 'POLICY':
- this.titleName = '国内外政策库'
- break
- }
+ // switch (this.$route.query.standType) {
+ // case 'INLAND':
+ // this.titleName = '国内标准法规库'
+ // break
+ // case 'FOREIGN':
+ // this.titleName = '海外标准法规库'
+ // break
+ // case 'bussstand':
+ // this.titleName = '企业标准'
+ // break
+ // case 'POLICY':
+ // this.titleName = '国内外政策库'
+ // break
+ // }
this.getDicTypeListCode()
- this.getData()
+ // this.getData()
},
methods: {
pullingUpHandler () {
@@ -269,14 +300,14 @@ export default {
line-height: 40px;
font-size: 18px;
- .left-title {
- margin-left: 10px;
- }
+ .left-title {
+ margin-left: 10px;
+ }
- .right-title {
- float: right;
- margin-right: 34%;
- }
+ .right-title {
+ float: right;
+ margin-right: 34%;
+ }
}
.van-search {
diff --git a/src/pages/phone/standDynamics/index.vue b/src/pages/phone/standDynamics/index.vue
index cfc768362..3ad0f0720 100644
--- a/src/pages/phone/standDynamics/index.vue
+++ b/src/pages/phone/standDynamics/index.vue
@@ -1,7 +1,7 @@
-
+
<
标准化动态
@@ -36,8 +36,21 @@ export default {
data() {
return {
active: "ZYBZFG",
+ isShow: true
};
},
+ beforeRouteEnter (to, from, next) {
+ next(vm => {
+ if (from.name === 'phoneHome') {
+ // 首页进入 重新加载
+ vm.active = "ZYBZFG";
+ vm.isShow = false
+ vm.$nextTick(() => {
+ vm.isShow = true
+ })
+ }
+ })
+ },
methods: {
//返回上一个页面
back() {
diff --git a/src/router/index.js b/src/router/index.js
index c4165e399..6b89bad68 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -105,7 +105,10 @@ const routes = [
{
path: '/standDynamics',
name: 'standDynamics',
- component: () => import('@/pages/phone/standDynamics/index')
+ component: () => import('@/pages/phone/standDynamics/index'),
+ meta: {
+ keepAlive: true
+ }
/*
component: () =>
import('@/pages/phone/standDynamics')
@@ -114,7 +117,10 @@ const routes = [
{
path: '/domesticStand',
name: 'domesticStand',
- component: () => import('@/pages/phone/domesticStand/index')
+ component: () => import('@/pages/phone/domesticStand/index'),
+ meta: {
+ keepAlive: true
+ }
/*
component: () =>
import('@/pages/phone/domesticStand')