xhkjedu
/
xh_web
Bevaka 6
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge commit '7e0afef51010639bf01e6350b53c592b9b8e1196' into gzb

gzb
guozhongbo 1 år sedan
förälder
de2877211d 7e0afef510
incheckning
1784c61c5c
11 ändrade filer med 39 tillägg och 57 borttagningar
Delad Vy Visa Diff Statistik
  1. 1
    1
      css/comm.css
  2. 6
    0
      css/header.css
  3. 4
    5
      index.html
  4. 4
    5
      sections/about.html
  5. 4
    4
      sections/comm/header.html
  6. 4
    5
      sections/news.html
  7. 4
    5
      sections/news_detail.html
  8. 4
    5
      sections/product.html
  9. 4
    5
      sections/service.html
  10. 4
    5
      sections/trial.html
  11. 0
    17
      utils/rem.js

+ 1
- 1
css/comm.css Visa fil 

@@ -37,7 +37,7 @@ body {
37 37 
   margin: 0;
38 38 
   padding: 0;
39 39 
   line-height: 1;
40 
-  font-family: "Source Han Sans CN" !important;
40 
+  font-family: "MicrosoftYaHei" !important;
41 41 
   color: #333;
42 42 
   box-sizing: border-box;
43 43 
   background-color: #F5F7F9;

+ 6
- 0
css/header.css Visa fil 

@@ -15,6 +15,12 @@
15 15 
   margin-right: 0.08rem;
16 16 
   height: 0.32rem;
17 17 
 }
18 
+.header_box .header_left > img.header_logo {
19 
+  width: 0.39rem;
20 
+}
21 
+.header_box .header_left > img.header_title {
22 
+  width: 1.35rem;
23 
+}
18 24 
 .header_box .header_left .left_white {
19 25 
   display: inline-block;
20 26 
 }

+ 4
- 5
index.html Visa fil 

@@ -11,16 +11,15 @@
11 11 
     <link rel="stylesheet" href="./css/comm.css" />
12 12 
     <link rel="stylesheet" href="../css/header.css">
13 13 
     <link rel="stylesheet" href="./css/index.css" />
14 
-    <script src="./utils/rem.js"></script>
15 14 
   </head>
16 15 
   <body>
17 16 
     <div class="header_root">
18 17 
       <div class="header_box">
19 18 
         <div class="header_left">
20 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
21 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
22 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
23 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
19 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
20 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
21 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
22 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
24 23 
         </div>
25 24 
         <div class="header_right">
26 25 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/about.html Visa fil 

@@ -9,17 +9,16 @@
9 9 
     <link rel="stylesheet" href="../css/comm.css" />
10 10 
     <link rel="stylesheet" href="../css/header.css">
11 11 
     <link rel="stylesheet" href="../css/about.css" />
12 
-    <script src="../utils/rem.js"></script>
13 12 
     <title>关于我们</title>
14 13 
   </head>
15 14 
   <body>
16 15 
     <div class="header_root bg_white" data-nav_info="3">
17 16 
       <div class="header_box">
18 17 
         <div class="header_left">
19 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
20 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
21 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
22 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
18 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
19 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
20 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
21 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
23 22 
         </div>
24 23 
         <div class="header_right">
25 24 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 4
sections/comm/header.html Visa fil 

@@ -122,10 +122,10 @@
122 122 
   <body>
123 123 
     <div class="header_box">
124 124 
       <div class="header_left">
125 
-        <img class="left_white" src="../../img/logo_info/header_logo.png" />
126 
-        <img class="left_white" src="../../img/logo_info/header_title.png" />
127 
-        <img class="left_gray" src="../../img/logo_info/header_logo1.png" />
128 
-        <img class="left_gray" src="../../img/logo_info/header_title1.png" />
125 
+        <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
126 
+        <img class="left_white header_title" src="../img/logo_info/header_title.png" />
127 
+        <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
128 
+        <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
129 129 
       </div>
130 130 
       <div class="header_right">
131 131 
         <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/news.html Visa fil 

@@ -11,16 +11,15 @@
11 11 
     <link rel="stylesheet" href="../css/comm.css" />
12 12 
     <link rel="stylesheet" href="../css/header.css">
13 13 
     <link rel="stylesheet" href="../css/news.css" />
14 
-    <script src="../utils/rem.js"></script>
15 14 
   </head>
16 15 
   <body>
17 16 
     <div class="header_root bg_white" data-nav_info="5">
18 17 
       <div class="header_box">
19 18 
         <div class="header_left">
20 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
21 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
22 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
23 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
19 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
20 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
21 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
22 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
24 23 
         </div>
25 24 
         <div class="header_right">
26 25 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/news_detail.html Visa fil 

