完善剩余两个主题；修改菜单名称

src/components/Breadcrumb/index.vue

@@ -24,11 +24,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-breadcrumb__inner{
-    color:#aaa;
+    color:#666;
+    font-size: 18px;
 }
 
 ::v-deep .el-breadcrumb__item:last-child .el-breadcrumb__inner{
-    color: #666;
+    color: $themeColor;
 }
 
 ::v-deep .el-breadcrumb__inner.is-link:hover{

src/components/Footer/index.vue

@@ -4,7 +4,7 @@
     :class="{
       footer: true,
       //isHome:isHome,
-      //isChStyle: navbarStyle == '2',
+      isChStyle: navbarStyle == '2',
       isRedStyle: navbarStyle == '3',
       isSDCS: navbarStyle == '4',
       isSMGZ: navbarStyle == '5',
@@ -227,7 +227,9 @@ export default {
   }
 }
 .isChStyle {
-  background-color: #892325 !important;
+  background-color: #194448 !important;
+  position: relative;
+  top: -$nav-height;
 }
 .isRedStyle {
   background-color: #813525 !important;

src/components/NavBar/index.vue

@@ -6,7 +6,7 @@
       'header-fixed ': isFixed,
       // 'header-absolute': isHome || isBoutique,
       //'show-themeColor': isFixed && isHome,
-      //isChStyle: navbarStyle == '2',
+      isChStyle: navbarStyle == '2',
       isRedStyle: navbarStyle == '3',
       isSDCS: navbarStyle == '4' && isFixed,
       isSMGZ: navbarStyle == '5' && isFixed,
@@ -35,7 +35,7 @@
           >
             <span @click="handleToPage(item.path)">{{ item.name }} </span>
             <i
-              v-if="item.name == '陈列展览'"
+              v-if="item.name == '展览展示'"
               class="el-icon-arrow-down"
               style="transform: translate(30%, 30%); cursor: pointer"
             ></i>
@@ -46,7 +46,7 @@
             <el-dropdown trigger="click">
               <el-button round>
                 <i class="el-icon-user"></i>
-                <span>登录</span>
+                <span>{{hasToken?userInfo.nickName||userInfo.username:'登录'}}</span>
                 <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
               </el-button>
               <el-dropdown-menu slot="dropdown">
@@ -252,8 +252,7 @@ export default {
             path: "/ccProduct",
           };
         }
-
-        if (value.params.themeType) {
+        if (value.params.themeType) { 
           this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType);
         } else {
           this.$store.commit("app/CHANGE_NAV_COLOR", "1");
@@ -309,7 +308,7 @@ export default {
         //   path: "/boutique",
         // },
         {
-          name: "陈列展览",
+          name: "展览展示",
           path: "/display",
           children: [
             {
@@ -537,13 +536,13 @@ export default {
     },
 
     handleEnterTabItem(item) {
-      if (item.name == "陈列展览") {
+      if (item.name == "展览展示") {
         this.showSubMenu = true;
       }
     },
 
     handleLeaveTabItem(item) {
-      if (item.name == "陈列展览" && this.showSubMenu) {
+      if (item.name == "展览展示" && this.showSubMenu) {
         this.showSubMenu = false;
       }
     },
@@ -597,7 +596,9 @@ export default {
 }
 
 .isChStyle {
-  background-color: #892325 !important;
+  // background-color: #892325 !important;
+  background-color: rgba(0,0,0,0.25) !important;
+
 }
 
 .isRedStyle {

src/components/ReaderOperations/index.vue

 <template>
   <div class="reader-operations">
-    <span
-      class="operations"
-      :style="{
-        color: color,
-      }"
-    >
+    <span class="operations" :style="{
+      color,
+    }">
       <span class="operation-item">
-        <svg-icon
-          icon-class="view"
-          :style="{
-            fontSize: iconSize + 'px',
-            color: color,
-          }"
-        ></svg-icon>
+        <svg-icon icon-class="view" :style="{
+          fontSize: iconSize + 'px',
+          color,
+        }"></svg-icon>
         <span>{{ formatNum(info.browseCount) }}</span>
       </span>
       <span class="operation-item">
-        <svg-icon
-          @click="handleLike"
-          :icon-class="info.loaveCountStatus ? 'dianzan-s' : 'dianzan'"
-          :style="{
-            fontSize: iconSize + 'px',
-            color: info.loaveCountStatus ? selectColor : color,
-          }"
-        ></svg-icon>
+        <svg-icon @click="handleLike" :icon-class="info.loveCountStatus ? 'dianzan-s' : 'dianzan'" :style="{
+          fontSize: iconSize + 'px',
+          color: info.loveCountStatus ? selectColor : color,
+        }"></svg-icon>
         <span>{{
-          formatNum(info.loveCount) == 0 ? "点赞" : formatNum(info.loveCount)
+            formatNum(info.loveCount) == 0 ? "点赞" : formatNum(info.loveCount)
         }}</span>
       </span>
       <span class="operation-item" @click="handleCollect">
-        <svg-icon
-          :icon-class="info.collectCountStatus ? 'collect-s' : 'collect'"
-          :style="{
-            fontSize: iconSize + 'px',
-            color: info.collectCountStatus ? selectColor : color,
-          }"
-        ></svg-icon>
+        <svg-icon :icon-class="info.collectCountStatus ? 'collect-s' : 'collect'" :style="{
+          fontSize: iconSize + 'px',
+          color: info.collectCountStatus ? selectColor : color,
+        }"></svg-icon>
         <span>{{
-          formatNum(info.collectCount) == 0
-            ? "收藏"
-            : formatNum(info.collectCount)
+            formatNum(info.collectCount) == 0
+              ? "收藏"
+              : formatNum(info.collectCount)
         }}</span>
       </span>
       <span class="operation-item" @click="handleShare">
