09.27前 问题修改

public/pdf/web/viewer.html

@@ -31,7 +31,6 @@ See https://github.com/adobe-type-tools/cmap-resources
     <meta http-equiv="Content-Type" content="text/html" charset="gb2312" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" charset="utf-8" />
     <title>PDF.js viewer</title>
-
     <link rel="stylesheet" href="viewer.css" />
 
     <!-- This snippet is used in production (included from viewer.html) -->
@@ -40,12 +39,6 @@ See https://github.com/adobe-type-tools/cmap-resources
       type="application/l10n"
       href="locale/locale.properties"
     />
-
-    <!--    <script src="//cdn.bootcss.com/eruda/1.2.4/eruda.min.js"></script>-->
-    <!--    <script>-->
-    <!--        eruda.init();-->
-    <!--    </script>-->
-
     <script src="../core-js-3.29.1-minified.min.js"></script>
     <script>
       const isNoCopy = false;
@@ -114,316 +107,19 @@ See https://github.com/adobe-type-tools/cmap-resources
       );
     </script>
     <script src="../build/pdf.js"></script>
-    <script>
-      console.log("63783876");
-    </script>
     <script src="wasm_exec.js"></script>
     <script src="viewer.js"></script>
 
+    <script src="viewer.js"></script>
     <style>
