Merge branch 'master' of https://gitee.com/gzcnki/exhibition_page

src/App.vue

@@ -23,6 +23,13 @@ export default {
       headerFixed: false,
     };
   },
+  mounted() {
+    // 关闭浏览器窗口的时候清空浏览器缓存在localStorage的数据
+    // window.onbeforeunload = function (e) {
+    //   var storage = window.localStorage;
+    //   storage.clear()
+    // }
+  }
 };
 </script>
 <style lang="scss">

src/api/culturalRelic.js

@@ -41,3 +41,13 @@ export function getRecommendCr(params) {
     params
   })
 }
+
+// 获取存在文物的字典
+export function getCrExistDict(params) {
+  return request({
+    url: '/bizCulturalRelic/existDict',
+    method: 'get',
+    params
+  })
+}
+

src/api/display.js

@@ -23,3 +23,11 @@ export function getRecommendDisplay(params){
     params
   })
 }
+
+export function getDisplayExistDict(params){
+  return request({
+    url: '/bizExhibition/existDict',
+    method: 'get',
+    params
+  })
+}

src/assets/fonts/font.css

@@ -12,3 +12,8 @@
     font-family: 'SourceHanSerifCN-Bold';
     src: url('./SourceHanSerifCN-Bold-2.otf');
 }
+
+@font-face {
+    font-family: 'PangMenZhengDaoCuShuTi';
+    src: url('./PangMenZhengDaoCuShuTi-2.ttf');
+}

src/assets/styles/index.scss

@@ -74,3 +74,17 @@ li {
   flex-direction: column;
   align-items: center;
 }
+
+.el-pager {
+
+  .btn-quicknext,.number {
+    background: transparent !important;
+    border: 1px solid $themeColor  !important;
+    color: $themeColor  !important;
+  }
+
+  .number.active {
+    background: $themeColor  !important;
+    color: #b7b7b7 !important;
+  }
+}
\ No newline at end of file

src/components/ListBanner/index.vue

@@ -6,11 +6,11 @@
       </div>
       <div class="text">{{ title }}</div>
     </div> -->
-    <div class="total" >
-      <div class="total-title">{{title}}</div>
+    <div class="total">
+      <div class="total-title">{{ title }}</div>
       <div class="amount">
-        <span class="num">{{num}}</span>
-        <span class="unit">{{unit}}</span>
+        <span class="num">{{ num }}</span>
+        <span class="unit">{{ unit }}</span>
       </div>
     </div>
     <!-- <div class="banner-1">
@@ -30,11 +30,11 @@ export default {
       type: String,
       default: "标题",
     },