@@ -11,16 +11,15 @@
11 11 
     <link rel="stylesheet" href="../css/comm.css" />
12 12 
     <link rel="stylesheet" href="../css/header.css">
13 13 
     <link rel="stylesheet" href="../css/news.css" />
14 
-    <script src="../utils/rem.js"></script>
15 14 
   </head>
16 15 
   <body>
17 16 
     <div class="header_root bg_white" data-nav_info="5">
18 17 
       <div class="header_box">
19 18 
         <div class="header_left">
20 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
21 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
22 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
23 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
19 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
20 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
21 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
22 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
24 23 
         </div>
25 24 
         <div class="header_right">
26 25 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/product.html Visa fil 

@@ -9,17 +9,16 @@
9 9 
     <link rel="stylesheet" href="../css/comm.css" />
10 10 
     <link rel="stylesheet" href="../css/header.css">
11 11 
     <link rel="stylesheet" href="../css/product.css" />
12 
-    <script src="../utils/rem.js"></script>
13 12 
     <title>产品中心</title>
14 13 
   </head>
15 14 
   <body>
16 15 
     <div class="header_root bg_white" data-nav_info="1">
17 16 
       <div class="header_box">
18 17 
         <div class="header_left">
19 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
20 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
21 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
22 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
18 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
19 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
20 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
21 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
23 22 
         </div>
24 23 
         <div class="header_right">
25 24 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/service.html Visa fil 

@@ -9,7 +9,6 @@
9 9 
     <link rel="stylesheet" href="../css/comm.css" />
10 10 
     <link rel="stylesheet" href="../css/header.css" />
11 11 
     <link rel="stylesheet" href="../css/service.css" />
12 
-    <script src="../utils/rem.js"></script>
13 12 
     <title>服务案例</title>
14 13 
     <style>
15 14 
       body {

@@ -21,10 +20,10 @@
21 20 
     <div class="header_root bg_white" data-nav_info="2">
22 21 
       <div class="header_box">
23 22 
         <div class="header_left">
24 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
25 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
26 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
27 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
23 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
24 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
25 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
26 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
28 27 
         </div>
29 28 
         <div class="header_right">
30 29 
           <div data-nav="1" class="header_nav_item nav_1">

+ 4
- 5
sections/trial.html Visa fil 

@@ -8,17 +8,16 @@
8 8 
     <link rel="stylesheet" href="../css/comm.css" />
9 9 
     <link rel="stylesheet" href="../css/header.css">
10 10 
     <link rel="stylesheet" href="../css/trial.css" />
11 
-    <script src="../utils/rem.js"></script>
12 11 
     <title>申请试用</title>
13 12 
   </head>
14 13 
   <body>
15 14 
     <div class="header_root bg_white" data-nav_info="4">
16 15 
       <div class="header_box">
17 16 
         <div class="header_left">
18 
-          <img class="left_white" src="../img/logo_info/header_logo.png" />
19 
-          <img class="left_white" src="../img/logo_info/header_title.png" />
20 
-          <img class="left_gray" src="../img/logo_info/header_logo1.png" />
21 
-          <img class="left_gray" src="../img/logo_info/header_title1.png" />
17 
+          <img class="left_white header_logo" src="../img/logo_info/header_logo.png" />
18 
+          <img class="left_white header_title" src="../img/logo_info/header_title.png" />
19 
+          <img class="left_gray header_logo" src="../img/logo_info/header_logo1.png" />
20 
+          <img class="left_gray header_title" src="../img/logo_info/header_title1.png" />
22 21 
         </div>
23 22 
         <div class="header_right">
24 23 
           <div data-nav="1" class="header_nav_item nav_1">

+ 0
- 17
utils/rem.js Visa fil 

@@ -1,17 +0,0 @@
1 
-(function (doc, win) {
2 
-  var docEl = doc.documentElement,
3 
-    resizeEvt = "orientationchange" in window ? "orientationchange" : "resize",
4 
-    recalc = function () {
5 
-      var clientWidth = docEl.clientWidth; //获取设备尺寸
6 
-      if (!clientWidth) return;
7 
-      if (clientWidth >= 1920) {
8 
-        //设计稿宽度
9 
-        docEl.style.fontSize = "100px";
10 
-      } else {
11 
-        docEl.style.fontSize = 100 * (clientWidth / 1920) + "px";
12 
-      }
13 
-    };
14 
-  if (!doc.addEventListener) return;
15 
-  win.addEventListener(resizeEvt, recalc, false); //绑定事件
16 
-  doc.addEventListener("DOMContentLoaded", recalc, false);
17 
-})(document, window);

Write Förhandsgranska
Laddar…
Avbryt
Spara