-      .search-wrap {
-        width: 100%;
-        height: 58px;
-        display: flex;
-        align-items: center;
-        padding: 0 12px;
-        box-sizing: border-box;
-        background: #ffffff;
-        position: relative;
-        z-index: 900;
-      }
-
-      .search-box {
-        flex: 1;
-        height: 38px;
-        display: flex;
-        align-items: center;
-        background-color: #f3f3f3;
-        border-radius: 40px;
-        padding: 0 7px 0 14px;
-        box-sizing: border-box;
-        position: relative;
-      }
-
-      .historical-search {
-        width: 100%;
-        position: absolute;
-        left: 0;
-        top: 45px;
-        background-color: #f3f3f3;
-        border-radius: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-        display: flex;
-        flex-wrap: wrap;
-        /*display: none;*/
-        z-index: 999;
-      }
-
-      .historical-search-mask {
-        position: fixed;
-        left: 0;
-        top: 58px;
-        width: 20%;
-        height: 100%;
-        /*background: rgba(0, 0, 0, .2);*/
-      }
-
-      .historical-search label {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        user-select: none;
-        margin-right: 40px;
-        display: block;
-      }
-
-      .historical-search label:hover,
-      .historical-search input:focus-visible + label {
-        color: var(--toggled-btn-color);
-        background-color: var(--button-hover-color);
-      }
-
-      .historical-search
-        .toolbarField[type="checkbox"]:checked
-        + .toolbarLabel {
-        background-color: var(--toggled-btn-bg-color) !important;
-        color: var(--toggled-btn-color);
-      }
-
-      .search-icon {
-        width: 24px;
-        margin-right: 10px;
-      }
-
-      .search-input {
-        width: auto !important;
-        flex: 1 !important;
-        height: 38px;
-        display: block;
-        border: none;
-        background: none;
-        font-size: 14px;
-        outline-style: none;
-      }
-
-      .search-input::placeholder {
-        color: #a7a7a7;
-      }
-
-      .direction-box {
-        width: 53px;
-        height: 24px;
-        border: 1px solid #979797;
-        border-radius: 40px;
-        display: flex;
-        align-items: center;
-      }
-
-      .direction-box > button {
-        flex: 1;
-        display: flex;
-        border: none;
-        margin: 0;
-        padding: 0;
-        justify-content: center;
-        align-items: center;
-        border-right: 1px solid #d8d8d8;
-        box-sizing: border-box;
-        background: none;
-      }
-
-      .direction-box > button:last-child {
-        border-right: none;
-      }
-
-      .direction-box > button > img {
-        width: 16px;
-      }
-
-      .tool-box {
-        margin-left: 3px;
-        display: flex;
-        align-items: center;
-      }
-
-      .tool-box > button {
-        border: none;
-        padding: 0 6px;
-        border-right: 1px solid #d8d8d8;
-        box-sizing: border-box;
-        background: none;
-      }
-
-      .tool-box > button:last-child {
-        padding-right: 0;
-      }
-
-      .tool-box > button:last-child {
-        border-right: none;
-      }
-
-      .tool-box > button > img {
-        width: 26px;
-      }
-
-      .catalogue-btn {
-        color: #ffffff;
-        font-size: 13px;
-        font-weight: bold;
-        width: 72px;
-        height: 28px;
-        background-color: #2a63f3;
-        border-radius: 40px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        position: fixed;
-        top: 70%;
-        left: 12px;
-        z-index: 904;
-        border: none;
-      }
-
-      .catalogue-btn > img {
-        width: 14px;
-        margin-right: 3px;
-      }
-
-      #sidebarContainer {
-        /*position: fixed;*/
-        top: 0;
-        z-index: 903;
-      }
-
-      #sidebarContainerMask {
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 20%;
-        height: 100%;
-        /*background: rgba(0, 0, 0, .2);*/
-        z-index: 902;
-        display: none;
-      }
-
-      .sidebarOpen #sidebarContainerMask {
-        display: block;
-      }
-
-      .search-box .historical-search,
-      .search-box .historical-search-mask {
+      .hide_btn{
         display: none;
       }
-
-      .search-box.focus .historical-search,
-      .search-box.focus .historical-search-mask {
-        display: flex;
-      }
     </style>
   </head>
 
   <body tabindex="1">
     <div id="outerContainer">
-      <button
-        type="button"
-        class="catalogue-btn"
-        id="sidebarToggle"
-        data-l10n-id="toggle_sidebar"
-        aria-expanded="false"
-        aria-controls="sidebarContainer"
-      >
-        <img src="./img/icon-128.png" alt="" />
-        目录
-      </button>
-      <div class="search-wrap">
-        <div class="search-box" id="search-box">
-          <img src="./img/icon-115.png" class="search-icon" alt="" />
-          <input
-            type="text"
-            id="findInput"
-            class="search-input"
-            placeholder="在文档中查找…"
-            data-l10n-id="find_input"
-            aria-invalid="false"
-            autocomplete="off"
-          />
-          <div class="direction-box">
-            <button type="button" id="findPrevious" data-l10n-id="find_input">
-              <img src="./img/icon-116.png" alt="" />
-            </button>
-            <button type="button" id="findNext" data-l10n-id="find_next">
-              <img src="./img/icon-117.png" alt="" />
-            </button>
-          </div>
-          <div class="historical-search-mask" id="historical-search-mask"></div>
-          <div class="historical-search">
-            <div id="findbarOptionsOneContainer">
-              <input
-                type="checkbox"
-                id="findHighlightAll"
-                class="toolbarField"
-                tabindex="94"
-              />
-              <label
-                for="findHighlightAll"
-                class="toolbarLabel"
-                data-l10n-id="find_highlight"
-                >Highlight All</label
-              >
-              <input
-                type="checkbox"
-                id="findMatchCase"
-                class="toolbarField"
-                tabindex="95"
-              />
-              <label
-                for="findMatchCase"
-                class="toolbarLabel"
-                data-l10n-id="find_match_case_label"
-                >Match Case</label
-              >
-            </div>
-            <div id="findbarOptionsTwoContainer">
-              <input
-                type="checkbox"
-                id="findMatchDiacritics"
-                class="toolbarField"
-                tabindex="96"
-              />
-              <label
-                for="findMatchDiacritics"
-                class="toolbarLabel"
-                data-l10n-id="find_match_diacritics_label"
-                >Match Diacritics</label
-              >
-              <input
-                type="checkbox"
-                id="findEntireWord"
-                class="toolbarField"
-                tabindex="97"
-              />
-              <label
-                for="findEntireWord"
-                class="toolbarLabel"
-                data-l10n-id="find_entire_word_label"
-                >Whole Words</label
-              >
-            </div>
-            <div id="findbarMessageContainer" aria-live="polite">
-              <span id="findResultsCount" class="toolbarLabel"></span>
-              <span id="findMsg" class="toolbarLabel"></span>
-            </div>
-          </div>
-        </div>
-        <div class="tool-box">
-          <button type="button" id="zoomOut">
-            <img src="./img/icon-118.png" alt="" />
-          </button>
-          <button type="button" id="zoomIn">
-            <img src="./img/icon-119.png" alt="" />
-          </button>
-        </div>
-      </div>
       <script>
         const searchBox = document.getElementById("search-box");
         const findInput = document.getElementById("findInput");
@@ -785,14 +481,17 @@ See https://github.com/adobe-type-tools/cmap-resources
               href="#"
               id="viewBookmark"
               class="secondaryToolbarButton"
-              title="Current view (copy or open in new window)"
+              title="Current Page (View URL from Current Page)"
               tabindex="55"
-              data-l10n-id="bookmark"
+              data-l10n-id="bookmark1"
             >
-              <span data-l10n-id="bookmark_label">Current View</span>
+              <span data-l10n-id="bookmark1_label">Current Page</span>
             </a>
 
-            <div class="horizontalToolbarSeparator"></div>
+            <div
+              id="viewBookmarkSeparator"
+              class="horizontalToolbarSeparator"
+            ></div>
 
             <button
               id="firstPage"
@@ -977,13 +676,22 @@ See https://github.com/adobe-type-tools/cmap-resources
         <!-- secondaryToolbar -->
 
         <div class="toolbar">
-          <div id="toolbarContainer" style="display: none">
+          <div id="toolbarContainer">
             <div id="toolbarViewer">
               <div id="toolbarViewerLeft">
-                <!--                        <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11"-->
-                <!--                                data-l10n-id="toggle_sidebar" aria-expanded="false" aria-controls="sidebarContainer">-->
-                <!--                            <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>-->
-                <!--                        </button>-->
+                <button
+                  id="sidebarToggle"
+                  class="toolbarButton"
+                  title="Toggle Sidebar"
+                  tabindex="11"
+                  data-l10n-id="toggle_sidebar"
+                  aria-expanded="false"
+                  aria-controls="sidebarContainer"
+                >
+                  <span data-l10n-id="toggle_sidebar_label"
+                    >Toggle Sidebar</span
+                  >
+                </button>
                 <div class="toolbarButtonSpacer"></div>
                 <button
                   id="viewFind"
@@ -1030,10 +738,11 @@ See https://github.com/adobe-type-tools/cmap-resources
                 />
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
-              <div id="toolbarViewerRight" style="display: none">
+              <div id="toolbarViewerRight">
+                <!-- 打开文件 -->
                 <button
                   id="openFile"
-                  class="toolbarButton hiddenLargeView"
+                  class="toolbarButton hiddenLargeView hide_btn"
                   title="Open File"
                   tabindex="31"
                   data-l10n-id="open_file"
@@ -1041,9 +750,10 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <span data-l10n-id="open_file_label">Open</span>
                 </button>
 
+                <!-- 打印 -->
                 <button
                   id="print"
-                  class="toolbarButton hiddenMediumView"
+                  class="toolbarButton hiddenMediumView hide_btn"
                   title="Print"
                   tabindex="32"
                   data-l10n-id="print"
@@ -1051,9 +761,10 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
+                <!-- 下载 -->
                 <button
                   id="download"
-                  class="toolbarButton hiddenMediumView"
+                  class="toolbarButton hiddenMediumView hide_btn"
                   title="Save"
                   tabindex="33"
                   data-l10n-id="save"
@@ -1065,7 +776,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 
                 <div
                   id="editorModeButtons"
-                  class="splitToolbarButton toggled"
+                  class="splitToolbarButton toggled hide_btn"
                   role="radiogroup"
                 >
                   <button
@@ -1256,7 +967,7 @@ See https://github.com/adobe-type-tools/cmap-resources
           </div>
         </div>
 
-        <div id="viewerContainer" tabindex="0" style="top: 58px">
+        <div id="viewerContainer" tabindex="0">
           <div id="viewer" class="pdfViewer"></div>
         </div>
       </div>

src/App.vue

@@ -61,11 +61,17 @@ export default {
     },
   },
   mounted() {
-    let btnRight = 8 + 50 + 60;
-    this.btnLeft = window.innerWidth - btnRight;
+    let btnRight = 100 + 8;
+    this.btnLeft =
+        window.innerWidth - btnRight > 1097
+          ? window.innerWidth - btnRight
+          : 1097;
     window.onresize = () => {
       this.$resizeListenerList.forEach((fn) => fn());
-      this.btnLeft = window.innerWidth - btnRight;
+      this.btnLeft =
+        window.innerWidth - btnRight > 1097
+          ? window.innerWidth - btnRight
+          : 1097;
       // body.style.zoom
     };
   },
