20210202

package.json

@@ -12,6 +12,7 @@
     "core-js": "^3.8.2",
     "swiper": "^5.4.5",
     "v-img": "^0.2.0",
+    "v-viewer": "^1.5.1",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^4.1.1",
     "vue-pdf": "^4.2.0",

public/index.html

@@ -18,7 +18,8 @@
           navigator.userAgent.indexOf("iPhone") > -1 ||
           navigator.userAgent.indexOf("Android") > -1
         ) {
-          window.location.href = "/mobile.html";
+          let href = window.location.href.split('/index.html')
+          window.location.href =  href[0] + "/mobile.html";
         }
       })();
     </script>

public/mobile.html

@@ -12,7 +12,8 @@
     <script>
       (function(){
         if (!(navigator.userAgent.indexOf('iPhone') > -1 || navigator.userAgent.indexOf('Android') > -1)) {
-                window.location.href = '/';
+              let href = window.location.href.split('/mobile.html')
+              window.location.href =  href[0] + "/index.html";
             }
         })();
     </script>

src/App.vue

@@ -1,71 +0,0 @@
-<template>
-  <div id="app" :class="`theme${theme}`">
-    <!-- <Welcome @close="welcome = false" v-if="welcome"/> -->
-
-    <layout/>
-    <!-- <div class="banbentips" v-else>
-      <div>浏览器版内核版本过低,无法正常浏览网页，建议使用Chrome(谷歌)浏览器，Firefox(火狐)浏览器（版本号80或以上），360安全浏览器（版本10或以上）</div>
-      <div>
-        <p v-html="tips[0]"></p>
-        <p v-html="tips[1]"></p>
-      </div>
-      <div>{{link}}</div>
-    </div> -->
-    <!-- <button @click="changeColor">改变颜色</button> -->
-  </div>
-</template>
-
-<script>
-import '@/assets/style/reset.less'
-import '@/assets/style/public.less'
-import '@/assets/theme/color.less'
-import Welcome from "@/components/welcome";
-
-import layout from '@/views/layout/index.vue'
-import {mapState} from 'vuex'
-import broswer from './config/broswer'
-
-export default {
-  components:{
-    layout,
-    Welcome
-  },
-  data(){
-    return {
-      broswer,
-      link: window.location.href,
-      tips:[],
-      canUse:false,
-      welcome:true
-    }
-  },
-  methods:{
-    changeColor(){
-      document.getElementById('app').className = 'theme2'
-    }
-  },
-  mounted(){
-    
-  },
-  computed:{
-    ...mapState({
-      theme: state => state.common.theme
-    })
-  }
-}
-</script>
-
-<style lang="less">
-#app {
-  text-align: center;
-  color: #2c3e50;
-}
-
-.banbentips{
-  color: #000;
-  width: 100%;
-  padding-top: 80px;
-  line-height: 2;
-}
-
-</style>

src/assets/style/globalVars.less

@@ -1,4 +1,4 @@
-@cdn: "https://shlmuseum.oss-cn-shanghai.aliyuncs.com/shls_museum/images/";
+@cdn: "https://houseoss.4dkankan.com/chuanshan";
 @inputH: 30px;
 @theme: #df3b2f;
 @sub-theme: #f5b55f;

src/assets/style/public.less

@@ -48,6 +48,13 @@ body::-webkit-scrollbar-thumb {
   }
 }
 
