Merge branch 'master' of http://192.168.0.115:3000/zhangyupeng/chuanshan_static

.env

@@ -1,3 +1,4 @@
 VUE_APP_MAIN_COLOR=''
 VUE_APP_STATIC_DIR=static
-VUE_APP_PROXY_URL=''
+VUE_APP_PROXY_URL=''
+VUE_APP_CDN='https://houseoss.4dkankan.com/chuanshan'

src/components/jieshuo.vue

@@ -5,10 +5,7 @@
       <span :class="{ active: idx == 2 }" @click="idx = 2">解说：男声</span>
     </div>
     <div>
-      <audio
-        preload="auto"
-        :src="`${$cdn}/audio/testaudio.mp3`"
-      ></audio>
+      <audio preload="auto" :src="`${$cdn}/audio/testaudio.mp3`"></audio>
     </div>
   </div>
 </template>
@@ -26,6 +23,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import "../assets/style/globalVars.less";
 @cdn: "https://houseoss.4dkankan.com/chuanshan";
 
 .commentary {
@@ -34,7 +32,8 @@ export default {
   justify-content: space-between;
   align-items: center;
   display: flex;
-  >div{
+  width: @containerW *0.5;
+  > div {
     position: relative;
     > span {
       display: inline-block;
@@ -63,11 +62,9 @@ export default {
       }
     }
   }
-
 }
 
 .jieshuotheme {
- 
   & /deep/ {
     .ppq-audio-player {
       display: inline-block;
@@ -87,10 +84,10 @@ export default {
       background-size: 100% 100%;
     }
   }
-  >div{
+  > div {
     > span {
-    color: #fff;
-    &::before {
+      color: #fff;
+      &::before {
         content: "";
         display: inline-block;
         background: url("@{cdn}/images/commentaryw@2x.png") no-repeat;
@@ -113,29 +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: .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";
@@ -149,8 +144,8 @@ export default {
       background: url("@{cdn}/images/commentaryw@2x.png") no-repeat;
       background-size: 100%;
       left: -1.25rem;
-      width: .67rem;
-      height: .67rem;
+      width: 0.67rem;
+      height: 0.67rem;
       position: absolute;
       top: 50%;
       transform: translateY(-50%);
@@ -201,8 +196,8 @@ export default {
       background: #fff;
     }
     .ppq-audio-player .player-bar .player-bar-played::after {
-      width: .42rem;
-      height: .42rem;
+      width: 0.42rem;
+      height: 0.42rem;
       background: #f5b55f;
       position: absolute;
       right: -0.33rem;
@@ -222,7 +217,4 @@ export default {
     }
   }
 }
-
-
-
 </style>

src/components/section.vue

@@ -129,6 +129,7 @@ export default {
     position: relative;
     height: 1.75rem;
     margin: 0 auto 1.25rem;
+    width: @containerW;
   
     img {
       width: 2.5rem;

src/components/showMbCollection.vue

@@ -7,6 +7,9 @@
           <div class="show-detail">
             <div class="collection-item" :style="{background:$linear[item.bgid]}">
               <img :src="item.imgstr" alt="" />
+              <div class="button__zoom-normal" @click.stop="zoomPic">
+                <img :src="require(`@/assets/images/zoom@2x.png`)" alt="" />
+              </div>
             </div>
             <div class="show-info">
               <h3>{{item.name}}</h3>
@@ -24,6 +27,19 @@
         </div>
       </div>
     </div>
+    <div
+      v-show="isShowFull"
+      class="full-screen-show"
+      :style="{ background: $linear[item.bgid] }"
+    >
+      <img
+        class="full-screen-show_btn"
+        @click.stop="hideFullPic"
+        :src="require(`@/assets/images/close.png`)"
+        alt
+      />
+      <img class="main-img" :src="item.imgstr" alt="" />
+    </div>
   </div>
 </template>
 <script>
@@ -31,17 +47,47 @@ export default {
   props: ["item"],
   data() {
     return {
+      isShowFull:''
     };
   },
   watch: {
   
   },
+  methods:{
+    zoomPic() {
+      this.isShowFull = true;
+    }
+  },
   mounted() {},
 };
 </script>
 
 <style lang="less" scoped>
 @import "../assets/style/globalVars.less";
+.full-screen-show {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 99999999;
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  .full-screen-show_btn {
+    width: 40px;
+    height: 40px;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+  }
+  img.main-img {
+    max-width: 80%;
+    height: auto;
+  }
+}
 .ui-body {
   top: 50%;
   left: 50%;
@@ -80,6 +126,15 @@ export default {
           width: 1.67rem;
           cursor: pointer;
         }
+        .button__zoom-normal {
+          position: absolute;
+          bottom: 10px;
+          right: 10px;
+          display: block;
+          width: 20px;
+          height: 20px;
+          cursor: pointer;
+        }
        
       .show-info{
           padding: 1.67rem 0;

src/config/pdfdata.js

@@ -1,3 +1,6 @@
+let $cdn = process.env.VUE_APP_CDN
+
+
 const data = [
   {
     id: 1,
@@ -5,7 +8,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/1_dashiji.pdf',
+    link:$cdn+'/pdf/1_dashiji.pdf',
     keyword: '',
     date: '1932年12月-1935年4月'
   },
@@ -15,7 +18,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/2_shiliaoxuanbian.pdf',
+    link:$cdn+'/pdf/2_shiliaoxuanbian.pdf',
     date: '1987年6月'
   },
   {
@@ -24,7 +27,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/3_bowuguanjieshao.pdf',
+    link:$cdn+'/pdf/3_bowuguanjieshao.pdf',
     date: '时间不详'
   },
   {
@@ -33,7 +36,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/4_gongzuolunshu.pdf',
+    link:$cdn+'/pdf/4_gongzuolunshu.pdf',
     date: '2016年3月'
   },
   {
@@ -42,7 +45,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/5_zhengguihuajianshe.pdf',
+    link:$cdn+'/pdf/5_zhengguihuajianshe.pdf',
     date: '2014年'
   },
   {
@@ -51,7 +54,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/6_shiliaoxuanbian.pdf',
+    link:$cdn+'/pdf/6_shiliaoxuanbian.pdf',
     date: '1987年'
   },
   {
@@ -60,7 +63,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/7_huobishi.pdf',
+    link:$cdn+'/pdf/7_huobishi.pdf',
     date: '2003年'
   },
   {
@@ -69,7 +72,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/8_zhengcechutan.pdf',
+    link:$cdn+'/pdf/8_zhengcechutan.pdf',
     date: '2016年'
   },
   {
@@ -78,7 +81,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/9_shiyeshentan.pdf',
+    link:$cdn+'/pdf/9_shiyeshentan.pdf',
     date: '2012年6月'
   },
   {
@@ -87,7 +90,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/10_wuzhuangdouzheng.pdf',
+    link:$cdn+'/pdf/10_wuzhuangdouzheng.pdf',
     date: '2017年'
   },
   {
@@ -96,7 +99,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/11_zhegnquan.pdf',
+    link:$cdn+'/pdf/11_zhegnquan.pdf',
     date: '2014年'
   },
   {
@@ -105,7 +108,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/12_gongzuoyanjiu.pdf',
+    link:$cdn+'/pdf/12_gongzuoyanjiu.pdf',
     date: '2015年3月'
   },
   {
@@ -114,7 +117,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/13_youpiao.pdf',
+    link:$cdn+'/pdf/13_youpiao.pdf',
     date: '2015年2月'
   },
   {
@@ -123,7 +126,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/14_shyikebiaoyu.pdf',
+    link:$cdn+'/pdf/14_shyikebiaoyu.pdf',
     date: '时间不详'
   },
   {
@@ -132,7 +135,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/15_shuishou.pdf',
+    link:$cdn+'/pdf/15_shuishou.pdf',
     date: '2006年10月'
   },
   {
@@ -141,7 +144,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/16_maoyiyanjiu.pdf',
+    link:$cdn+'/pdf/16_maoyiyanjiu.pdf',
     date: '2017年3月17日'
   },
   {
@@ -150,7 +153,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/17_suquqianbi.pdf',
+    link:$cdn+'/pdf/17_suquqianbi.pdf',
     date: '1996年'
   },
   {
@@ -159,7 +162,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/18_tedianfenxi.pdf',
+    link:$cdn+'/pdf/18_tedianfenxi.pdf',
     date: '2018年7月16日'
   },
   {
@@ -168,7 +171,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/19_gemingshuping.pdf',
+    link:$cdn+'/pdf/19_gemingshuping.pdf',
     date: '2014年1月29日'
   },
   {
@@ -177,7 +180,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/20_tongbi.pdf',
+    link:$cdn+'/pdf/20_tongbi.pdf',
     date: '时间不详'
   },
   {
@@ -186,7 +189,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/21_yankao.pdf',
+    link:$cdn+'/pdf/21_yankao.pdf',
     date: '1994年'
   },
   {
@@ -195,7 +198,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/22_futou.pdf',
+    link:$cdn+'/pdf/22_futou.pdf',
     date: '时间不详'
   },
   {
@@ -204,7 +207,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/23_hongseshuishou.pdf',
+    link:$cdn+'/pdf/23_hongseshuishou.pdf',
     date: '时间不详'
   },
   {
@@ -213,7 +216,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/24_youshisikao.pdf',
+    link:$cdn+'/pdf/24_youshisikao.pdf',
     date: '2019年2月'
   },
   {
@@ -222,7 +225,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/25_genjudichuangjian.pdf',
+    link:$cdn+'/pdf/25_genjudichuangjian.pdf',
     date: '2002年'
   },
   {
@@ -231,7 +234,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/26_xuanchuancehlue.pdf',
+    link:$cdn+'/pdf/26_xuanchuancehlue.pdf',
     date: '2009年11月'
   },
   {
@@ -240,7 +243,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/27_baodaogongzuo.pdf',
+    link:$cdn+'/pdf/27_baodaogongzuo.pdf',
     date: '2017年'
   },
   {
@@ -249,7 +252,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/28_zuchengbufen.pdf',
+    link:$cdn+'/pdf/28_zuchengbufen.pdf',
     date: '2017年'
   },
   {
@@ -258,7 +261,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/29_zhengcetezheng.pdf',
+    link:$cdn+'/pdf/29_zhengcetezheng.pdf',
     date: '2013年6月13日'
   },
   {
@@ -267,7 +270,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/30_lishiqishi.pdf',
+    link:$cdn+'/pdf/30_lishiqishi.pdf',
     date: '2007年2月'
   },
   {
@@ -276,7 +279,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/31_jianshesikao.pdf',
+    link:$cdn+'/pdf/31_jianshesikao.pdf',
     date: '2015年'
   },
   {
@@ -285,7 +288,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/32_zhongyaotedian.pdf',
+    link:$cdn+'/pdf/32_zhongyaotedian.pdf',
     date: '2014年'
   },
   {
@@ -294,7 +297,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/33_jieyanyundong.pdf',
+    link:$cdn+'/pdf/33_jieyanyundong.pdf',
     date: '2016年9月25日'
   },
   {
@@ -303,7 +306,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/34_juxianxing.pdf',
+    link:$cdn+'/pdf/34_juxianxing.pdf',
     date: '2005年10月10日'
   },
   {
@@ -312,7 +315,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/35_chenlieguan.pdf',
+    link:$cdn+'/pdf/35_chenlieguan.pdf',
     date: '2008年'
   },
   {
@@ -321,7 +324,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/36_tedianqishi.pdf',
+    link:$cdn+'/pdf/36_tedianqishi.pdf',
     date: '2002年6月5日'
   },
   {
@@ -330,7 +333,7 @@ const data = [
     describe: '描述',
     content: '内容',
     type:'类型',
-    link:'https://houseoss.4dkankan.com/chuanshan/pdf/37_tudigeming.pdf',
+    link:$cdn+'/pdf/37_tudigeming.pdf',
     date: '2012年'
   }
 

src/config/videodata.js

@@ -0,0 +1,16 @@
+let $cdn = process.env.VUE_APP_CDN
+
+const data = [
+  {
+    id: 1,
+    name: '红军税务后人采访', 
+    describe: '视频介绍视频介绍视频介绍视频介绍',
+    content: '内容',
+    type:'类型',
+    video: $cdn + "/video/testVideo.mp4",
+    keyword: '',
+    date: '1932年12月-1935年4月'
+  }
+]
+
+export default { data }

src/main.js

@@ -20,7 +20,7 @@ Vue.use(vuex);
 Vue.prototype.$http = axios;
 Vue.prototype.$serverName = serverName;
 Vue.prototype.$orginLink = orginLink;
-Vue.prototype.$cdn = "https://houseoss.4dkankan.com/chuanshan";
+Vue.prototype.$cdn = process.env.VUE_APP_CDN;
 
 Vue.config.productionTip = false;
 Vue.prototype.$bus = new Vue();

src/views/mbdetail/mobile.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="dy-con">
-    <iframe :src="activeItem.link" frameborder="0"></iframe>
+    <video :src="activeItem.video"></video>
+    <div class="back_btn" @click="$router.back()">返回</div>
   </div>
 </template>
 
 <script>
-import data from "@/config/pdfdata.js";
+import data from "@/config/videodata.js";
 
 const list = []
 
@@ -25,6 +26,7 @@ export default {
   computed:{
     activeItem(){
       let tmp = data.data.find(item=>item.id == this.$route.params.id)
+      console.log(tmp);
       return tmp
     }
   },
@@ -38,11 +40,23 @@ export default {
 .dy-con{
   width: 100%;
   background: #fff;
-  >iframe{
-    width: 100%;
-    height: 100%;
+  min-height: 75vh;
+  >video{
+    width: 90%;
+    margin: 60px auto;
+  } 
+
+  .back_btn{
+    width: 100px;
+    margin: 0 auto;
+    line-height: 40px;
+    height: 40px;
+    background: #E3E3E3;
+    opacity: 1;
+    color: #9E9E9E;
+    border-radius: 8px;
+
   }
- 
   
 }
 

src/views/spirit/index.vue

@@ -14,7 +14,10 @@
           </div>
         </div>
       </div>
-      <ul class="spirit-list">
+      <ul
+        class="spirit-list"
+        v-show="filterList && filterList.length === 0 && !isSearch"
+      >
         <li class="item" v-for="(item, i) in list" :key="i">
           <a
             class="item-title"
@@ -32,6 +35,30 @@
           </a>
         </li>
       </ul>
+      <ul class="spirit-list" v-show="filterList && filterList.length > 0">
+        <li class="item" v-for="(item, i) in filterList" :key="i">
+          <a
+            class="item-title"
+            :href="item.link ? item.link : ''"
+            target="_blank"
+            ><span>{{ item.name }}</span>
+          </a>
+          <div class="item-title-subtitle">{{ item.date }}</div>
+          <a
+            class="readmore"
+            :href="item.link ? item.link : ''"
+            target="_blank"
+          >
+            <span>查看更多</span>
+          </a>
+        </li>
+      </ul>
+      <div
+        class="empty"
+        v-show="keyword && keyword.length > 0 && filterList.length === 0"
+      >
+        查无资料显示！
+      </div>
     </div>
   </div>
 </template>
@@ -41,8 +68,6 @@ import mSidebar from "@/components/Sidebar";
 import Article from "@/components/Article";
 import data from "@/config/pdfdata.js";
 
-const list = [];
-
 export default {
   components: {
     mSidebar,
@@ -52,11 +77,13 @@ export default {
     return {
       activeId: this.$route.query.id,
       activeItem: "",
-      list,
+      list: [],
+      filterList: [],
       keyword: "",
       currentPage: 0,
       pageCount: 0,
       searchKey: "",
+      isSearch: false,
     };
   },
   mounted() {
@@ -72,7 +99,24 @@ export default {
     },
   },
   methods: {
-    getCollection() {},
+    getCollection() {
+      this.isSearch = true;
+      const filterList = this.list.filter((item) => {
+        const name = item.name;
+        const keyword = item.keyword || "";
+        const searchkeyWord = this.keyword.split(" ").join("");
+        if (
+          name.indexOf(searchkeyWord) > -1 ||
+          keyword.indexOf(searchkeyWord) > -1
+        ) {
+          return true;
+        }
+        return false;
+      });
+      this.filterList = filterList;
+      console.log(this.filterList);
+      // debugger
+    },
     handleItem(item) {
       this.activeId = item.id;
     },
@@ -81,7 +125,7 @@ export default {
     },
     async getNews() {
       this.list = data.data;
-      console.log("dasdas", this.list);
+      // console.log("dasdas", this.list);
 
       this.list.forEach((item) => {
         if (item.id == this.activeId) {
@@ -106,11 +150,9 @@ export default {
   .dynamic {
     position: relative;
     padding: 3.33rem 0;
-   width: @containerW;
+    width: @containerW;
     margin: 3.25rem auto 0;
-
-    
-    }
+  }
 }
 .search-area {
   width: 80%;
@@ -122,15 +164,15 @@ export default {
     background: #fff;
     width: 400px;
     position: relative;
-    .search-btn{
+    .search-btn {
       height: 48px;
-      position:absolute;
+      position: absolute;
       right: 0;
-      top:0;
+      top: 0;
       display: flex;
       justify-content: center;
       align-items: center;
-      img{
+      img {
         width: 22px;
         height: 22px;
       }
@@ -198,4 +240,10 @@ export default {
     }
   }
 }
-</style>
+.empty {
+  display: block;
+  padding: 200px 0;
+  color: black;
+  text-align: center;
+}
+</style>

src/views/spirit/mobile.vue

@@ -53,7 +53,9 @@ export default {
       // this.$router.push({name:'mbdetail',params:{id:item.id}})
     },
     getCollection(){
-
+      this.list = data.data.filter(item=>{
+        return item.name.indexOf(this.keyword) > -1
+      })
     },
     handleItem(item){
       this.activeId = item.id
@@ -93,6 +95,7 @@ export default {
     }
   .dcon{
       border-top: 1px solid #E3E3E3;
+      min-height: 80vh;
       >ul{
         width: 90%;
         display: inline-block;