@@ -74,6 +80,10 @@ export default {
 
 <style lang="scss">
 @import "~@/assets/css/common.scss";
+:root {
+  --scrollTop: 0px;
+  --windowHeight: 0px;
+}
 
 body {
   @extend %transitionAll;
@@ -104,4 +114,15 @@ body {
 .FixedBtn {
   z-index: 50;
 }
+
+@media (max-width: 1200px) {
+  .Header {
+    // position: absolute;
+    // top: var(--scrollTop) !important;
+  }
+  .FixedBtn {
+    position: absolute !important;
+    top: calc(var(--scrollTop) + var(--windowHeight) - 80px) !important;
+  }
+}
 </style>

src/common/mixin.js

@@ -14,16 +14,22 @@ let mixin = {
     },
   },
   mounted() {
-    if (this.TouchBottom) {
-      window.addEventListener("scroll", (_) => {
-        const innerHeight = window.innerHeight; // 可视窗口高度
-        const scrollTop = document.documentElement.scrollTop; // 滚动高度
-        const scrollHeight = document.documentElement.scrollHeight; // 页面总高度
-        if (scrollTop + innerHeight >= scrollHeight) {
-          this.TouchBottom();
-        }
-      });
-    }
+    window.addEventListener("scroll", (_) => {
+      const innerHeight = window.innerHeight; // 可视窗口高度
+      const scrollTop = document.documentElement.scrollTop; // 滚动高度
+      const scrollHeight = document.documentElement.scrollHeight; // 页面总高度
+      document.documentElement.style.setProperty(
+        "--scrollTop",
+        scrollTop + "px"
+      );
+      document.documentElement.style.setProperty(
+        "--windowHeight",
+        innerHeight + "px"
+      );
+      if (this.TouchBottom && scrollTop + innerHeight >= scrollHeight) {
+        this.TouchBottom();
+      }
+    });
   },
 };
 export default mixin;

src/components/image-text/image-text-detail-content.vue

@@ -68,13 +68,19 @@ export default {
         c.style.height = windowHeight + "px";
         c.style.fontSize = fontSize + "px";
         c.style.transform = "rotateZ(315deg) scale(0.7)";
-        c.style.color = "rgba(0, 0, 0, 0.15)";
+        c.style.color = "rgba(0, 0, 0, 0.05)";
         c.style.fontWeight = "bold";
         c.style.display = "flex";
         c.style.flexDirection = "column";
         c.style.alignItems = "center";
         c.style.justifyContent = "center";
-        c.innerText = this.watermark || this.userInfo.phone || "搞一下";
+        c.innerText =
+          this.watermark || this.userInfo.phone
+            ? this.userInfo.phone.replace(
+                this.userInfo.phone.slice(4, 7),
+                "****"
+              )
+            : "" || "搞一下";
         c.style.pointerEvents = "none"; // 取消所有事件
         cover.appendChild(c);
       }
@@ -124,5 +130,4 @@ export default {
     user-select: none !important;
   }
 }
