shaogen1995 2 лет назад
Родитель
Сommit
0af92d99c1

+ 10 - 2
后台/src/pages/Z1Gather/index.module.scss

@@ -60,6 +60,7 @@
           background-color: #fff;
           position: fixed;
           display: flex;
+          z-index: 9999;
           justify-content: center;
           align-items: center;
           bottom: 0px;
@@ -72,9 +73,10 @@
 
       .toTopBox {
         opacity: 0;
-        pointer-events: auto;
+        pointer-events: none;
         transition: all .3s;
         position: fixed;
+        z-index: 9999;
         left: calc(50% + 530px);
         bottom: 50px;
         transform: translateX(-50%);
@@ -111,12 +113,18 @@
 
         .formBox {
           .btnOkBox {
+            // position: relative;
+            // width: 100%;
+
             background-color: #f5f5f5;
           }
         }
-        .toTopBox{
+
+        .toTopBox {
           left: auto;
           right: 0px;
+          cursor: default;
+   
         }
       }
     }

+ 11 - 11
后台/src/pages/Z1Gather/index.tsx

@@ -7,7 +7,7 @@ import classNames from "classnames";
 import { ArrowUpOutlined } from "@ant-design/icons";
 import http from "@/utils/http";
 function Z1Gather() {
-  const timeRef = useRef(-1);
+  // const timeRef = useRef(-1);
   useEffect(() => {
     document.title = "2023 Print China_Contact us";
 
@@ -18,16 +18,16 @@ function Z1Gather() {
 
     rootDom.style.height = window.innerHeight + "px";
 
-    window.addEventListener(
-      "resize",
-      () => {
-        clearTimeout(timeRef.current);
-        timeRef.current = window.setTimeout(() => {
-          rootDom.style.height = window.innerHeight + "px";
-        }, 500);
-      },
-      true
-    );
+    // window.addEventListener(
+    //   "resize",
+    //   () => {
+    //     clearTimeout(timeRef.current);
+    //     timeRef.current = window.setTimeout(() => {
+    //       rootDom.style.height = window.innerHeight + "px";
+    //     }, 500);
+    //   },
+    //   true
+    // );
   }, []);
 
   const [topShow, setTopShow] = useState(false);

+ 11 - 1
定制化热点/src/views/Device.vue

@@ -76,7 +76,13 @@
       </div>
     </div>
     <!-- a标签的下载 -->
-    <a :href="doHref" download target="_blank" id="aref" ref="doHref"></a>
+    <a
+      :href="doHref"
+      :download="downloadName"
+      target="_blank"
+      id="aref"
+      ref="doHref"
+    ></a>
 
     <!-- 没有手册的消息 -->
     <div class="noInfoBox" :class="{ noInfoBoxAc: noInfo }">
@@ -110,7 +116,10 @@ export default {
   components: {},
   data() {
     return {
+      // a标签下载路径
       doHref: "",
+      // a标签下载名称
+      downloadName: "",
       data: [],
       noInfo: false,
       isAllNoFu: true,
@@ -137,6 +146,7 @@ export default {
       // console.log(123, item);
       if (!item.filePath) return (this.noInfo = true);
       this.doHref = baseUrl + item.filePath;
+      this.downloadName = item.fileName;
       await this.$http.get(`${baseUrl}/api/show/visit/product/${item.id}`);
       setTimeout(() => {
         this.$refs.doHref.click();