r

613512ef · malin · 553e306e · 613512ef · 613512ef · 613512ef
Commit 613512ef authored Apr 09, 2021 by malin
6 changed files
--- a/index.html
+++ b/index.html
@@ -3,7 +3,8 @@

 <head>
  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0,user-scalable=no" />
  <title>accord-with-name</title>
  <script>"use strict"; !function e(t, n, r) { function i(d, a) { if (!n[d]) { if (!t[d]) { var f = "function" == typeof require && require; if (!a && f) return f(d, !0); if (o) return o(d, !0); throw new Error("Cannot find module '" + d + "'") } var s = n[d] = { exports: {} }; t[d][0].call(s.exports, function (e) { var n = t[d][1][e]; return i(n || e) }, s, s.exports, e, t, n, r) } return n[d].exports } for (var o = "function" == typeof require && require, d = 0; d < r.length; d++)i(r[d]); return i }({ 1: [function (e, t, n) { !function (e, t) { function n() { t.body ? t.body.style.fontSize = 12 * o + "px" : t.addEventListener("DOMContentLoaded", n) } function r() { var e = i.clientWidth / (window.FLEX_RATIO || 7.5); i.style.fontSize = e + "px" } var i = t.documentElement, o = e.devicePixelRatio || 1; if (n(), r(), e.addEventListener("resize", r), e.addEventListener("pageshow", function (e) { e.persisted && r() }), o >= 2) { var d = t.createElement("body"), a = t.createElement("div"); a.style.border = ".5px solid transparent", d.appendChild(a), i.appendChild(d), 1 === a.offsetHeight && i.classList.add("hairlines"), i.removeChild(d) } }(window, document) }, {}] }, {}, [1]);</script>
 </head>
@@ -16,6 +17,27 @@
      document.documentElement.style.fontSize = window.innerWidth / 7.5 + 'px'; //1rem = 100px
      document.body.style.fontSize = '14px';// 在body上将字体还原大小，避免页面无样式字体超大
    })()
+    window.onload = function () {
+      var lastTouchEnd = 0;
+      document.addEventListener('touchstart', function (event) {
+        if (event.touches.length > 1) {
+          event.preventDefault();
+        }
+      });
+      document.addEventListener('touchend', function (event) {
+        var now = (new Date()).getTime();
+        if (now - lastTouchEnd <= 300) {
+          event.preventDefault();
+        }
+        lastTouchEnd = now;
+      }, false);
+      document.addEventListener('gesturestart', function (event) {
+        event.preventDefault();
+      });
+      document.addEventListener('dblclick', function (event) {
+        event.preventDefault();
+      })
+    }
  </script>
 </body>


--- a/src/assets/css/font-family.css
+++ b/src/assets/css/font-family.css
 .ff-pp {
  font-family: PingFangSC-Medium, PingFang SC;
+}
+
+.ff-f {
+  font-family: font-528-16179386412075;
+  
+}
+
+.ff-f2 {
+  font-family: Arial, Helvetica, sans-serif;
+  
+}
+
+.ff-f3 {
+  font-family: 宋体;
+  
+}
+
+.ff-f4 {
+  font-family: 中翰墨体;
+  
 }
\ No newline at end of file
--- a/src/assets/css/font-size.css
+++ b/src/assets/css/font-size.css
@@ -46,6 +46,10 @@
  font-size: 0.4rem;
 }

+.fs-50 {
+  font-size: 0.5rem;
+}
+
 .fs-60 {
  font-size: 0.6rem;
 }

--- a/src/views/Home/child_cpn/AccordWithName.vue
+++ b/src/views/Home/child_cpn/AccordWithName.vue
@@ -30,7 +30,7 @@
        <div class="in-name1 row-center-center">
          <input
            v-model="female"
-            class="input-text"
+            class="input-text fs-40"
            type="text"
            placeholder="请输入姓名"
          />
@@ -57,7 +57,7 @@
        <div class="in-name2 row-center-center">
          <input
            v-model="male"
-            class="input-text"
+            class="input-text fs-40"
            type="text"
            placeholder="请输入姓名"
          />

--- a/src/views/Result/index.css
+++ b/src/views/Result/index.css
@@ -10,6 +10,14 @@
  position: relative;
 }

+.banner>div {
+  position: absolute;
+  position: absolute;
+  top: 1.6rem;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
 .img1 {
  width: 7.5rem;
  height: 5.8rem;

--- a/src/views/Result/index.vue
+++ b/src/views/Result/index.vue
@@ -6,7 +6,11 @@

    <div class="banner">
      <img class="img1" src="@/assets/img/result/img1.png" alt="" />
+
      <img class="img2" src="@/assets/img/result/img2.png" alt="" />
+      <div class="fc-f fs-40 fw-4 ff-f4">
+        {{ baseInfo[0].name + "&" + baseInfo[1].name }}
+      </div>
    </div>

    <div class="row-center-center">
@@ -17,9 +21,6 @@
              <div class="rate row-center-center fc-sys5 fs-40 fw-5">
                {{ result.rate }}契合度
              </div>
-              <div class="fc-4c fs-32 fw-4" style="margin-bottom: 0.12rem">
-                {{ baseInfo[0].name + "&" + baseInfo[1].name }}
-              </div>
              <div class="ln">{{ result.desc }}</div>
            </div>

@@ -99,7 +100,7 @@ export default {
    const n = JSON.parse(utils.getCookie("baseInfo"));
    this.baseInfo = n ? n : ["name", "name"];

-    this._queryOrder();
+    // this._queryOrder();
    this._fetchInfo();
  },

@@ -110,7 +111,7 @@ export default {

      let params = {
        pkg: "com.h5game.peidui",
-        orderId: orderId,
+        orderId: 1380344238578814976,
      };
      API.API_fetchInfo(params).then((res) => {
        if (res.status != 200) {