-        <svg-icon
-          icon-class="share2"
-          :style="{
-            fontSize: iconSize + 'px',
-          }"
-        ></svg-icon>
+        <svg-icon icon-class="share2" :style="{
+          fontSize: iconSize + 'px',
+          color,
+        }"></svg-icon>
         <span>分享</span>
       </span>
     </span>
-    <el-dialog
-      title="登录提示"
-      :visible.sync="loginDialogVisible"
-      width="30%"
-      :before-close="handleLoginClose"
-      append-to-body
-    >
+    <el-dialog title="登录提示" :visible.sync="loginDialogVisible" width="30%" :before-close="handleLoginClose"
+      append-to-body>
       <span>读者功能需登录进行使用，是否去登录？</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="loginDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleToLogin"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click.native="handleToLogin">确 定</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog
-      title="分享给朋友"
-      :visible.sync="shareDialogVisible"
-      width="40%"
-      :before-close="handleShareClose"
-      append-to-body
-    >
+    <el-dialog title="分享给朋友" :visible.sync="shareDialogVisible" width="40%" :before-close="handleShareClose"
+      append-to-body>
       <!-- <div class="qrcode">
       </div> -->
       <div class="copy">
@@ -84,9 +57,7 @@
           <template slot="append">
             <el-button type="text" @click.native="copyUrl">
               <svg-icon icon-class="copy"></svg-icon>
-              复制链接</el-button
-            ></template
-          >
+              复制链接</el-button></template>
         </el-input>
       </div>
     </el-dialog>
