From 6c6814a4b972ce794130ef472b24e5409bafb7b6 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 27 Nov 2023 17:12:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87-=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  5 +-
 .../hzwlComponents/phone/PhoneScroll.vue      |  4 +-
 src/pages/phone/domesticStand/index.vue       | 75 +++++++++++++------
 src/router/index.js                           |  5 +-
 4 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 57ba4a530..6894e69cf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,10 @@
         <customerService v-if="customerServiceShow"></customerService>
         <!--    <router-view v-if="!isBoolean"/>-->
         <span v-if="this.$route.name === 'Login'|| !isBoolean">
-          <router-view/>
+          <keep-alive>
+            <router-view v-if="$route.meta.keepAlive"/>
+          </keep-alive>
+          <router-view v-if="!$route.meta.keepAlive"/>
         </span>
         <span v-else>
       <div class="content-box" v-if="isCollapse">
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/domesticStand/index.vue b/src/pages/phone/domesticStand/index.vue
index 50e2138e5..5e83ba1c0 100644
--- a/src/pages/phone/domesticStand/index.vue
+++ b/src/pages/phone/domesticStand/index.vue
@@ -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/router/index.js b/src/router/index.js
index c4165e399..10807cecd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -114,7 +114,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')