shaogen1995 před 2 roky
rodič
revize
3691879429

+ 19 - 0
pc场景/public/index.html

@@ -45,6 +45,25 @@
             )
         ) {
             // 移动端
+
+            // -----------甲方服务器回跳
+            if (window.location.href.includes("2023chn")) {
+                const myTitle = window.location.href.includes('_1')
+                if (myTitle) window.location.href = window.location.href.replace("2023chn", "2023engM");
+                else window.location.href = window.location.href.replace("2023chn", "2023chnM");
+                setTimeout(() => {
+                    location.reload(true);
+                }, 200);
+            }
+            if (window.location.href.includes("2023eng")) {
+                const myTitle = window.location.href.includes('_1')
+                if (myTitle) window.location.href = window.location.href.replace("2023eng", "2023engM");
+                else window.location.href = window.location.href.replace("2023eng", "2023chnM");
+                setTimeout(() => {
+                    location.reload(true);
+                }, 200);
+            }
+            // -------------测试服务器回跳
             if (window.location.href.includes("web")) {
                 const myTitle = window.location.href.includes('_1')
                 if (myTitle) window.location.href = window.location.href.replace("web", "webMEn");

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

@@ -57,7 +57,7 @@ function Z1Gather() {
   const FormBoxRef = useRef<any>({});
   // 没有通过校验
   const onFinishFailed = useCallback(() => {
-    return MessageFu.warning("Invalid input!");
+    return MessageFu.warning("Please complete the filling before submitting!");
   }, []);
 
   /**
@@ -103,7 +103,7 @@ function Z1Gather() {
   const inputCheckFu = useCallback((_: any, value: string) => {
     if (value) {
       const txt = value.replaceAll(" ", "");
-      return txt === "" ? Promise.reject("Invalid input!") : Promise.resolve();
+      return txt === "" ? Promise.reject("The format does not meet requirements!") : Promise.resolve();
     } else return Promise.resolve();
   }, []);
 
@@ -123,7 +123,7 @@ function Z1Gather() {
               label="Name"
               name="name"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 { validator: inputCheckFu },
               ]}
               // getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
@@ -135,7 +135,7 @@ function Z1Gather() {
               className="staFormItem"
               label="Job Title"
               name="jobTitle"
-              rules={[{ required: true, message: "not null!" }]}
+              rules={[{ required: true, message: "This item cannot be empty!" }]}
             >
               <Radio.Group>
                 <Radio value="Decision Maker">1. Decision Maker</Radio>
@@ -148,7 +148,7 @@ function Z1Gather() {
               label="Company Name"
               name="companyName"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 { validator: inputCheckFu },
               ]}
               // getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
@@ -160,11 +160,11 @@ function Z1Gather() {
               label="Email"
               name="email"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 { validator: inputCheckFu },
                 // {
                 //   pattern: /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/,
-                //   message: "Invalid input!",
+                //   message: "The format does not meet requirements!",
                 // },
               ]}
               // getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
@@ -176,7 +176,7 @@ function Z1Gather() {
               className="staFormItem"
               label="Should we call you?"
               name="hasCall"
-              rules={[{ required: true, message: "not null!" }]}
+              rules={[{ required: true, message: "This item cannot be empty!" }]}
             >
               <Radio.Group>
                 <Radio value={1}>1. Yes</Radio>
@@ -188,12 +188,12 @@ function Z1Gather() {
               label="Phone"
               name="phone"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 { validator: inputCheckFu },
                 // {
                 //   pattern:
                 //     /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-                //   message: "Invalid input!",
+                //   message: "The format does not meet requirements!",
                 // },
               ]}
               // getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
@@ -205,7 +205,7 @@ function Z1Gather() {
               className="staFormItem"
               label="Area"
               name="area"
-              rules={[{ required: true, message: "not null!" }]}
+              rules={[{ required: true, message: "This item cannot be empty!" }]}
             >
               <Radio.Group>
                 <Radio value="Asia">1. Asia</Radio>
@@ -220,7 +220,7 @@ function Z1Gather() {
               label="Country"
               name="country"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 { validator: inputCheckFu },
               ]}
               // getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
@@ -232,7 +232,7 @@ function Z1Gather() {
               label="Detailed request"
               name="description"
               rules={[
-                { required: true, message: "not null!" },
+                { required: true, message: "This item cannot be empty!" },
                 {
                   validator: (rule, value) => {
                     if (value) {
@@ -240,7 +240,7 @@ function Z1Gather() {
                         .replaceAll(" ", "")
                         .replaceAll("\n", "");
                       return txt === ""
-                        ? Promise.reject("Invalid input!")
+                        ? Promise.reject("The format does not meet requirements!")
                         : Promise.resolve();
                     } else return Promise.resolve();
                   },

+ 9 - 2
定制化热点/src/assets/base.css

@@ -14,9 +14,16 @@
   display: none !important;
 }
 
+.viewer-backdrop {
+  background-color: rgba(0, 0, 0, .8);
+}
+
 .viewer-container .viewer-close {
-  top: 109px;
-  right: 528px;
+  top: auto;
+  right: auto;
+  left: 50%;
+  bottom: 48px;
+  transform: translateX(-50%);
   background-color: transparent;
   width: 30px;
   height: 30px;

+ 16 - 15
定制化热点/src/views/Home.vue

@@ -91,10 +91,10 @@
 
     <!-- 视频播放的盒子 -->
     <div class="videoPlayBox" v-if="videoSrc">
+      <div class="close" @click="videoSrc = ''">
+        <img src="../assets/images/close.png" alt="" />
+      </div>
       <div class="videoMain">
-        <div class="close" @click="videoSrc = ''">
-          <img src="../assets/images/close.png" alt="" />
-        </div>
         <video :src="videoSrc" controls autoplay></video>
       </div>
     </div>
@@ -552,22 +552,23 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+    .close {
+      cursor: pointer;
+      width: 40px;
+      height: 40px;
+      position: absolute;
+      z-index: 100;
+      left: 50%;
+      bottom: 48px;
+      transform: translateX(-50%);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
     .videoMain {
       width: 800px;
       height: 600px;
       position: relative;
-      .close {
-        cursor: pointer;
-        width: 40px;
-        height: 40px;
-        position: absolute;
-        z-index: 100;
-        top: -20px;
-        right: -20px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
       & > video {
         width: 100%;
         height: 100%;