-
 </style>

src/components/image-text/image-text-recommend-card.vue

@@ -107,6 +107,7 @@ export default {
   box-sizing: border-box;
   cursor: default;
   .content {
+    height: 100%;
     width: 58%;
     display: flex;
     flex-direction: column;
@@ -164,17 +165,17 @@ export default {
       align-items: center;
       margin-top: 20px;
       .item {
-        width: 100px;
+        width: 80px;
         height: 40px;
         display: flex;
         align-items: center;
+        justify-content: center;
         font-size: 14px;
         font-weight: 400;
         color: #202020;
         background: #f5f5f5;
         border-radius: 21px;
         box-sizing: border-box;
-        padding-left: 25px;
         cursor: pointer;
         margin-right: 10px;
         img {

src/components/information/information-collection-card.vue

@@ -107,13 +107,16 @@ export default {
       .app-name {
         margin-left: 5px;
         height: 18px;
+        white-space: nowrap;
       }
       .read {
         margin-left: 5px;
         height: 18px;
+        white-space: nowrap;
       }
       .time {
         height: 18px;
+        white-space: nowrap;
       }
     }
   }

src/components/information/information-recommend-card.vue

@@ -72,6 +72,7 @@ export default {
       word-wrap: break-word;
     }
     .bottom {
+      width: 100%;
       display: flex;
       align-items: center;
       font-size: 12px;
@@ -86,13 +87,16 @@ export default {
       .app-name {
         margin-left: 5px;
         height: 18px;
+        white-space: nowrap;
       }
       .read {
         margin-left: 5px;
         height: 18px;
+        white-space: nowrap;
       }
       .time {
         height: 18px;
+        white-space: nowrap;
       }
     }
   }

src/components/layout/Header.vue

@@ -144,6 +144,7 @@ export default {
 .header {
   height: $headerHeight;
   width: 100%;
+  // min-width: 1200px;
   padding: 0 50px;
   display: flex;
   justify-content: space-between;

src/components/layout/Navbar.vue

@@ -8,7 +8,9 @@
       @click="handlePush(item, index)"
     >
       <img :src="current == index ? item.icon_s : item.icon" alt="" />
-      <span :class="{ blue: current == index }">{{ item.title }}</span>
+      <div class="content" :class="{ blue: current == index }">
+        <span v-for="val in item.title.split('')">{{ val }}</span>
+      </div>
     </div>
   </div>
 </template>
@@ -147,16 +149,21 @@ export default {
     border-radius: 12px;
     display: flex;
     align-items: center;
+    justify-content: center;
     padding: 10px 20px;
     cursor: pointer;
     img {
       width: 22px;
       height: 22px;
     }
-    span {
+    .content {
+      width: 70px;
       font-size: 18px;
       line-height: 40px;
       margin-left: 12px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
     }
   }
   .navbar-item:hover {

src/components/module/to-contact.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    class="to-contact"
-    v-if="!$route.meta.children"
-    @click="$router.push('contact-online')"
-  >
+  <div class="to-contact" v-if="show" @click="$router.push('contact-online')">
     <img src="@/assets/icon/客服.png" alt="" />
   </div>
 </template>
@@ -11,23 +7,34 @@
 <script>
 export default {
   name: "ToContact",
-  data() {
-    return {
-      show: false,
-    };
-  },
-  methods: {
+  computed: {
+    show() {
+      return (
+        !this.$route.meta.children &&
+        this.$route.path != "/information-details-content"
+      );
+    },
   },
+  methods: {},
 };
 </script>
 
 <style lang="scss" scoped>
 .to-contact {
   position: fixed;
-  bottom: 30px;
   img {
-    width: 60px;
-    height: 60px;
+    width: 50px;
+    height: 50px;
+  }
+}
+@media (min-width: 1200px) {
+  .to-contact {
+    bottom: 30px;
+  }
+}
+@media (max-width: 1200px) {
+  .to-contact {
+    top: calc(var(--scrollTop) + var(--windowHeight) - 90px) !important;
   }
 }
 </style>

src/components/module/to-contribute.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    class="to-contribute"
-    v-if="handleFilter() && !$route.meta.children"
-    @click="handleContribute"
-  >
+  <div class="to-contribute" v-if="show" @click="handleContribute">
     <img src="@/assets/icon/发布投稿.png" alt="" />
   </div>
 </template>
@@ -11,11 +7,6 @@
 <script>
 export default {
   name: "ToContribute",
-  data() {
-    return {
-      show: false,
-    };
-  },
   computed: {
     routePath() {
       return this.$store.state.routePath;
@@ -23,6 +14,13 @@ export default {
     contributePath() {
       return `/${this.handleFilter()}-contribute`;
     },
+    show() {
+      return (
+        this.handleFilter() &&
+        !this.$route.meta.children &&
+        this.$route.path != "/information-details-content"
+      );
+    },
   },
   methods: {
     // 跳转发布
@@ -50,10 +48,19 @@ export default {
 <style lang="scss" scoped>
 .to-contribute {
   position: fixed;
-  bottom: 100px;
   img {
-    width: 60px;
-    height: 60px;
+    width: 50px;
+    height: 50px;
+  }
+}
+@media (min-width: 1200px) {
+  .to-contribute {
+    bottom: 100px;
+  }
+}
+@media (max-width: 1200px) {
+  .to-contribute {
+    top: calc(var(--scrollTop) + var(--windowHeight) - 160px) !important;
   }
 }
 </style>

src/components/module/to-next.vue

@@ -13,32 +13,23 @@
 export default {
   name: "ToNext",
   data() {
-    return {
-      btnLeft: 0,
-      btnRight: 8 + 50 + 200,
-    };
-  },
-  mounted() {
-    this.btnLeft = window.innerWidth - this.btnRight;
-    this.$resizeListenerList.push(this.setBtnLeft);
-  },
-  methods: {
-    setBtnLeft() {
-      this.btnLeft = window.innerWidth - this.btnRight;
-    },
+    return {};
   },
+  mounted() {},
+  methods: {},
 };
 </script>
 
 <style lang="scss" scoped>
 .to-next {
-  width: 200px;
+  width: 210px;
   height: 60px;
-  background: #ffffff;
+  background: rgba(255,255,255,.5);
   border-radius: 40px;
   border: 1px solid #0054f7;
   position: fixed;
   bottom: 100px;
+  right: 10px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -55,4 +46,11 @@ export default {
     margin-left: 10px;
   }
 }
+@media (max-width: 1230px) {
+  .to-next {
+    position: absolute;
+    top: calc(var(--scrollTop) + var(--windowHeight) - 230px) !important;
+    right: -220px;
+  }
+}
 </style>

src/components/module/to-top.vue

@@ -40,10 +40,20 @@ export default {
 <style lang="scss" scoped>
 .to-top {
   position: fixed;
-  bottom: 170px;
   img {
-    width: 60px;
-    height: 60px;
+    width: 50px;
+    height: 50px;
+  }
+}
+
+@media (min-width: 1200px) {
+  .to-top {
+    bottom: 170px;
+  }
+}
+@media (max-width: 1200px) {
+  .to-top {
+    top: calc(var(--scrollTop) + var(--windowHeight) - 230px) !important;
   }
 }
 </style>

src/components/pdf/index.vue

@@ -4,20 +4,22 @@
       v-if="show"
       class="box"
       scrolling="no"
-      :src="`./pdf/web/viewer.html?file=${url}&watermark_text=${
-        userInfo.phone || watermarkText
-      }&is_encrypt=${is_encrypt}#page=1`"
+      :src="`./pdf/web/viewer.html?file=${url}&watermark_text=${pdf_watermarkText}&is_encrypt=${is_encrypt}#page=1`"
     ></iframe>
     <div class="loading" v-if="loading">
-      <!-- <van-circle
-        v-model="rate"
-        :rate="currentRate"
-        :speed="100"
-        :text="currentRate + '%'"
-      />
-      <van-loading size="24px" color="#0094ff" style="margin-top: 10px"
-        >数据加载中...</van-loading
-      > -->
+      <el-progress
+        type="circle"
+        status="success"
+        class="progress"
+        v-if="currentRate == 100"
+        :percentage="100"
+      ></el-progress>
+      <el-progress
+        type="circle"
+        class="progress"
+        v-else
+        :percentage="currentRate"
+      ></el-progress>
     </div>
   </div>
 </template>
@@ -45,12 +47,10 @@ export default {
   data() {
     return {
       loading: true,
-      loadingEndSize: 0,
-      rate: 10,
-      currentRate: 0,
-      interval: null,
       userInfo: {},
       show: false,
+      currentRate: 0,
+      interval: null,
     };
   },
   computed: {
@@ -62,15 +62,14 @@ export default {
         ? this.pdfUrl
         : OSS_URL + this.pdfUrl;
     },
+    pdf_watermarkText() {
+      return this.userInfo.phone
+        ? this.userInfo.phone.replace(this.userInfo.phone.slice(3, 7), "****")
+        : watermarkText;
+    },
   },
   mounted() {
-    if (this.platform === "h5") {
-      try {
-        this.userInfo = JSON.parse(localStorage.getItem("user_info") || `{}`);
-      } catch (e) {
-        this.userInfo = {};
-      }
-    }
+    this.userInfo = JSON.parse(localStorage.getItem("user_info") || `{}`);
     this.show = true;
     this.interval = setInterval(() => {
       const currentRate = parseFloat(
@@ -98,15 +97,6 @@ export default {
         this.currentRate = 100;
         setTimeout(() => {
           this.loading = false;
-          if (this.platform === "ios") {
-            try {
-              window.webkit.messageHandlers.loadFinished.postMessage(
-                "h5_pdf_view"
-              );
-            } catch (e) {
-              console.error(e);
-            }
-          }
         }, 200);
       }
     },
@@ -142,4 +132,8 @@ export default {
   justify-content: center;
   align-items: center;
 }
+
+.progress {
+  transform: scale(1.5);
+}
 </style>

src/components/video/video-player.vue

@@ -22,8 +22,16 @@
           !!ali_vid
         "
       >
-        <span>{{ userInfo.phone || "" }}</span>
-        <span>{{ userInfo.phone || "" }}</span>
+        <span>{{
+          userInfo.phone
+            ? userInfo.phone.replace(userInfo.phone.slice(3, 7),'****')
+            : ""
+        }}</span>
+        <span>{{
+          userInfo.phone
+            ? userInfo.phone.replace(userInfo.phone.slice(3, 7),'****')
+            : ""
+        }}</span>
       </div>
     </div>
     <div

src/components/video/video-recommend-card.vue

@@ -107,7 +107,7 @@ export default {
     width: 100%;
     margin: 20px 0;
     div {
-      width: 75%;
+      width: 85%;
       font-size: 17px;
       font-weight: 400;
       color: #222222;

src/main.js

@@ -32,6 +32,17 @@ Vue.prototype.$WindowMaxWidth = window.screen.availWidth;
 Vue.prototype.$resizeListenerList = [];
 
 Vue.config.productionTip = false;
+
+
+window.onkeydown = window.onkeyup = window.onkeypress = function(event) {
+   // 禁用 ctrl + s 与 command + s
+	if ((event.ctrlKey || event.metaKey) && event.key !== 'f') {
+		// 阻止默认事件
+		event.preventDefault()
+		window.event.returnValue = false;
+	}
+};
+
 new Vue({
   router: router,
   render: (h) => h(App),

src/views/image-text/components/child-content.vue

@@ -37,18 +37,19 @@ export default {
 
 <style lang="scss" scoped>
 .child {
-  width: 100%;
-  min-width: 800px;
+  width: calc(100% - 120px);
+  min-width: 700px;
   position: relative;
   .navbar {
     width: $navbarWidth;
     position: fixed;
     right: 10px;
   }
-  @media (max-width: 1300px) {
+  @media (max-width: 1230px) {
     .navbar {
       position: absolute;
-      right: calc(-#{$navbarWidth} - 10px);
+      top: var(--scrollTop);
+      right: calc(-#{$navbarWidth} - 20px);
     }
   }
   .content {

src/views/image-text/components/content.vue

@@ -168,7 +168,10 @@ export default {
             this.recommendParams.page === 1
               ? list
               : [...this.recommendList, ...list];
-          if (list.length < this.recommendParams.page_num) {
+          if (
+            list.length < this.recommendParams.page_num ||
+            this.recommendList.length == data.total_count
+          ) {
             this.finished = true;
           } else {
             this.recommendParams.page++;
@@ -260,15 +263,16 @@ export default {
 
 <style lang="scss" scoped>
 .content {
-  width: 100%;
-  margin: 0 auto;
-  min-width: 900px;
+  width: calc(100% - 10vw);
+  margin: 0 5vw;
+  min-width: 750px;
+  padding-left: 10px;
   .tab {
     margin-bottom: 20px;
   }
   .list {
-    min-width: 900px;
-    padding: 15px;
+    padding: 15px 0;
+    padding-right: 0;
     box-sizing: border-box;
     display: flex;
     flex-direction: column;

src/views/image-text/image-text-collection.vue

@@ -94,8 +94,8 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  width: calc(100% - 240px);
-  min-width: 1000px;
+  width: calc(100% - 20vw);
+  min-width: 900px;
   .wrap-content {
     width: 100%;
     margin: 0 auto;

src/views/image-text/index.vue

@@ -71,6 +71,8 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  width: calc(100% - #{$navbarWidth});
+  // width: calc(100% - #{$navbarWidth});
+  
+  width: calc(100% - 100px);
 }
 </style>

src/views/information/components/child-content.vue

@@ -38,18 +38,19 @@ export default {
 
 <style lang="scss" scoped>
 .child {
-  width: 100%;
-  min-width: 800px;
+  width: calc(100% - 120px);
+  min-width: 700px;
   position: relative;
   .navbar {
     width: $navbarWidth;
     position: fixed;
     right: 10px;
   }
-  @media (max-width: 1300px) {
+  @media (max-width: 1230px) {
     .navbar {
       position: absolute;
-      right: calc(-#{$navbarWidth} - 10px);
+      top: var(--scrollTop);
+      right: calc(-#{$navbarWidth} - 20px);
     }
   }
   .content {

src/views/information/components/content.vue

@@ -166,7 +166,10 @@ export default {
             this.recommendParams.page === 1
               ? list
               : [...this.recommendList, ...list];
-          if (list.length < this.recommendParams.page_num) {
+          if (
+            list.length < this.recommendParams.page_num ||
+            this.recommendList.length == data.total_count
+          ) {
             this.finished = true;
           } else {
             this.recommendParams.page++;
@@ -234,27 +237,27 @@ export default {
 
 <style lang="scss" scoped>
 .content {
-  width: 100%;
-  min-width: 900px;
-  margin: 0 auto;
+  width: calc(100% - 10vw);
+  margin: 0 5vw;
+  min-width: 800px;
+  padding-left: 10px;
   .tab {
     margin-bottom: 20px;
   }
   .list {
-    min-width: 900px;
     display: flex;
     align-items: center;
     justify-content: space-between;
     flex-wrap: wrap;
     box-sizing: border-box;
     padding: 15px;
+    padding-right: 0;
     .card-item {
       width: calc((100% - 40px) / 2);
       margin: 10px 0;
     }
   }
   .all {
-    min-width: 1000px;
     padding: 15px;
     box-sizing: border-box;
     .screen {

src/views/information/index.vue

@@ -67,6 +67,8 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  width: calc(100% - #{$navbarWidth});
+  // width: calc(100% - #{$navbarWidth});
+  width: calc(100% - 100px);
+
 }
 </style>

src/views/information/information-collection.vue

@@ -218,7 +218,8 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  width: 1200px;
+  width: calc(100% - 20vw);
+  min-width: 800px;
   margin: 0 auto;
   .back {
     width: 100px;

src/views/video/components/child-content.vue

@@ -38,18 +38,19 @@ export default {
 
 <style lang="scss" scoped>
 .child {
-  width: 100%;
-  min-width: 800px;
+  width: calc(100% - 120px);
+  min-width: 700px;
   position: relative;
   .navbar {
     width: $navbarWidth;
     position: fixed;
     right: 10px;
   }
-  @media (max-width: 1300px) {
+  @media (max-width: 1230px) {
     .navbar {
       position: absolute;
-      right: calc(-#{$navbarWidth} - 10px);
+      top: var(--scrollTop);
+      right: calc(-#{$navbarWidth} - 20px);
     }
   }
   .content {

src/views/video/components/content.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content" :class="{ 'all-content': !!current }">
     <div class="tab">
       <ContentTab
         :current="current"
@@ -10,6 +10,7 @@
     </div>
     <div
       class="list"
+      ref="RecommendList"
       :style="{ opacity: current == 0 ? 1 : 0 }"
       v-if="current == 0"
     >
@@ -105,22 +106,23 @@ export default {
   },
   methods: {
     setCardStyle() {
-      let contentWidth = window.outerWidth - 530,
+      // let contentWidth = window.outerWidth - 460,
+      let contentWidth = this.$refs["RecommendList"].offsetWidth - 10,
         cardWidth =
-          this.$WindowMaxWidth * 0.21 > 300 ? this.$WindowMaxWidth * 0.21 : 300,
+          this.$WindowMaxWidth * 0.22 > 250 ? this.$WindowMaxWidth * 0.22 : 250,
         style = { width: `${cardWidth}px` };
       switch (true) {
         case contentWidth > 3 * cardWidth:
           style.margin = `10px ${
             contentWidth - 3 * cardWidth > 0
-              ? (contentWidth - 3 * cardWidth) / 6
+              ? Math.floor((contentWidth - 3 * cardWidth) / 6)
               : 0
           }px`;
           break;
         case contentWidth > 2 * cardWidth && contentWidth < 3 * cardWidth:
           style.margin = `10px ${
             contentWidth - 2 * cardWidth > 0
-              ? (contentWidth - 2 * cardWidth) / 4
+              ? Math.floor((contentWidth - 2 * cardWidth) / 4)
               : 0
           }px`;
           break;
@@ -191,7 +193,10 @@ export default {
             this.recommendParams.page === 1
               ? list
               : [...this.recommendList, ...list];
-          if (list.length < this.recommendParams.page_num) {
+          if (
+            list.length < this.recommendParams.page_num ||
+            this.recommendList.length == data.total_count
+          ) {
             this.finished = true;
           } else {
             this.recommendParams.page++;
@@ -252,18 +257,17 @@ export default {
   width: 100%;
   max-width: 1600px;
   margin: 0 auto;
+  padding-left: 10px;
+  box-sizing: border-box;
   .tab {
     margin-bottom: 20px;
   }
   .list {
-    padding: 15px;
+    padding-right: 0;
     box-sizing: border-box;
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    // justify-content: space-between;
-    // .list-item {
-    // }
   }
   .all {
     padding: 15px;
@@ -284,4 +288,10 @@ export default {
     margin-top: 40px;
   }
 }
+.all-content {
+  width: calc(100% - 10vw);
+  margin: 0 5vw;
+  min-width: 750px;
+  padding-left: 10px;
+}
 </style>

src/views/video/index.vue

@@ -71,6 +71,6 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  width: calc(100% - #{$navbarWidth});
+  width: calc(100% - 100px);
 }
 </style>

src/views/video/video-detail.vue

@@ -135,7 +135,7 @@ export default {
 <style lang="scss" scoped>
 .wrap {
   padding: 30px 50px;
-  min-width: 1200px;
+  min-width: 1000px;
   width: $body-width-100;
   box-sizing: border-box;
   position: relative;