Merge remote-tracking branch 'origin/gzb' into wzl

css/about.css

@@ -130,7 +130,6 @@
 }
 .area_fs {
   width: 2.8rem;
-  height: 3rem;
   background-color: white;
   color: #333333;
   text-align: center;
@@ -151,11 +150,7 @@
 .area_fs div {
   font-size: 0.18rem;
   line-height: 0.5rem;
-}
-.area_fs p {
-  font-size: 0.14rem;
-  line-height: 0.24rem;
-  margin-top: 0;
+  margin-bottom: 0.4rem;
 }
 .develop_container {
   height: 1.6rem;
@@ -194,9 +189,9 @@
 .rounds {
   width: 100%;
   position: absolute;
-  top: 30%;
+  top: 50%;
   left: 0;
-  transform: translate(0, -50%);
+  transform: translate(0,-82%);
   white-space: nowrap;
 }
 .round_q {

css/product.css

@@ -60,7 +60,6 @@
   justify-content: space-between;
 }
 .area_item{
-  height: 3rem;
   border-radius: 0.1rem;
   background: #fefeffff;
   border: 1px solid #f1f4fc;
@@ -68,6 +67,7 @@
   box-sizing: border-box;
   background-color: #fefeff;
   text-align: center;
+  cursor: pointer;
 }
 .area_item img{
   width: 0.56rem;
@@ -157,7 +157,7 @@
 }
 .s2{
   top:2.4rem;
-  right: 1rem;
+  right: 0.8rem;
 }
 .s3 {
   top: 4rem;
@@ -168,7 +168,7 @@
 
 .s5 {
   top: 2.4rem;
-  left: 1rem;
+  left: 0.8rem;
 }
 
 .s6 {
@@ -291,7 +291,7 @@
   margin-left: 0.1rem;
 }
 .area_top img {
-  width: 5rem;
+  width: 6rem;
   height: 5rem;
   margin: 0 0.6rem;
 }

js/trial.js

@@ -31,7 +31,8 @@ $(function () {
     var filter =
       /^[\w\-\.]+@[a-z0-9]+(\-[a-z0-9]+)?(\.[a-z0-9]+(\-[a-z0-9]+)?)*\.[a-z]{2,4}$/i;
     let blnTest = filter.test(mailbox);
-    if (!blnTest) {
+    console.log(mailbox)
+    if (mailbox && !blnTest) {
       $(".err_mailbox").show();
     }
   });
@@ -43,99 +44,7 @@ $(function () {
     var filter =
       /^[\w\-\.]+@[a-z0-9]+(\-[a-z0-9]+)?(\.[a-z0-9]+(\-[a-z0-9]+)?)*\.[a-z]{2,4}$/i;
     let blnTest = filter.test(mailbox);
-    if (!blnTest) {
-      $(".err_mailbox").show();
-    } else {
-      $(".err_mailbox").hide();
-    }
-  });
-  //提交
-  var Loading = false;
-
-  $(".btn").click(() => {
-    if (Loading) {
-      return;
-    }
-    let name = $("#account").val();
-    if (!name) {
-      $(".err_account").show();
-      return;
-    }
-    let phone = $("#phone").val();
-    if (!phone) {
-      $(".err_phone").show();
-      return;
-    }
-    var data = {
-      account: $("#account").val(),
-      phone: $("#phone").val(),
-      mailbox: $("#mailbox").val(),
-      commcomm: $("#comm").val()
-    };
-    Loading = true;
-    //7.1.2 申请试用--添加
-    $.ajax({
-      type: "POST",
-      url: $.baseUrl + "fc/add",
-      dataType: "json",
-      async: false,
-      data: JSON.stringify(data),
-      contentType: "application/json; charset=utf-8",
-      success: function (data) {
-        Loading = false;
-        if (data.code === 0) {
-          alert("申请成功");
-        } else {
-          alert(data.msg);
-        }
-      }
-    });
-  });
-  $(".header_root").load("./comm/header.html");
-  $(".footer_root").load("./comm/footer.html");
-  $(".err_account").hide();
-  $(".err_phone").hide();
-  $(".err_mailbox").hide();
-  //姓名
-  $("#account").blur(() => {
-    let name = $("#account").val();
-    if (!name) {
-      $(".err_account").show();
-    }
-  });
-  $("#account").focus(() => {
-    $(".err_account").hide();
-  });
-  //联系电话
-  $("#phone").blur(() => {
-    let phone = $("#phone").val();
-    if (!phone) {
-      $(".err_phone").show();
-    }
-  });
-  $("#phone").focus(() => {
-    $(".err_phone").hide();
-  });
-
-  //邮箱
-  $("#mailbox").blur(() => {
-    let mailbox = $("#mailbox").val();
-    var filter =
-      /^[\w\-\.]+@[a-z0-9]+(\-[a-z0-9]+)?(\.[a-z0-9]+(\-[a-z0-9]+)?)*\.[a-z]{2,4}$/i;
-    let blnTest = filter.test(mailbox);
-    if (!blnTest) {
-      $(".err_mailbox").show();
-    }
-  });
-  $("#mailbox").focus(() => {
-    $(".err_mailbox").hide();
-  });
-  $("#mailbox").bind("input propertychange change", function (event) {
-    let mailbox = $("#mailbox").val();
-    var filter =
-      /^[\w\-\.]+@[a-z0-9]+(\-[a-z0-9]+)?(\.[a-z0-9]+(\-[a-z0-9]+)?)*\.[a-z]{2,4}$/i;
-    let blnTest = filter.test(mailbox);
-    if (!blnTest) {
+    if (mailbox && !blnTest) {
       $(".err_mailbox").show();
     } else {
       $(".err_mailbox").hide();

sections/about.html

@@ -110,50 +110,37 @@
             <div class="area_fs">
               <img src="../img/about/icon1.png" />
               <div>为教育服务</div>
-              <p>技术为教育服务，教育为发展服务</p>
             </div>
             <div class="area_fs">
               <img src="../img/about/icon2.png" />
               <div>为师生服务</div>
-              <p>
-                通过大学习、深调研、抓落实，聚焦
-                痛点、前移服务、提质增效，将一件 件服务师生的具体事项落到实处
-              </p>
             </div>
             <div class="area_fs">
               <img src="../img/about/icon3.png" />
               <div>为成长助力</div>
-              <p>
-                通过大学习、深调研、抓落实，聚焦
-                痛点、前移服务、提质增效，将一件 件服务师生的具体事项落到实处
-              </p>
             </div>
             <div class="area_fs">
               <img src="../img/about/icon4.png" />
               <div>为梦想拼搏</div>
-              <p>
-                通过大学习、深调研、抓落实，聚焦
-                痛点、前移服务、提质增效，将一件 件服务师生的具体事项落到实处
-              </p>
             </div>
           </div>
           <div class="area_title" style="margin: 0.5rem 0">
             我们始终秉承的愿景
           </div>
-          <div class="area_four bot_fs">
-            <div class="area_fs" style="height: 2rem">
+          <div class="area_four">
+            <div class="area_fs">
               <img src="../img/about/icon5.png" />
               <div>燃星星之火</div>
             </div>
-            <div class="area_fs" style="height: 2rem">
+            <div class="area_fs">
               <img src="../img/about/icon6.png" />
               <div>呈燎原之势</div>
             </div>
-            <div class="area_fs" style="height: 2rem">
+            <div class="area_fs">
               <img src="../img/about/icon7.png" />
               <div>汇涓涓细流</div>
             </div>
-            <div class="area_fs" style="height: 2rem">
+            <div class="area_fs">
               <img src="../img/about/icon8.png" />
               <div>成汪洋大海</div>
             </div>