@@ -99,45 +70,6 @@ import { debounce, formatNum } from "@/utils/index";
 export default {
   name: "ReaderOperations",
   props: {
-    // // 是否需要点赞,默认需要
-    // like: {
-    //   type: Boolean,
-    //   default: true,
-    // },
-    // // 是否需要收藏，默认需要
-    // collect: {
-    //   type: Boolean,
-    //   default: true,
-    // },
-    // // 是否需要分享，默认需要
-    // share: {
-    //   type: Boolean,
-    //   default: true,
-    // },
-    // // 点赞数量
-    // loveCount: {
-    //   type: String,
-    //   default: "0",
-    // },
-    // // 收藏数量
-    // collectCount: {
-    //   type: String,
-    //   default: "0",
-    // },
-    // // 点赞状态
-    // loveCountStatus: {
-    //   type: Boolean,
-    //   default: false,
-    // },
-    // // 收藏状态
-    // collectCountStatus: {
-    //   type: Boolean,
-    //   default: false,
-    // },
-    // sourceId: {
-    //   type: String,
-    //   default: "",
-    // },
     info: {
       type: Object,
       default: () => ({}),
@@ -147,10 +79,6 @@ export default {
       type: String,
       default: "",
     },
-    // title: {
-    //   type: String,
-    //   default: "",
-    // },
     iconSize: {
       type: [Number, String],
       default: 28,
@@ -163,26 +91,6 @@ export default {
       type: String,
       default: "#fff",
     },
-    // //图标未选中时的颜色
-    // iconColor: {
-    //   type: String,
-    //   default: "#fff",
-    // },
-    // //图标选中时的颜色
-    // selectIconColor: {
-    //   type: String,
-    //   default: "#fff",
-    // },
-    // // 文字未选中时的颜色
-    // fontColor: {
-    //   type: String,
-    //   default: "#fff",
-    // },
-    // // 文本选中时的颜色
-    // selectFontColor: {
-    //   type: String,
-    //   default: "#fff",
-    // },
   },
   data() {
     return {
@@ -212,13 +120,16 @@ export default {
           title,
         };
         this.$store.dispatch("user/toggleCollect", params).then(() => {
-          if (!this.collectCountStatus) {
+          if (!this.info.collectCountStatus) {
             // 点赞
             this.$message.success("已收藏！");
           } else {
             this.$message.success("已取消收藏！");
           }
-          this.$emit("reload");
+          setTimeout(() => {
+            this.$emit("reload", this.info.crId || this.info.exhibitionId);
+          }, 300)
+
         });
       } else {
         this.loginDialogVisible = true;
@@ -242,13 +153,15 @@ export default {
           title,
         };
         this.$store.dispatch("user/toggleLike", params).then(() => {
-          if (!this.info.loaveCountStatus) {
+          if (!this.info.loveCountStatus) {
             // 点赞
             this.$message.success("已点赞！");
           } else {
             this.$message.success("已取消点赞！");
           }
-          this.$emit("reload");
+          setTimeout(() => {
+            this.$emit("reload", this.info.crId || this.info.exhibitionId);
+          }, 300)
         });
       } else {
         this.loginDialogVisible = true;
@@ -297,24 +210,29 @@ export default {
   width: 100%;
   max-width: 500px;
 }
+
 .operations {
   // margin-top: 22px;
   width: 100%;
   display: flex;
   justify-content: space-between;
+
   .operation-item {
     display: flex;
     align-items: center;
     cursor: pointer;
     font-size: 14px;
   }
+
   .svg-icon {
     margin-right: 10px;
     font-size: 24px;
   }
+
   .like {
     color: #831122;
   }
+
   .collect {
     color: #831122;
   }
@@ -334,6 +252,7 @@ export default {
   .img-container {
     width: 200px;
     height: 200px;
+
     img {
       width: 100%;
       height: 100%;
@@ -349,6 +268,7 @@ export default {
   .el-button {
     border-radius: 0;
   }
+
   .el-button--primary {
     border: none;
     background-color: $themeColor;

src/components/VideoPlayer/index.vue

@@ -93,6 +93,12 @@ export default {
     height: 100%;
 
     .video-js {
+      &:hover{
+        .vjs-big-play-button{
+          // background-color: #fff;
+          // color: $themeColor;
+        }
+      }
       video {
         // object-fit: fill;
       }
@@ -105,7 +111,13 @@ export default {
       .vjs-big-play-button {
         left: 50%;
         top: 50%;
+        width: 80px;
+        height: 80px;
+        border-radius: 50%;
         transform: translate(-50%, -50%);
+        font-size: 50px;
+        color: #fff;
+        background-color: $themeColor;
       }
 
       .vjs-control-bar {

src/views/display/Detail.vue

@@ -67,4 +67,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// .display-detail{
+//   position: relative;
+//   top: -$nav-height;
+// }
 </style>
\ No newline at end of file

src/views/display/components/NormalStyle.vue

@@ -396,7 +396,7 @@ export default {
       dotImg: require("@/assets/imgs/display/normal/mz-dot.png"),
       dotImgS: require("@/assets/imgs/display/normal/mz-dot-s.png"),
       page: null,
-      currentVideo: null,
+      currentVideo: {},
       videoSwiperOption: {
         loop: false,
         loopedSlides: 8, // looped slides should be the same

src/views/display/components/NormalStyleUnit.vue

@@ -26,20 +26,20 @@
                 </div>
                 <div class="text-indent unit-content_intro" v-if="curUnit.intro" v-html="unitValue.intro"></div>
                 <div class="unit-content_images" v-if="unitValue.imagesVo && unitValue.imagesVo.length > 0">
-                    <div class="imgs-title">单元图片</div>
+                    <!-- <div class="imgs-title">单元图片</div> -->
                     <div class="unit-imgs">
 
                         <SlideImageGroup :imgList="unitValue.imagesVo" :needEnlarge="true"
                             v-if="unitValue.imagesVo.length > 3">
                             <template slot-scope="{ item }" slot="img">
-                                <img :src="$getFullUrl(item.pressUrl)" alt=""
+                                <img :src="$getFullUrl(item.middleUrl)" alt=""
                                     style="width: 100%; height: 100%; object-fit: contain" />
                             </template>
                         </SlideImageGroup>
                         <el-row v-if="unitValue.imagesVo.length > 0 && unitValue.imagesVo.length < 4" :gutter="10">
                             <el-col v-for="(item, index) in unitValue.imagesVo" :key="index"
                                 :span="24 / unitValue.imagesVo.length" style="height:300px">
-                                <img :src="$getFullUrl(item.pressUrl)" alt=""
+                                <img :src="$getFullUrl(item.middleUrl)" alt=""
                                     style="width: 100%; height: 100%; object-fit: contain;cursor: pointer;"
                                     @click="handelPreviewImages(unitValue.imagesVo)" />
                             </el-col>
@@ -53,7 +53,7 @@
                     <div class="imgs-title">单元文物</div>
                     <SlideImageGroup :imgList="unitValue.culturalRelics">
                         <template slot-scope="{ item }" slot="img">
-                            <img :src="$getFullUrl(item.faceImagePressUrl)" alt="" style="
+                            <img :src="$getFullUrl(item.faceImageMiddleUrl)" alt="" style="
                         width: 100%;
                         height: 100%;
                         object-fit: fill;
@@ -106,6 +106,13 @@ export default {
             },
         }
     },
+    updated() {
+        let p = document.getElementsByTagName('p')
+        let arr = [...p]
+        arr.map(item => {
+            item.style.color = "#333"
+        })
+    },
     methods: {
         handleClickUnit(item) {
             this.$emit('handleClickUnit', item)
@@ -120,12 +127,14 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" >
 .unit-content_intro {
-  p {
-    // color: red !important;
-    font-family: $defaultFontFamily !important;
-  }
+    p {
+        // color: red !important;
+        font-family: $defaultFontFamily !important;
+        
+        // color: #333 !important;
+    }
 }
 </style>
 <style lang="scss" scoped>
@@ -183,25 +192,37 @@ export default {
     flex: 1;
     padding: 60px 40px 0;
 
-    .unit-content-container {}
+    .unit-content-container {
 
-    .unit-content-title {
-        font-size: 24px;
-        line-height: 2;
-        display: flex;
-        justify-content: center;
-        margin-top: 48px;
-    }
+        .unit-content-title {
+            font-size: 20px;
+            line-height: 2;
+            display: flex;
+            justify-content: center;
+            margin-top: 48px;
+
+        }
+
+        .unit-content_intro {
+            font-size: 16px;
+            font-weight: 400;
+            color: #444444;
+            line-height: 36px;
+            text-indent: 32px;
+            margin-bottom: 20px;
+        }
+
+        &:nth-child(1) {
+
+            .unit-content-title {
+                font-size: 24px;
+                font-weight: bold;
+            }
+        }
 
-    .unit-content_intro {
-        font-size: 16px;
-        font-weight: 400;
-        color: #444444;
-        line-height: 36px;
-        text-indent: 32px;
-        margin-bottom: 20px;
     }
 
+
     .unit-content_images {
         position: relative;