+.no-record{
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+}
+
 .audio-hidden {
   width: 0;
   height: 0;

src/assets/theme/theme.less

@@ -94,7 +94,7 @@
       background: @theme;
       background-size: 100%;
       position: absolute;
-      bottom: .67rem;
+      bottom: .47rem;
       left: 50%;
       transform: translateX(-50%);
       width: 4.17rem;

src/components/Collection.vue

@@ -168,6 +168,7 @@ export default {
 .collection-body{
   margin: 3.33rem auto;
   max-width: 54.17rem;
+  min-height: 61vh;
 }
 .collection {
   .type{
@@ -229,7 +230,7 @@ export default {
         user-select: none;
         position: relative;
         transition: color 0.3s;
-        color: #9E9E9E;
+        color: #444444;
         font-size: 1rem;
       }
       & /deep/ .p-layout a:last-child,& /deep/ .p-layout a:first-child  {

src/components/Listiframe.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="ifr-con">
-        <iframe :src="'https://www.4dkankan.com/showPC.html?m=JPoqsQXL'" frameborder="0"></iframe>
+        <iframe :src="'https://www.4dmodel.com/SuperTwo/index.html?m=805'" frameborder="0"></iframe>
     </div>
 </template>
 

src/components/Paging.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="p-layout">
     <a @click="clickHandle(index - 1)">
-      <img :src="`${$cdn}/images/prev_w.png`" alt="">
+      <img :src="`${$cdn}/images/prev_r.png`" alt="">
       </a>
-      <a @click="clickHandle(1)" :class="{ active: index === 1 }">1</a><a class="more" @click="clickHandle(index - 3)" v-if="index >= 4">...</a><a
+      <a @click="clickHandle(1)" :class="{ active: index === 1 }">1</a><a
       v-for="page in pages"
       :key="page"
       @click="clickHandle(page)"
@@ -21,7 +21,7 @@
       >{{ maxPage }}</a
     >
     <a @click="clickHandle(index + 1)">
-      <img :src="`${$cdn}/images/next_w.png`" alt="">
+      <img :src="`${$cdn}/images/next_r.png`" alt="">
     </a>
   </div>
 </template>
@@ -128,8 +128,10 @@ export default {
 <style lang="less" scoped>
 .p-layout{
   >a{
+    font-size: 1.2rem!important;
    >img{
-     width: 0.5rem;
+     width: 0.38rem;
+     margin-top: 2px;
    } 
   }
 }

src/components/Sidebar.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <ul class="sidebar">
+      <li v-if="list.length<=0">暂无数据</li>
       <li @click="handleItem(item)" :class="{active:item.id==activeId}" v-for="(item,i) in list" :key="i">{{item.name}}</li>
     </ul>
     <slot name="bottom"></slot>

src/components/bmSlide/index.vue

@@ -91,14 +91,16 @@ export default {
       color: #666666;
       > h3 {
         color: #666666;
-        font-size: 1.67rem;
+        font-size: 13px;
+        font-weight: bolder;
         max-width: 90%;
         margin-bottom: 0.92rem;
       }
       > p {
         color: #666666;
         line-height: 1.42rem;
-        font-size: 0.83rem;
+        font-size: 13px;
+
       }
       .qrcode {
         position: absolute;
@@ -106,11 +108,11 @@ export default {
         bottom: 0.42rem;
         text-align: center;
         > img {
-          width: 2.92rem;
+          width: 3.92rem;
         }
         > span {
           display: block;
-          font-size: 0.67rem;
+          font-size: 13px;
         }
       }
 
@@ -121,7 +123,7 @@ export default {
         text-indent: 1.66rem;
         padding-right: 70px;
         text-align: justify;
-        font-size: 0.83rem;
+        font-size: 13px;
       }
       &::before,
       &::after {

src/components/bmSlide/slide.vue

@@ -20,7 +20,9 @@
         v-for="(item, index) in list"
         :key="index"
       >
-        <img @click="slideto(index)" class="logo" :src="item.imgstr" />
+        <div @click="slideto(index)">
+          <img  class="logo" :src="item.imgstr" />
+        </div>
       </swiper-slide>
     </swiper>
 
@@ -166,7 +168,7 @@ export default {
 }
 
 .swiper-slide img {
-  width: 50%;
+  height: 80%;
   position: absolute;
   top: 50%;
   transform: translate(-50%, -50%);

src/components/hoverNavs/index.vue

@@ -80,7 +80,7 @@ export default {
       padding: .17rem .83rem;
       border-top-left-radius: .17rem;
       border-bottom-left-radius: .17rem;
-      font-size: 1rem;
+      font-size: 15px;
       cursor: pointer;
     }
   }

src/components/jieshuo.vue

@@ -110,27 +110,27 @@ export default {
     }
   }
 }
-// @media screen and (max-width: 1000px) {
-//   .commentary {
-//     width: 90%;
-//     margin: 0 auto;
-//     align-items: flex-start;
-//     > div {
-//       width: 50%;
-//       > span {
-//         display: block;
-//         text-align: left;
-//         line-height: 2;
-//       }
-//       &:last-of-type {
-//         padding-left: 0.83rem;
-//         top: 7px;
-//         position: relative;
-//       }
-//     }
-//   }
-// }
-// </style>
+@media screen and (max-width: 1000px) {
+  .commentary {
+    width: 90%;
+    margin: 0 auto;
+    align-items: flex-start;
+    > div {
+      width: 50%;
+      > span {
+        display: block;
+        text-align: left;
+        line-height: 2;
+      }
+      &:last-of-type {
+        padding-left: 0.83rem;
+        top: 7px;
+        position: relative;
+      }
+    }
+  }
+}
+</style>
 
 <style lang="less">
 @cdn: "https://houseoss.4dkankan.com/chuanshan";

src/components/mCollection.vue

@@ -1,9 +1,9 @@
 <template>
 <div class="collection-body">
   <div class="collection">
-    <div class="type-con">
+    <div class="type-con" ref="type">
       <ul class="type">
-        <li :class="{active:typeActive==item.id}" @click="typeActive = item.id" v-for="(item,i) in types" :key="i">
+        <li :class="{active:typeActive==item.id}" @click="handleTypeLi(item)" v-for="(item,i) in types" :key="i">
           {{item.name}}
         </li>
       </ul>
@@ -43,6 +43,9 @@ export default {
     ...mapState({
       theme: (state) => state.common.theme,
     }),
+    typeActive(){
+      return this.$route.params.type
+    },
     list(){
       let tmp = this.data.filter(i=>i.type==this.typeActive)
       let tt = tmp.map(item=>{
@@ -66,6 +69,7 @@ export default {
   },
   mounted(){
       // this.getNavigation()
+
   },
   watch:{
     list:{
@@ -75,11 +79,21 @@ export default {
         this.total = tmp.length
       }
     },
-    typeActive(){
-      this.currentPage = 1
+    typeActive:{
+      immediate:true,
+      handler:function (){
+        this.currentPage = 1
+        this.$nextTick(() => {
+          let activeItem = this.$refs.type.querySelector("li[class=active]")
+          this.$refs.type.scrollLeft = activeItem.offsetLeft - 30
+        });
+      }
     }
   },
   methods:{
+    handleTypeLi(item){
+      this.$router.push({name:'collection',params:{type:item.id}})
+    },
     clickItem(item){
       if (item.link) {
         return window.open(item.link,"_blank")
@@ -151,7 +165,6 @@ export default {
       collectActive:'',
       currentPage:1,
       pageSize:8,
-      typeActive: this.$route.params.type,
       keywordVal:'',
       defaultKey:'',
     };
@@ -180,6 +193,7 @@ export default {
     }
     .type{
       padding: 0.8rem 0;
+      display: inline-block;
       >li{
         display: inline-block;
         background: @default;

src/components/msection.vue

@@ -16,7 +16,7 @@
       <mbslide v-if="data.length>0" :list="data" :isTheme='isTheme'/>
       <!-- <bm-slide :isTheme='isTheme' v-if="data.length>0"  :idx='activeIdx' @activeItem="handleItem" :list='data'  class="sld-con"/> -->
 
-      <div class="readmore">
+      <div class="readmore" v-if="showMore">
         <span @click="goto">查看更多藏品</span>
       </div>
     </div>
@@ -75,6 +75,10 @@ export default {
     isTheme:{
       type:Boolean,
       default:false
+    },
+    showMore: {
+      type: Boolean,
+      default: true,
     }
   },
   methods:{

src/components/popupLayout/Broadcast.vue

@@ -37,7 +37,7 @@ export default {
   width: 100%;
   height: 100%;
   position: fixed;
-  z-index: 99999999;
+  z-index: 999;
   top: 0;
   left: 0;
   background: rgba(0, 0, 0, 0.6);

src/components/section.vue

@@ -34,7 +34,7 @@
         class="sld-con"
       />
 
-      <div class="readmore">
+      <div class="readmore" v-if="showMore">
         <span @click="goto">查看更多藏品</span>
       </div>
     </div>
@@ -98,6 +98,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showMore: {
+      type: Boolean,
+      default: true,
+    }
   },
   methods: {
     handleItem(item) {
@@ -136,7 +140,7 @@ export default {
       margin-right: 1.25rem;
     }
     span {
-      font-size: 1.5rem;
+      font-size: 23px;
       font-weight: bolder;
       line-height: 1;
       display: inline-block;
@@ -158,7 +162,7 @@ export default {
         line-height: @fontSizeNormalLightHeight;
         text-indent: 2rem;
         text-align: justify;
-        font-size: 1rem;
+        font-size: 15px;
         color: #444;
         &:last-of-type {
           margin-bottom: 3.83rem;

src/components/showCollection.vue

@@ -13,7 +13,7 @@
               class="collection-item"
               :style="{ background: $linear[item.bgid] }"
             >
-              <img :src="item.imgstr" alt="" />
+              <img :src="item.imgstr" v-viewer="viewOption" alt="" />
 
               <div class="button__zoom-normal" @click.stop="zoomPic">
                 <img :src="require(`@/assets/images/zoom@2x.png`)" alt="" />
@@ -24,9 +24,9 @@
               <p v-if="item.time">年代：{{ item.time }}</p>
               <p v-if="item.size">尺寸：{{ item.size }}</p>
               <div v-if="item.describe" class="desc">{{ item.describe }}</div>
-              <div class="qrcode" v-if="activeItem && activeItem.qrcode">
+              <div class="qrcode" v-if="item && item.qrcode">
                 <img
-                  :src="`${$cdn}/images/qrcode/${activeItem.qrcode}.png`"
+                  :src="`${$cdn}/images/qrcode/${item.qrcode}.png`"
                   alt=""
                 />
                 <span>了解更多故事</span>
@@ -59,6 +59,8 @@ export default {
     return {
       activeItem: null,
       isShowFull: false,
+      viewOption:{
+      }
     };
   },
 
@@ -66,7 +68,8 @@ export default {
   mounted() {},
   methods: {
     zoomPic() {
-      this.isShowFull = true;
+      const viewer = this.$el.querySelector('.collection-item>img').$viewer
+      viewer.show()
     },
     hideFullPic() {
       this.isShowFull = false;
@@ -166,13 +169,13 @@ export default {
           width: 40%;
           > h3 {
             color: #df3b2f;
-            font-size: 1.67rem;
+            font-size: 13px;
             max-width: 22.92rem;
             margin-bottom: 1.25rem;
           }
           > p {
             line-height: 1.42rem;
-            font-size: 0.83rem;
+            font-size: 13px;
           }
           .qrcode {
             position: absolute;
@@ -180,11 +183,11 @@ export default {
             bottom: 0.42rem;
             text-align: center;
             > img {
-              width: 2.92rem;
+              width: 3.92rem;
             }
             > span {
               display: block;
-              font-size: 0.67rem;
+              font-size: 13px;
             }
           }
 
@@ -192,7 +195,7 @@ export default {
             border-top: 0.04rem solid #d1d1d1;
             margin-top: 1.25rem;
             padding-top: 1.25rem;
-            font-size: 0.83rem;
+            font-size: 13px;
           }
         }
       }

src/components/showMbCollection.vue

@@ -6,7 +6,7 @@
         <div class="img-con img-k">
           <div class="show-detail">
             <div class="collection-item" :style="{background:$linear[item.bgid]}">
-              <img :src="item.imgstr" alt="" />
+              <img :src="item.imgstr" v-viewer="viewOption"/>
               <div class="button__zoom-normal" @click.stop="zoomPic">
                 <img :src="require(`@/assets/images/zoom@2x.png`)" alt="" />
               </div>
@@ -47,7 +47,9 @@ export default {
   props: ["item"],
   data() {
     return {
-      isShowFull:''
+      isShowFull:'',
+      viewOption:{
+      }
     };
   },
   watch: {
@@ -55,7 +57,11 @@ export default {
   },
   methods:{
     zoomPic() {
-      this.isShowFull = true;
+      const viewer = this.$el.querySelector('.collection-item>img').$viewer
+      viewer.show()
+    },
+    hideFullPic() {
+      this.$hideBroadcast();
     }
   },
   mounted() {},
@@ -95,7 +101,7 @@ export default {
   position: relative;
   z-index: 9999999;
   max-width: 90%;
-  max-height: 70vh;
+  max-height: 74vh;
   overflow-y: auto;
   &::-webkit-scrollbar{
     display: none;
@@ -161,7 +167,7 @@ export default {
                 display: inline-block;
                 text-align: center;
                 >img{
-                  width: 2.92rem;
+                  width: 3.92rem;
                 }
                 >span{
                   width: 100%;

src/config/pdfdata.js

@@ -9,7 +9,7 @@ const data = [
     content: '内容',
     type:'类型',
     link:$cdn+'/pdf/1_dashiji.pdf',
-    keyword: '',
+    keyword: '保卫战,红四方面军,解放',
     date: '1932年12月-1935年4月'
   },
   {
@@ -19,6 +19,7 @@ const data = [
     content: '内容',
     type:'类型',
     link:$cdn+'/pdf/2_shiliaoxuanbian.pdf',
+    keyword: '法令,红四方面军,苏区,革命,政策',
     date: '1987年6月'
   },
   {
@@ -28,6 +29,7 @@ const data = [
     content: '内容',
     type:'类型',
     link:$cdn+'/pdf/3_bowuguanjieshao.pdf',
+    keyword: '邓小平,红四方面军,苏区,革命',
     date: '时间不详'
   },
   {
@@ -37,6 +39,7 @@ const data = [
     content: '内容',
     type:'类型',
     link:$cdn+'/pdf/4_gongzuolunshu.pdf',
+    keyword: '川陕革命根据地,财政工作,成效与不足',
     date: '2016年3月'
   },
   {
@@ -46,6 +49,7 @@ const data = [
     content: '内容',
     type:'类型',
     link:$cdn+'/pdf/5_zhengguihuajianshe.pdf',
+    keyword: '川陕革命根据地,财政工作',
     date: '2014年'
   },
   {
@@ -335,6 +339,296 @@ const data = [
     type:'类型',
     link:$cdn+'/pdf/37_tudigeming.pdf',
     date: '2012年'
+  },
+
+  {
+    id: 38,
+    name: '《春耕宣传大纲》', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/38_xuanchuandagang.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 39,
+    name: '《经济建设报（第七期）》', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/39_jingjijianshe.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 40,
+    name: '巴中县第二次工农兵苏维埃代表大会宣言', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/40_bazhongxian.pdf',
+    date: '1993年7月1日'
+  },
+
+  {
+    id: 41,
+    name: '白军官兵拖枪投入红军有十大好处', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/41_shidahaochu.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 42,
+    name: '川陕省苏维埃印《经济政策》', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/42_jingjizhengce.pdf',
+    date: '1933年8月1日'
+  },
+
+  {
+    id: 43,
+    name: '川陕省苏维埃政府关于土地改革布告', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/43_gaigebugao.pdf',
+    date: '1933年'
+  },
+
+  {
+    id: 44,
+    name: '川陕省苏维埃政府优待红军及其家属条例', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/44_jiashutiaoli.pdf',
+    date: '1933年5月26号'
+  },
+
+  {
+    id: 45,
+    name: '川陕省苏维埃组织法', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/45_zuzhifa.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 46,
+    name: '川陕税务条例草案', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/46_tiaolicaoan.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 47,
+    name: '对白军士兵的宣传大纲', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/47_xuanchuandagang.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 48,
+    name: '恩阳县六区七乡苏主席给各村征集粮食的通知及收条', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/48_zhengjiliangshi.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 49,
+    name: '公粮条例', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/49_gongliangtiaoli.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 50,
+    name: '红色战士丛书 第四种', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/50_hongsezhanshi.pdf',
+    date: '1934年4月31日'
+  },
+
+  {
+    id: 51,
+    name: '军事捷报（八则）', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/51_junbaoshize.pdf',
+    date: '1934年'
+  },
+
+  {
+    id: 52,
+    name: '扩大红军宣传册', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/52_kuodahongjun.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 53,
+    name: '没收条例说明书', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/52_kuodahongjun.pdf',
+    date: '1934年'
+  },
+
+  {
+    id: 54,
+    name: '民间文学', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/54_minjianwenxue.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 55,
+    name: '目前形势与川陕省苏维埃的任务', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/55_muqianxingshi.pdf',
+    date: '1933年8月12日'
+  },
+
+  {
+    id: 56,
+    name: '农村阶级划分五言歌', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/56_wuyange.pdf',
+    date: '1934年9月24日'
+  },
+
+  {
+    id: 57,
+    name: '平分土地须知', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/57_pingfentudi.pdf',
+    date: '1934年12月31日'
+  },
+
+  {
+    id: 58,
+    name: '苏维埃组织法及各种委员会的工作概要说明', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/58_gongzuogaiyao.pdf',
+    date: '1933年2月15日'
+  },
+
+  {
+    id: 59,
+    name: '唐书祥交粮的收据与便条（共三件）', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/59_tangsanxiang.pdf',
+    date: '1933年'
+  },
+
+  {
+    id: 60,
+    name: '西北军区政治部关于优待红军家属条例摘要', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/60_xibeijunqu.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 61,
+    name: '怎样分配土地', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/61_zenyangfenpeitudi.pdf',
+    date: '1933年2月12日'
+  },
+
+  {
+    id: 62,
+    name: '中国共产党川陕省党第二次大会组织问题决议案', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/62_diercidahui.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 63,
+    name: '中国共产党川陕省党第二次大会组织问题决议案', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/63_disicidahui.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 64,
+    name: '中国共产党川陕省委宣传部对新发展赤区的宣传大纲', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/64_duichifazhan.pdf',
+    date: '1933年8月24日'
+  },
+
+  {
+    id: 65,
+    name: '中国共产党十大政纲', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/65_shidazhenggang.pdf',
+    date: '时间不详'
+  },
+
+  {
+    id: 66,
+    name: '川陕苏维埃政府布告：苏区营业条例', 
+    describe: '描述',
+    content: '内容',
+    type:'类型',
+    link:$cdn+'/pdf/66_yingyetiaoli.pdf',
+    date: '1933年'
   }
 
 ]

src/config/utils.js

@@ -23,7 +23,7 @@ module.exports = {
       let smoothscroll = ()=>{
         let dom = document.getElementById(domName)
         dom && window.scrollTo({
-          top:dom.offsetTop- 120,
+          top:dom.offsetTop- 40,
           left:0,
           behavior: "smooth"
         })

src/config/videodata.js

@@ -3,11 +3,21 @@ let $cdn = process.env.VUE_APP_CDN
 const data = [
   {
     id: 1,
-    name: '红军税务后人采访', 
+    name: '苟伯儒儿子采访视频', 
     describe: '视频介绍视频介绍视频介绍视频介绍',
     content: '内容',
     type:'类型',
-    video: $cdn + "/video/testVideo.mp4",
+    video: $cdn + "/video/caifang.mp4",
+    keyword: '',
+    date: '1932年12月-1935年4月'
+  },
+  {
+    id: 2,
+    name: '动态地图', 
+    describe: '视频介绍视频介绍视频介绍视频介绍',
+    content: '内容',
+    type:'类型',
+    video: $cdn + "/video/ditu.mp4",
     keyword: '',
     date: '1932年12月-1935年4月'
   }

src/main.js

@@ -1,45 +0,0 @@
-import Vue from "vue";
-import App from "./App.vue";
-import vuex from "vuex";
-
-import router from "./router";
-import "@/assets/theme/theme.less";
-import { axios, serverName, orginLink } from "./config/http";
-
-import { $showBroadcast, $hideBroadcast } from "./components/popupLayout";
-
-
-
-Vue.mixin({
-  methods: {
-    $showBroadcast,
-    $hideBroadcast,
-  },
-});
-Vue.use(vuex);
-Vue.prototype.$http = axios;
-Vue.prototype.$serverName = serverName;
-Vue.prototype.$orginLink = orginLink;
-Vue.prototype.$cdn = process.env.VUE_APP_CDN;
-
-Vue.config.productionTip = false;
-Vue.prototype.$bus = new Vue();
-
-let tmpYear = {};
-for (let i = 2000; i <= 2050; i++) {
-  tmpYear[i] = i + "年";
-}
-
-Vue.prototype.$linear = {
-  0: "linear-gradient(180deg, #828A8E 0%, #CBCCCD 100%)",
-  1: "linear-gradient(180deg, #868990 0%, #EEEEEE 100%)",
-  2: "linear-gradient(180deg, #403F3D 0%, #F3F3F3 100%)",
-  r: "linear-gradient(180deg, #EF4539 0%, #CB2C20 100%)",
-  w: "linear-gradient(180deg, #F3F3F3 0%, #E3E3E3 100%)",
-};
-
-new Vue({
-  router,
-  store: require("./store").default,
-  render: (h) => h(App),
-}).$mount("#app");

src/pages/index.js

@@ -6,6 +6,9 @@ import router from '@/router'
 import '@/assets/theme/theme.less'
 import {axios, serverName,orginLink} from '@/config/http'
 
+import 'viewerjs/dist/viewer.css'
+import Viewer from 'v-viewer'
+
 import {
   $showBroadcast,
   $hideBroadcast,
@@ -18,6 +21,8 @@ Vue.mixin({
   }
 })
 Vue.use(vuex)
+Vue.use(Viewer)
+
 Vue.prototype.$http = axios
 Vue.prototype.$serverName = serverName 
 Vue.prototype.$orginLink = orginLink 

src/pages/mobile.js

@@ -7,6 +7,9 @@ import router from '@/router/mobile.js'
 import '@/assets/theme/theme.less'
 import {axios, serverName,orginLink} from '@/config/http'
 
+import 'viewerjs/dist/viewer.css'
+import Viewer from 'v-viewer'
+
 import {
   $showBroadcast,
   $hideBroadcast,
@@ -19,6 +22,8 @@ Vue.mixin({
   }
 })
 Vue.use(vuex)
+Vue.use(Viewer)
+
 Vue.prototype.$http = axios
 Vue.prototype.$serverName = serverName 
 Vue.prototype.$orginLink = orginLink 

src/views/digital/index.vue

@@ -6,39 +6,9 @@
 
 <script>
 import Listiframe from '@/components/Listiframe'
-
- let typeKey = {
-    'video':'video',
-    'scene':'webSite'
-  }
 export default {
   components:{
     Listiframe
-  },
-  data(){
-    return{
-      type:this.$route.params.type||'scene',
-      src:'',
-    }
-  },
-  mounted(){
-    this.getMedia()
-  },
-  watch:{
-    '$route.params.type':function(newVal){
-      this.type = newVal
-      this.getMedia()
-    }
-  },
-  methods:{
-    handleChange(item){
-      this.src = item
-    },
-    async getMedia(){
-      let url =`/api/web/${this.type}`
-      let result = (await this.$http.get(url)).data[0]
-      this.src = result[typeKey[this.type]]
-    }
   }
 }
 </script>

src/views/digital/mobile.vue

@@ -6,39 +6,9 @@
 
 <script>
 import Listiframe from '@/components/Listiframe'
-
- let typeKey = {
-    'video':'video',
-    'scene':'webSite'
-  }
 export default {
   components:{
     Listiframe
-  },
-  data(){
-    return{
-      type:this.$route.params.type||'scene',
-      src:'',
-    }
-  },
-  mounted(){
-    this.getMedia()
-  },
-  watch:{
-    '$route.params.type':function(newVal){
-      this.type = newVal
-      this.getMedia()
-    }
-  },
-  methods:{
-    handleChange(item){
-      this.src = item
-    },
-    async getMedia(){
-      let url =`/api/web/${this.type}`
-      let result = (await this.$http.get(url)).data[0]
-      this.src = result[typeKey[this.type]]
-    }
   }
 }
 </script>
@@ -49,7 +19,7 @@ export default {
   font-size: 0;
   .iframe{
     width: 100%;
-    height: calc(100vh - 3.25rem);
+    height: calc(100vh - 70px);
   }
   video{
     width: 100%;

src/views/dynamic/index.vue

@@ -23,7 +23,7 @@
       </div>
       <div class="d-body">
         <video autoplay controls :src="activeItem.video"></video>
-        <div class="d-desc">
+        <!-- <div class="d-desc">
           <div class="desc-l">
             <p>红军税务后人采访</p>
             <div class="l-btom">
@@ -38,7 +38,7 @@
             <div>视频介绍：</div>
             <p>视频介绍视频介绍视频介绍视频介绍</p>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -46,6 +46,7 @@
 
 <script>
 import mSidebar from "@/components/Sidebar";
+import data from "@/config/videodata.js";
 
 const list = [];
 
@@ -54,46 +55,7 @@ export default {
     mSidebar,
   },
   data() {
-    const data = {
-      pageNum: 1,
-      pageSize: 10,
-      pages: 1,
-      prePage: 0,
-      size: 5,
-      startRow: 1,
-      total: 5,
-      list: [
-        {
-          content: "<p>川陕苏区税收大事记</p>",
-          createTime: "2020-08-06 15:02:16",
-          display: 0,
-          id: 15,
-          img: "http://192.168.0.44:8101/data/media/20200806_150209699.jpg",
-          reason: "",
-          status: 1,
-          submitId: 8,
-          submitName: "admin",
-          video: this.$cdn + "/video/testVideo.mp4",
-          title: "川陕苏区税收大事记1",
-          updateTime: "2020-08-06 15:58:02",
-        },
-        {
-          content: "<p>川陕苏区税收大事记</p>",
-          createTime: "2020-08-06 15:02:16",
-          display: 0,
-          id: 11,
-          img: "http://192.168.0.44:8101/data/media/20200806_150209699.jpg",
-          reason: "",
-          status: 1,
-          video:
-            "https://4dscene.4dage.com/new4dkk/course/videos/img_guide01@2x.mp4",
-          submitId: 8,
-          submitName: "admin",
-          title: "川陕苏区税收大事记2",
-          updateTime: "2020-08-06 15:58:02",
-        },
-      ],
-    };
+ 
     return {
       data,
       keyword: "",
@@ -115,7 +77,11 @@ export default {
     },
   },
   methods: {
-    getCollection() {},
+    getCollection() {
+      this.list = data.data.filter(item=>{
+        return item.name.indexOf(this.keyword) > -1
+      })
+    },
     handleItem(item) {
       this.activeId = item.id;
     },
@@ -123,9 +89,8 @@ export default {
       this.currentPage = data;
     },
     async getNews() {
-      let result = this.data;
 
-      this.list = result.list;
+      this.list = data.data;
       this.list.forEach((item) => {
         if (item.id == this.activeId) {
           this.activeItem = item;
@@ -181,7 +146,7 @@ export default {
       flex: 4;
       margin-left: 3.33rem;
       text-align: center;
-      padding-bottom: 1.67rem;
+      // padding-bottom: 1.67rem;
       background: #fff;
       .info {
         color: #9e9e9e;

src/views/dynamic/mobile.vue

@@ -13,6 +13,7 @@
           <span></span>
         </li>
       </ul>
+      <div v-if="list.length<=0" class="no-record">暂无数据</div>
     </div>
   </div>
 </template>
@@ -39,7 +40,7 @@ export default {
       this.$router.push({name:'mbdetail',params:{id:item.id}})
     },
     getCollection(){
-      this.list = this.data.list.filter(item=>{
+      this.list = data.data.filter(item=>{
         return item.name.indexOf(this.keyword) > -1
       })
     },

src/views/home/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home-page">
-    <HoverNavs v-if="activeId && activeId != 'introduce'" />
+    <HoverNavs v-if="activeId != 'introduce'" />
     <div id="introduce" class="introduce">
       <img :src="lunbotu" alt="" />
     </div>
@@ -78,6 +78,7 @@
       :bgImg="`${this.$cdn}/images/bg_2.jpg`"
       :isTheme="true"
       :txtArr="endTxt"
+      :showMore="false"
     >
     </mSection>
 
@@ -144,11 +145,14 @@ export default {
       4: [],
       5: [],
       6: [],
-      7: [],
+      7: []
     };
 
     data.data.forEach((i) => {
       i.imgstr = `${this.$cdn}/images/typeimg/${i.type}/${i.img}.png`;
+      if (i.hideInHome) {
+        return
+      }
       datas[i.type].push(i);
     });
     return {
@@ -162,15 +166,21 @@ export default {
     };
   },
 
+  watch:{
+    activeId(newVal){
+      this.$bus.$emit('isHideToTop',newVal && newVal != 'introduce')
+    }
+  },
+
   methods: {
     handleItem() {},
     scrollFn() {
       let getHeightById = (id) => {
-        if (id == "home") {
+        if (id == "introduce") {
           return 100;
         }
         let dom = document.getElementById(id);
-        return dom.offsetTop + 600;
+        return dom.offsetTop - 100;
       };
       let fn = (key, temp) => {
         let str = "switch (" + true + ") {";
@@ -201,10 +211,12 @@ export default {
       if (height == currentScroll) {
         return;
       }
+      this.activeId = 'nonull'
       let temp = "";
       eval(fn(currentScroll, "temp"));
+      
+      this.activeId = temp||'nonull';
 
-      this.activeId = temp;
     },
     clickTapian(url) {
       this.$showBroadcast({

src/views/home/mobile.vue

@@ -67,11 +67,13 @@
       :bgImg="`${this.$cdn}/images/bg_2.jpg`"
       :isTheme="true"
       :txtArr="endTxt"
+      :showMore="false"
     >
     </mSection>
 
     <mSection
       :title="'拓片展示'"
+      :hideJiesuo="true"
       :data="list[6]"
       id="rubbing"
       :bgImg="`${this.$cdn}/images/bg_1.jpg`"
@@ -104,21 +106,6 @@ const endTxt = [
   "我们要以习近平新时代中国特色社会主义思想为指导，发扬“坚定信念、求真务实、一心为民、清正廉洁、艰苦奋斗、争创一流、无私奉献”为主要内涵的苏区精神，用红色税收故事激荡心灵，让红色税收基因世代传承，以红色税收精神凝聚力量，守正创新、砥砺前行，奋力开创新时代税收现代化建设新局面!",
 ];
 
-
-
-const domArr = [
-  "introduce",
-  "preface",
-  "section1",
-  "section2",
-  "section3",
-  "section4",
-  "section5",
-  "end",
-  "rubbing",
-];
-
-
 export default {
   computed: {
     ...mapState({
@@ -142,6 +129,9 @@ export default {
 
     data.data.forEach(i=>{
       i.imgstr = `${this.$cdn}/images/typeimg/${i.type}/${i.img}.png`
+      if (i.hideInHome) {
+        return
+      }
       datas[i.type].push(i)
     })
     return {

src/views/layout/footer.vue

@@ -5,8 +5,8 @@
         川陕苏区税收文物陈列展
       </li>
       <li>
-        <span style="margin-right:40px;">主办方：川陕苏区税收文物陈列展</span>
-        <span>© 2020 川陕苏区税收文物陈列展版权所有</span>
+        <span style="margin-right:40px;">主办方：国家税务总局四川省税务局</span>
+        <span>© 2020 国家税务总局四川省税务局版权所有</span>
       </li>
     </ul>
   </div>

src/views/layout/header.vue

@@ -153,7 +153,7 @@ export default {
   box-shadow: 0 0.08rem 0.42rem rgba(0, 0, 0, 0.8);
   font-size: 0;
   padding: 0;
-  z-index: 99999;
+  z-index: 990;
   position: fixed;
   width: 100%;
   top: 0;

src/views/layout/index.vue

@@ -2,7 +2,7 @@
   <div>
     <mheader />
     <router-view class="route-view" />
-    <div @click="backtotop" v-if="$route.name == 'home'" class="backtotop">
+    <div @click="backtotop" v-if="$route.name == 'home'&&isHideToTop" class="backtotop">
       <img :src="require('@/assets/images/backtotop.png')" alt="">
     </div>
     <mfooter />
@@ -23,6 +23,7 @@ export default {
       showLogin: false,
       userName: "",
       password: "",
+      isHideToTop:false
     };
   },
   watch: {
@@ -47,35 +48,16 @@ export default {
     },
     closeLogin() {
       this.$bus.$emit("showLogin", false);
-    },
-    async login() {
-      let data = {
-        userName: this.userName,
-        password: this.password,
-        from: 'web'
-      };
-      if(!this.userName){
-        return alert('身份码不能为空')
-      }
-      await this.$http.post("/admin/login", data).then((res) => {
-        if (res.code === 0) {
-          window.localStorage.setItem("webtoken", String(res.data.token));
-          window.localStorage.setItem(
-            "webuserInfo",
-            JSON.stringify(res.data.user)
-          );
-          this.userName= ''
-          this.password= ''
-          this.closeLogin()
-          window.location.reload()
-        }
-      });
-    },
+    }
   },
   mounted() {
     this.$bus.$on("showLogin", (data) => {
       this.showLogin = data;
     });
+      this.$bus.$on('isHideToTop',data=>{
+        this.isHideToTop = data
+      })
+
     this.$bus.$on('backtotop',()=>{
       this.backtotop()
     })

src/views/layout/mobile/footer.vue

@@ -2,8 +2,8 @@
   <div class="footer primary">
     <ul>
       <li>川陕苏区税收文物陈列展</li>
-      <li>主办方：川陕苏区税收文物陈列展</li>
-      <li>© 2020 川陕苏区税收文物陈列展版权所有</li>
+      <li>主办方：国家税务总局四川省税务局</li>
+      <li>© 2020 国家税务总局四川省税务局版权所有</li>
     </ul>
   </div>
 </template>

src/views/layout/mobile/header.vue

@@ -25,6 +25,9 @@ export default {
   watch:{
     '$route.meta.id':function(newVal){
       this.activeId = newVal
+    },
+    showMenu(newVal){
+      this.$bus.$emit('toggleVideo',!newVal)
     }
   },
   methods:{
@@ -57,7 +60,11 @@ export default {
 .header{
   background: none;
   color: #fff;
-  position: relative;
+  position: fixed;
+  width: 100%;
+  top: 0;
+  left: 0;
+  z-index: 999;
   .top{
     background: @theme;
     display: flex;

src/views/layout/mobile/index.vue

@@ -32,6 +32,7 @@ export default {
 
 <style lang="less" scoped>
 .route-view{
+  padding-top: 70px;
 }
 
 </style>

src/views/mbdetail/mobile.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dy-con">
-    <video :src="activeItem.video"></video>
+    <video v-show="isShow" autoplay controls loop :src="activeItem.video"></video>
     <div class="back_btn" @click="$router.back()">返回</div>
   </div>
 </template>
@@ -18,10 +18,15 @@ export default {
   data(){
     return {
       list,
-      keyword:''
+      keyword:'',
+      isShow:true
     }
   },
   mounted(){
+      this.$bus.$on('toggleVideo',data=>{
+        this.isShow = data
+      })
+
   },
   computed:{
     activeItem(){
@@ -40,10 +45,11 @@ export default {
 .dy-con{
   width: 100%;
   background: #fff;
-  min-height: 75vh;
+  min-height: 80vh;
   >video{
     width: 90%;
     margin: 60px auto;
+    position: relative;
   } 
 
   .back_btn{
@@ -55,7 +61,6 @@ export default {
     opacity: 1;
     color: #9E9E9E;
     border-radius: 8px;
-
   }
   
 }

src/views/spirit/mobile.vue

@@ -13,6 +13,7 @@
           <span></span>
         </li>
       </ul>
+      <div v-if="list.length<=0" class="no-record">暂无数据</div>
     </div>
   </div>
 </template>
@@ -50,6 +51,8 @@ export default {
   methods:{
     goto(item){
       window.open(item.link,'_blank')
+      window.open('https://houseoss.4dkankan.com/chuanshan/pdfview/generic/web/viewer.html?file='+item.link,'_blank')
+
       // this.$router.push({name:'mbdetail',params:{id:item.id}})
     },
     getCollection(){