-    num:{
-      type: String,
+    num: {
+      type: [String, Number],
       default: '0',
     },
-    unit:{
+    unit: {
       type: String,
       default: '个',
     },
@@ -47,11 +47,12 @@ export default {
   width: 100%;
   height: 360px;
   position: relative;
-  background-image: linear-gradient(to right,$themeColor,rgba($themeColor, 0.9),$themeColor);
+  background-image: linear-gradient(to right, $themeColor, rgba($themeColor, 0.9), $themeColor);
   padding: 0 13%;
   display: flex;
   align-items: center;
   justify-content: space-between;
+
   // height: 222px;
   // background-image: url("@/assets/imgs/list/banner2.png");
   // background-size:100% 100%;
@@ -71,18 +72,22 @@ export default {
     .total-title {
       font-size: 28px;
     }
+
     .amount {
 
       font-weight: bold;
-      .num{
+
+      .num {
         font-size: 56px;
         font-family: $puHuiTi;
       }
-      .unit{
+
+      .unit {
         font-size: $font-size-base;
       }
     }
   }
+
   // .banner-1 {
   //   position: absolute;
   //   left: 620px;
@@ -100,25 +105,30 @@ export default {
     // top: 54%;
     margin-top: 30px;
     width: 520px;
+
     img {
       width: 100%;
       height: 100%;
     }
   }
+
   .title {
     padding: 0 13%;
     display: flex;
     align-items: flex-end;
+
     .img-container {
       width: 58px;
       height: 58px;
       margin-right: 26px;
+
       img {
         width: 100%;
         height: 100%;
         object-fit: contain;
       }
     }
+
     .text {
       font-size: 28px;
       font-weight: 400;

src/components/NavBar/index.vue

@@ -5,8 +5,8 @@
       'header-fixed ': isFixed,
       'home-nav': isHome || isBoutique,
       'show-themeColor':isFixed&&isHome,
-      isChStyle: navbarStyle == '2' && isFixed,
-      isRedStyle: navbarStyle == '3'&& isFixed,
+      isChStyle: navbarStyle == '2' ,
+      isRedStyle: navbarStyle == '3',
       isSDCS: navbarStyle == '4'&& isFixed,
       isSMGZ: navbarStyle == '5'&& isFixed,
       isJYYCC: navbarStyle == '6'&& isFixed,

src/components/SlideImage/index.vue

@@ -13,7 +13,7 @@
             v-for="(item, index) in imgList"
             :key="index"
           >
-            <img :src="item.pressUrl" alt="" />
+            <img :src="$getFullUrl(item.pressUrl)" alt="" />
             <div class="enlarge" @click="handelPreviewImages(imgList)">
               <img src="@/assets/imgs/enlarge-s.png" alt="" />
             </div>
@@ -39,7 +39,7 @@
             v-for="(item, index) in imgList"
             :key="index"
           >
-            <img :src="item.pressUrl" alt="" />
+            <img :src="$getFullUrl(item.pressUrl)" alt="" />
           </swiper-slide>
         </swiper>
       </div>

src/components/SlideImageGroup/index.vue

@@ -13,18 +13,18 @@
           @click="handleClickItem(item)"
         >
           <!-- <img :src="item.pressUrl || item.faceImagePressUrl" alt="" /> -->
-          <div class="img-container">
+          <div class="img-container" @click="handelPreviewImages(imgList)">
             <slot name="img" :item="item"></slot>
           </div>
           <slot name="info" :item="item" />
-          <div
+          <!-- <div
             class="enlarge"
             @click="handelPreviewImages(imgList)"
             v-if="needEnlarge"
           >
             <img src="@/assets/imgs/enlarge-s.png" alt="" />
             <span>查看大图</span>
-          </div>
+          </div> -->
         </swiper-slide>
         <div class="swiper-pagination" slot="pagination"></div>
         <div class="swiper-button-next swiper-button-white" slot="button-next">
@@ -142,6 +142,7 @@ export default {
     // height: 100%;
     background: #f5f5f9;
     height: 200px;
+    cursor: pointer;
     img {
       width: 100%;
       height: 100%;
@@ -183,6 +184,10 @@ export default {
     margin-right: 4px;
   }
 }
+
+::v-deep .swiper-pagination-bullets{
+  bottom: 0;
+}
 </style>
      
      

src/components/VideoPlayer/index.vue

 <template>
   <div class="m-video">
-    <video-player
-      ref="videoPlayer"
-      @play="autoIncrement"
-      @timeupdate="onPlayerTimeupdate($event)"
-      @ready="playerReadied"
-      :playsinline="true"
-      :options="playerOptions"
-    >
+    <video-player ref="videoPlayer" @play="autoIncrement" @timeupdate="onPlayerTimeupdate($event)"
+      @ready="playerReadied" :playsinline="true" :options="playerOptions">
     </video-player>
   </div>
 </template>
@@ -20,6 +14,17 @@ export default {
       default: "",
     },
   },
+  computed: {
+    player() {
+      return this.$refs.videoPlayer.player
+    },
+  },
+  watch:{
+    src(newSrc){
+      console.log('newSrc',newSrc);
+      this.toggle(newSrc)
+    }
+  },
   data() {
     return {
       playerOptions: {
@@ -71,7 +76,11 @@ export default {
       let player = this.$refs.videoPlayer.player;
       player.play();
     },
-    playerReadied(player) {},
+    playerReadied(player) { },
+
+    toggle(newSrc){
+      this.player.src(newSrc)
+    }
   },
 };
 </script>
@@ -79,16 +88,20 @@ export default {
 <style lang="scss" scoped>
 .m-video {
   height: 100%;
+
   ::v-deep .video-player {
     height: 100%;
+
     .video-js {
       video {
-        object-fit: fill;
+        // object-fit: fill;
       }
+
       &.vjs-fluid {
         height: 100% !important;
         padding-top: 0;
       }
+
       .vjs-big-play-button {
         left: 50%;
         top: 50%;
@@ -101,6 +114,7 @@ export default {
           font-weight: normal;
           font-style: normal;
         }
+
         .vjs-icon-custombutton:before {
           content: "\f108";
           font-size: 1.8em;

src/store/modules/user.js

@@ -53,14 +53,20 @@ const actions = {
         const {
           data
         } = response
+        if (data) {
           commit('SET_TOKEN', data.accessToken)
           commit('SET_NAME', data.username)
           commit('SET_USERINFO', data)
           setToken(data.accessToken)
           setUserInfo(data)
-        // window.location.reload()
           resolve(response)
-        // window.location.reload()
+        }
+        
+        // else{
+        //   console.log('222',response);
+        //   resolve(response)
+        // }
+
       }).catch(error => {
         reject(error)
       })

src/utils/request.js

@@ -65,6 +65,12 @@ service.interceptors.response.use(
       //     // window.location.reload()
       //   })
       // }
+      // 单独处理登录接口，如果验证码输错
+      // if (response.config.url === 'sys/user/login' && res.code == 500002) {
+      //   console.log(1111,res);
+      //   return Promise.resolve(res)
+      // }
+      // console.log(response.config);
       return Promise.reject(new Error(res.msg || 'Error'))
     } else {
       return res
@@ -80,7 +86,7 @@ service.interceptors.response.use(
     messageup({
       type: 'error',
       showClose: true,
-      message:error.msg || '网络连接错误，请稍后重试'
+      message: error.msg || '网络连接错误，请稍后重试'
     })
     return Promise.reject(error)
   }

src/views/boutique/components/SMGZ.vue

@@ -164,7 +164,7 @@
                   @click="handleToCr(item.crId)"
                 >
                   <div class="img-container">
-                    <img :src="item.url" alt="" />
+                    <img :src="$getFullUrl(item.url)" alt="" />
                   </div>
                   <div class="cr-name">{{ item.name }}</div>
                 </div>

src/views/boutique/data.js

@@ -2,42 +2,42 @@ export var crPics = [
     [
         {
             name: "邓氏贵州鱼龙（模式标本）",
-            crId: "dac1984d5ca74f48b6183ff4525f180c",
+            crId: "b84f45c2a63144dca9c909080b5e9aa4",
             index: "2",
-            url: "http://222.85.214.245:9603/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/1/low/2.%E9%82%93%E6%B0%8F%E8%B4%B5%E5%B7%9E%E9%B1%BC%E9%BE%99%EF%BC%88%E6%A8%A1%E5%BC%8F%E6%A0%87%E6%9C%AC%EF%BC%89.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/2邓氏贵州鱼龙/low/2邓氏贵州鱼龙.png",
         },
         {
             name: "梁氏关岭鱼龙（怀孕）",
-            crId: "6737746fb5af4324b5f8c0017837c5d1",
+            crId: "f7cc9c7c014e4031baf7112e1bc3a7d4",
             index: "1",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/21/low/20.梁氏关岭鱼龙（怀孕）.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/22梁氏关岭鱼龙（怀孕）/low/22梁氏关岭鱼龙-怀孕.png"
         },
 
         {
             name: "美丽瓦窑龙（模式标本）",
-            crId: "adabb46a077e48a98d57135f6c640d65",
+            crId: "9ce8a18374ef4ffeabe802eef6dd7382",
             index: "3",
-            url: "http://222.85.214.245:9603/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/2/low/%E7%BE%8E%E4%B8%BD%E7%93%A6%E7%AA%91%E9%BE%99%EF%BC%88%E6%A8%A1%E5%BC%8F%E6%A0%87%E6%9C%AC%EF%BC%89.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/3美丽瓦窑龙/low/3美丽瓦窑龙.png"
         },
     ],
     [
         {
             name: "许氏创孔海百合",
-            crId: "fffa08c7843544b89abf1f053d2f10dc",
+            crId: "682fbd7e08cb45b99706ca0d4259b1ac",
             index: "1",
-            url: "http://222.85.214.245:9603/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/9/low/8.%E8%AE%B8%E6%B0%8F%E5%88%9B%E5%AD%94%E6%B5%B7%E7%99%BE%E5%90%88%EF%BC%88106%E3%8E%A1%EF%BC%89.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/10许氏创孔海百合/low/10许氏创孔海百合.png",
         },
         {
             name: "黄果树安顺龙",
-            crId: "675dc67d064440f4aa5e51548e9a3c24",
+            crId: "37c4811384f94f6aa062f4f761271f50",
             index: "2",
-            url: "http://222.85.214.245:9603/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/25/low/24.%E9%BB%84%E6%9E%9C%E6%A0%91%E5%AE%89%E9%A1%BA%E9%BE%99.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/26黄果树安顺龙/low/26黄果树安顺龙.png",
         },
         {
             name: "杨氏幻龙",
-            crId: "60749f07723842cf85e2493978c761f4",
+            crId: "1839cfacdcb346e4ad6d3ea73ed4f60e",
             index: "3",
-            url: "http://222.85.214.245:9603/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/15/low/14.%E6%9D%A8%E6%B0%8F%E5%B9%BB%E9%BE%99.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/16杨氏幻龙/low/16杨氏幻龙.png",
         },
     ],
 
@@ -45,41 +45,41 @@ export var crPics = [
     [
         {
             name: "兴义欧龙",
-            crId: "5b4536ede4494a8f97113b6712575c56",
+            crId: "bed4641bca86425f92f0b02d5f317f11",
             index: "1",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/14/low/13.兴义欧龙.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/15兴义欧龙/low/15兴义欧龙.png"
         },
         {
             name: "盘县混鱼龙",
-            crId: "09690224efc440d5bc54d11d1a961625",
+            crId: "e9eff2eeb2bc41b3ac60fefe5f9aaff6",
             index: "2",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/32/low/30.盘县混鱼龙.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/33盘县混鱼龙/low/33盘县混鱼龙.png"
         },
         {
             name: "东方恐头龙",
-            crId: "1f48d2c232b74f0ab0037f99a07a1c4d",
+            crId: "1a2062f74b9840dc9e0cb27f00bc6e25",
             index: "3",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/24/low/23.东方恐头龙.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/25东方恐头龙/low/25东方恐头龙.png"
         },
     ],
     [
         {
             name: "孙氏新铺龙（模式标本 副型）",
-            crId: "25d19df6dedc4df794026e134df6ff3e",
+            crId: "1a2062f74b9840dc9e0cb27f00bc6e25",
             index: "1",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/5/low/5.孙氏新铺龙（模式标本）.png",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/25东方恐头龙/low/25东方恐头龙.png",
         },
         {
             name: "乌沙安顺龙",
-            crId: "2bfefcd0a262402297bd2b1c43766e8f",
+            crId: "5421ad9aa1fa459c84ff5e3796f53a97",
             index: "2",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/16/low/16.乌沙安顺龙.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/18乌沙安顺龙/low/18乌沙安顺龙.png",
         },
         {
             name: "羊圈幻龙",
-            crId: "5bf5a31036f2446ba346dd5f1a47c028",
+            crId: "248fcf3ecf734f5da8bddbbaa1a92d52",
             index: "3",
-            url: "http://222.85.214.245:9604/files/culturalRelicImport/2022-09-28-4495f59768b14b0b843dbdab965ac34e/faceImage/13/low/12.羊圈幻龙.jpg",
+            url: "http://114.115.157.218:9604/files/culturalRelicImport/2022-11-10-4ee6bcf5688145b78f8a4ee377cc638a/贵州省地质博物馆文物1/faceImage/14羊圈幻龙/low/14羊圈幻龙.png",
         },
     ],
 ]

src/views/boutique/index.vue

 <template>
   <div class="boutique">
-    <!-- <div class="boutique-header">
+    <div class="boutique-header">
       <img src="@/assets/imgs/boutique/banner.jpg" width="100%" />
       <ul class="tabs">
         <li v-for="node in tabs" :key="node.tab" @click="handleTabClick(node)">
@@ -9,34 +9,30 @@
           </div>
         </li>
       </ul>
-    </div> -->
+    </div>
     <!-- <ul class="fixed-tabs">
       <li v-for="node in tabs" :key="node.tab" @click="handleTabClick(node)">
         <div class="tab-container">
-          <img
-            :src="
+          <img :src="
             require(`@/assets/imgs/boutique/smgz/7_leftBar/${node.tab}.png`)
-            "
-            alt=""
-          />
+          " alt="" />
           <span class="name">{{ node.name }}</span>
         </div>
       </li>
     </ul> -->
-    <div class="boutique-tabs">
+    <!-- <div class="boutique-tabs">
       <m-tabs @handleClickItem="handleClickItem"></m-tabs>
-    </div>
+    </div> -->
 
     <div class="boutique-content" ref="boutiqueContent">
       <div class="focus-content" v-if="activeTab">
-        <p v-if="activeTab == 'cjm'" style="display: flex; justify-content: center">
+        <!-- <p v-if="activeTab == 'cjm'" style="display: flex; justify-content: center">
           长角苗民俗及文化遗产
-        </p>
-        <SMGZ v-else-if="activeTab == 'smgz'" />
+        </p> -->
+        <SMGZ v-if="activeTab == 'smgz'" />
+        <YLGDYW v-else-if="activeTab == 'ylgdyw'" />
         <div v-else class="img-container">
-          <img :src="
-            require(`@/assets/imgs/boutique/${activeTab}.jpg`) ||
-            require(`@/assets/imgs/boutique/${activeTab}.png`)
+          <img :src="require(`@/assets/imgs/boutique/${activeTab}.jpg`)
           " alt="" />
         </div>
       </div>
@@ -47,18 +43,21 @@
 <script>
 import mTabs from '@/views/home/components/Boutique.vue'
 import SMGZ from "./components/SMGZ";
+import YLGDYW from "./components/YLGDYW";
 import { mapGetters } from "vuex";
 export default {
   name: "Boutique",
-  components: { SMGZ, mTabs },
+  components: { mTabs, SMGZ, YLGDYW, },
   data() {
     return {
       tabs: [
-        { tab: "sdcs", name: "四渡赤水出奇兵" },
         { tab: "smgz", name: "神秘贵州" },
-        { tab: "jyycc", name: "记忆与传承" },
         { tab: "ylgdyw", name: "夜郎国的疑问" },
-        { tab: "cjm", name: "长角苗民俗及文化遗产" },
+        { tab: "jyycc", name: "记忆与传承" },
+        { tab: "sdcs", name: "四渡赤水出奇兵" },
+        { tab: "lzsg", name: "六枝梭戛" },
+        { tab: "zggz", name: "中共贵州省工委斗争纪略展" },
+        { tab: "gzjy", name: "贵州教育使馆" },
       ],
       activeTab: "",
 
@@ -108,28 +107,28 @@ export default {
     },
   },
   mounted() {
-    this.activeTab = "sdcs";
+    this.activeTab = "smgz";
   },
   methods: {
-    // handleTabClick(data) {
-    // this.activeTab = data.tab;
-    // let el = document.getElementsByClassName("boutique-header")[0];
-    // let height = el.offsetHeight - this.navbarHeight; //5像素偏移量
-    // document.documentElement.scroll({
-    //   top: height,
-    //   behavior: "smooth", // 平滑移动
-    // });
-    // },
-
-    handleClickItem(key) {
-      this.activeTab = key
-      let el = document.getElementsByClassName("boutique-tabs")[0];
+    handleTabClick(data) {
+      this.activeTab = data.tab;
+      let el = document.getElementsByClassName("boutique-header")[0];
       let height = el.offsetHeight - this.navbarHeight; //5像素偏移量
       document.documentElement.scroll({
         top: height,
         behavior: "smooth", // 平滑移动
       });
-    }
+    },
+
+    // handleClickItem(key) {
+    //   this.activeTab = key
+    //   let el = document.getElementsByClassName("boutique-tabs")[0];
+    //   let height = el.offsetHeight - this.navbarHeight; //5像素偏移量
+    //   document.documentElement.scroll({
+    //     top: height,
+    //     behavior: "smooth", // 平滑移动
+    //   });
+    // }
   },
 };
 </script>
@@ -138,17 +137,20 @@ export default {
 .boutique {
   min-height: calc(100% - 300px);
 
-  // .boutique-header {
-  //   position: relative;
-  //   overflow: hidden;
-  //   > img {
-  //     height: 500px;
-  //     object-fit: cover;
-  //   }
-  // }
+  .boutique-header {
+    position: relative;
+    overflow: hidden;
+
+    >img {
+      height: 500px;
+      object-fit: cover;
+    }
+  }
+
   .boutique-tabs {
     width: 100%;
     height: 100vh;
+    cursor: pointer;
   }
 
   .fixed-tabs {
@@ -242,60 +244,67 @@ export default {
     }
   }
 
-  // ul.tabs {
-  //   display: flex;
-  //   justify-content: space-between;
-  //   position: absolute;
-  //   z-index: 1;
-  //   padding: 10px 0;
-  //   width: 100%;
-  //   bottom: 0;
-
-  //   > li {
-  //     flex: 1;
-  //     > div {
-  //       text-align: center;
-  //       > span {
-  //         font-size: 20px;
-  //         color: #333;
-  //         font-weight: 600;
-  //         font-family: "楷体";
-  //         &:hover {
-  //           cursor: pointer;
-  //           position: relative;
-  //           color: #003fa7;
-  //           &::after {
-  //             content: "";
-  //             position: absolute;
-  //             left: 0;
-  //             width: 100%;
-  //             bottom: -10px;
-  //             border-bottom: 3px solid $themeColor;
-  //             border-radius: 30px;
-  //           }
-  //         }
-  //       }
+  ul.tabs {
+    display: flex;
+    justify-content: space-between;
+    position: absolute;
+    z-index: 1;
+    padding: 10px 0;
+    width: 100%;
+    bottom: 0;
+
+    >li {
+      flex: 1;
+
+      >div {
+        text-align: center;
+
+        >span {
+          font-size: 20px;
+          color: #333;
+          font-weight: 600;
+          font-family: "楷体";
+
+          &:hover {
+            cursor: pointer;
+            position: relative;
+            color: #003fa7;
+
+            &::after {
+              content: "";
+              position: absolute;
+              left: 0;
+              width: 100%;
+              bottom: -10px;
+              border-bottom: 3px solid $themeColor;
+              border-radius: 30px;
+            }
+          }
+        }
+
+        &.active {
+          >span {
+            position: relative;
+            color: #003fa7;
+            text-shadow: 6px 2px 2px #999;
+
+            &::after {
+              content: "";
+              position: absolute;
+              left: 0;
+              width: 100%;
+              bottom: -10px;
+              border-bottom: 3px solid $themeColor;
+              border-radius: 30px;
+            }
+          }
+        }
+      }
+    }
+  }
 
-  //       &.active {
-  //         > span {
-  //           position: relative;
-  //           color: #003fa7;
-  //           text-shadow: 6px 2px 2px #999;
-  //           &::after {
-  //             content: "";
-  //             position: absolute;
-  //             left: 0;
-  //             width: 100%;
-  //             bottom: -10px;
-  //             border-bottom: 3px solid $themeColor;
-  //             border-radius: 30px;
-  //           }
-  //         }
-  //       }
-  //     }
-  //   }
-  // }
   .boutique-content {
+
     .focus-content {
       // padding: 20px 0;
       // margin: 20px;
@@ -306,7 +315,7 @@ export default {
       // justify-content: center;
       // align-items: center;
       font-size: 30px;
-      font-weight: 600;
+      // font-weight: 600;
       // background: rgb(239 247 255);
 
       >p {

src/views/display/Detail.vue

 <template>
   <div class="display-detail">
-    <BlueStyle
+    <NormalStyle
       v-if="displayDetail.themeType == '1'"
       :displayDetail="displayDetail"
       :dicts="dicts"
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import BlueStyle from "./components/BlueStyle.vue";
+import NormalStyle from "./components/NormalStyle.vue";
 // import NormalStyle from "./components/NormalStyle.vue";
 import ChStyle from "./components/ChStyle.vue";
 import RedStyle from "./components/RedStyle.vue";
@@ -30,7 +30,7 @@ import { getDisplayById } from "@/api/display";
 import { mapGetters } from "vuex";
 export default {
   components: {
-    BlueStyle,
+    NormalStyle,
     ChStyle,
     RedStyle,
   },

src/views/display/components/ChStyle.vue

@@ -184,7 +184,7 @@
             v-for="(item, index) in displayDetail.virtualVo"
             :key="index"
           >
-            <img :src="item.faceImagePressUrl" alt="" />
+            <img :src="$getFullUrl(item.faceImagePressUrl)" alt="" />
             <div class="modal">
               <svg-icon icon-class="360"></svg-icon>
               <div class="name">点击进入{{ item.name }}</div>

src/views/display/components/ChStyleUnit.vue

@@ -108,6 +108,7 @@ export default {
     border: 3px solid rgb(139 123 90);
     box-shadow: 9px 20px 10px rgb(0 0 0 / 30%);
     height: 660px;
+    overflow: hidden;
     
     li {
       // margin-bottom: 20px;
@@ -197,7 +198,7 @@ export default {
         transition: 0.6s;
         filter: sepia(0.6);
         position: relative;
-
+        background: rgba(171, 147, 94, 0.3);
         > .unit-content {
           padding: 10px 30px;
           flex: 1;