upp

后台/src/pages/A2Gather/index.tsx

@@ -109,9 +109,31 @@ function A2Gather() {
               };
             }),
             sheetName: name,
-            sheetFilter: ["createTime", "name", "jobTitle", "hasCall"],
-            sheetHeader: ["时间", "名字", "职位", "可否联系"],
-            columnWidths: [10, 10, 10, 10],
+            sheetFilter: [
+              "createTime",
+              "name",
+              "jobTitle",
+              "companyName",
+              "email",
+              "hasCall",
+              "phone",
+              "area",
+              "country",
+              "description",
+            ],
+            sheetHeader: [
+              "时间",
+              "名字",
+              "职位",
+              "公司名字",
+              "电子邮件",
+              "可否联系",
+              "电话",
+              "区域",
+              "国家",
+              "详细要求",
+            ],
+            columnWidths: [10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
           },
         ],
       };

后台/src/pages/Z1Gather/index.tsx

@@ -6,6 +6,8 @@ import TextArea from "antd/es/input/TextArea";
 import classNames from "classnames";
 import { ArrowUpOutlined } from "@ant-design/icons";
 import http from "@/utils/http";
+import { isH5Fu, isWeiFu } from "@/utils/pcOrH5";
+import history from "@/utils/history";
 function Z1Gather() {
   // const timeRef = useRef(-1);
   useEffect(() => {
@@ -71,13 +73,22 @@ function Z1Gather() {
       localStorage.setItem("HDB_WJ", "1");
       FormBoxRef.current.resetFields();
       window.setTimeout(() => {
-        window.opener = null;
-        window.open("", "_self");
-        window.close();
-        // 2023删除
-        window.open(
-          "https://haidebao.4dage.com/webHot/index.html#/?m=e3bv6739474&time=1681093455388&id=1172_1"
-        );
+        if (isH5Fu()) {
+          if (isWeiFu()) history.go(-1);
+          else {
+            window.opener = null;
+            window.open("", "_self");
+            window.close();
+          }
+        } else {
+          window.opener = null;
+          window.open("", "_self");
+          window.close();
+          // 2023删除
+          window.open(
+            "https://haidebao.4dage.com/webHot/index.html#/?m=e3bv6739474&time=1681093455388&id=1172_1"
+          );
+        }
       }, 500);
     }
   }, []);

后台/src/utils/pcOrH5.ts

@@ -0,0 +1,17 @@
+export const isH5Fu = () => {
+  if (
+    window.navigator.userAgent.match(
+      /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+    )
+  )
+    return true;
+  else return false;
+};
+
+export const isWeiFu = () => {
+  const ua: any = window.navigator.userAgent.toLowerCase();
+
+  // eslint-disable-next-line eqeqeq
+  if (ua.match(/MicroMessenger/i) == "micromessenger") return true;
+  else return false;
+};

定制化热点/src/views/Device.vue

@@ -425,4 +425,29 @@ export default {
   border-top: none;
   background-color: transparent;
 }
+@media screen and (max-width: 1000px) {
+  .Device {
+    max-width: 660px;
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+    .close{
+      height: 20px;
+    }
+    .main {
+      padding-left: 10px;
+      .title {
+        & > img {
+          width: 180px;
+        }
+        .xian {
+          width: 100px;
+        }
+      }
+      .toTopBox {
+        cursor: default;
+      }
+    }
+  }
+}
 </style>

定制化热点/src/views/Home.vue

@@ -3,10 +3,14 @@
     <div class="main">
       <!-- 标题 -->
       <h3 class="top">{{ title }}</h3>
-      <!-- 下载 -->
+      <!-- 英文版下载 -->
       <div class="xiazai" v-if="isEn" @click="devieShowFu">
         <img src="../assets/images/xiazai.png" alt="" />Download brochure
       </div>
+      <!-- 中文版打开新窗口 -->
+      <div class="xiazai" v-else @click="openNewUrl">
+        <img src="../assets/images/xiazai.png" alt="" />下载速霸CX 104产品手册
+      </div>
       <!-- 内容简介 -->
       <div class="content" v-html="content"></div>
 
@@ -96,7 +100,7 @@
     </div>
     <!-- 点击下载设备出来的盒子 -->
     <div class="DevieBox" :class="{ DevieBoxShow: devieShow }">
-      <Device @closePage="devieShow = false" :devieShow='devieShow'/>
+      <Device @closePage="devieShow = false" :devieShow="devieShow" />
     </div>
   </div>
 </template>
@@ -140,7 +144,13 @@ export default {
   computed: {},
   watch: {},
   methods: {
-    // 点击下载手册
+    // 中文版点击下载，打开新窗口
+    openNewUrl() {
+      window.open(
+        "https://www.heidelbergchina.com/app/index.php?i=136&c=official&a=article&id=303&type=0&utm_source=vr&utm_campaign=cx104"
+      );
+    },
+    // 英文版点击下载手册
     devieShowFu() {
       const flag = localStorage.getItem("HDB_WJ");
       if (flag) {
@@ -477,7 +487,7 @@ export default {
     pointer-events: auto;
   }
   // 2023删除
-  .main{
+  .main {
     opacity: 0;
   }
 }