Merge remote-tracking branch 'origin/dev_test' into dev_test

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">

src/components/hzwlComponents/phone/PhoneScroll.vue

@@ -85,9 +85,7 @@ export default {
             this.bs.finishPullUp()
           })
 
-          this.bs.on('scroll', (x, y ,z) => {
+          this.bs.on('scroll', ({x, y}) => { })
-            console.log(x,y,z)
-          })
 
         } else {
           this.bs.refresh()

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: {

src/pages/phone/domesticDetails.vue

@@ -133,7 +133,7 @@
                                                 <el-col :span="16">
                                                     <template v-if="child.value && child.value.length > 0">
                                                         <div style="line-height: 32px">
-                                                            <div v-for="(file, fileIndex) in child6Func(child.value)"
+                                                            <div v-for="(file, fileIndex) in child.value"
                                                                  style="display: flex;">
                               <span v-if="child.value && child.value.length > 0 && child.value.length === 1"
                                     style="display: flex; align-items: center;">
@@ -144,7 +144,7 @@
                                                                 <!--多个文件时-->
                                                                 <div v-else-if="child.value && child.value.length > 0">
                                 <span style="display: flex; align-items: center;">
-                                  <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                  <a style="font-size: 0.2rem;color: #409EFF;cursor: pointer"
                                      @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                      :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                                 </span>
@@ -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 !== '过程稿件') {

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:{},
     }
   },
-  created() {
+  beforeRouteEnter (to, from, next) {
-    switch (this.$route.query.standType) {
+    next(vm => {
+      // 首页进入 重新加载
+      if (from.name === 'phoneHome') {
+        switch (to.query.standType) {
           case 'INLAND':
-        this.titleName = '国内标准法规库'
+            vm.titleName = '国内标准法规库'
             break
           case 'FOREIGN':
-        this.titleName = '海外标准法规库'
+            vm.titleName = '海外标准法规库'
             break
           case 'bussstand':
-        this.titleName = '企业标准'
+            vm.titleName = '企业标准'
             break
           case 'POLICY':
-        this.titleName = '国内外政策库'
+            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
+    // }
     this.getDicTypeListCode()
-    this.getData()
+    // this.getData()
   },
   methods: {
     pullingUpHandler () {

src/pages/phone/standDynamics/index.vue

@@ -1,7 +1,7 @@
 <!--全库检索-->
 <template>
   <div id="standDynamics">
-    <div class="search-head">
+    <div class="search-head" v-if="isShow">
       <div class="head-title">
         <span class="left-title" @click="back"> < </span>
         <span class="right-title">标准化动态</span>
@@ -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() {

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')