Browse Source

Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/SesameDevelopment

cl 6 years ago
parent
commit
186feed59e
6 changed files with 58 additions and 26 deletions
  1. 37 0
      package-lock.json
  2. 1 0
      package.json
  3. 1 1
      public/index.html
  4. 18 14
      src/views/Home.vue
  5. 0 1
      src/views/Serve.vue
  6. 1 10
      src/views/Teach.vue

+ 37 - 0
package-lock.json

@@ -1991,6 +1991,43 @@
       "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
       "dev": true
     },
+    "axios": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "requires": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-code-frame%2Fdownload%2Fbabel-code-frame-6.26.0.tgz",

+ 1 - 0
package.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "animate.css": "^3.7.2",
+    "axios": "^0.19.0",
     "bootstrap": "3.4.1",
     "bootstrap3": "^3.3.5",
     "core-js": "^2.6.5",

+ 1 - 1
public/index.html

@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="..//lib/bootstrap-3.3.7-dist/css/bootstrap.css">
     <script src="..//lib/jquery/jquery-3.4.1.js"></script>
     <script src="..//lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
-    <title>vue-cli-new-router</title>
+    <title>芝麻官网</title>
   </head>
   <body>
     <noscript>

+ 18 - 14
src/views/Home.vue

@@ -3,7 +3,7 @@
     <swiperr :message="message"></swiperr>
     <div id="sale" class="liubai">
       <p class="saletitle">致力于互联网创新技术服务</p>
-      <p class="salecontent">技术更跨界、创意更自由、服务更贴心</p>
+      <p class="salecontent" style="height:22px;">技术更跨界、创意更自由、服务更贴心</p>
       <div class="sale_content_son">
         <div v-for="(item, index) in saleArray" :key="index" class="pianyi-center">
           <div id="box1">
@@ -31,28 +31,28 @@
     >
       <div id="pianyi" class="pianyi-center">
         <div class="blurrflex">
-          <p>3</p>
-          <p>年</p>
+          <p style="width:28px;height:48px;">3</p>
+          <p style="width:20px;height:30px;">年</p>
         </div>
         <div class="blurrtext">多年互联网创新服务经验</div>
       </div>
       <div class="pianyi-center">
         <div class="blurrflex">
-          <p style="letter-spacing: 0.4px;">20</p>
-          <p>+</p>
+          <p style="letter-spacing: 0.4px;width:54px;height:48px;">20</p>
+          <p style="width:20px;height:30px;">+</p>
         </div>
         <div class="blurrtext">提供多样化服务类型</div>
       </div>
       <div class="pianyi-center">
         <div class="blurrflex">
-          <p style="letter-spacing: 0.4px;">40</p>
-          <p>+</p>
+          <p style="letter-spacing: 0.4px;width:54px;height:48px;">40</p>
+          <p style="width:20px;height:30px;">+</p>
         </div>
         <div class="blurrtext">持续服务更多用户</div>
       </div>
       <div class="pianyi-center">
         <div class="blurrflex">
-          <p style="letter-spacing: 1px;">12000</p>
+          <p style="letter-spacing: 1px;width:143px;height:48px;">12000</p>
           <p></p>
         </div>
         <div class="blurrtext">互联网创新业务市场庞大</div>
@@ -62,7 +62,7 @@
     <div id="bigexploit">
       <div id="exploit" class="liubai">
         <p class="saletitle">全新的开发模式</p>
-        <p class="salecontent">高效、快速、减少花费</p>
+        <p class="salecontent" style="height:22px">高效、快速、减少花费</p>
         <div id="exploit-Box" style="display:flex;justify-content:space-between; flex-wrap:wrap;">
           <div id="box2">
             <div id="box2-Up">
@@ -95,10 +95,10 @@
     <div style="background-color: #FFFFFF;padding-top:80px;">
       <div id="fee" class="liubai">
         <p class="saletitle" style="margin-bottom:6px">崭新的收费模式</p>
-        <p class="salecontent" style="margin-bottom:20px">确保收费简洁化、透明化</p>
+        <p class="salecontent" style="margin-bottom:20px;height:22px;">确保收费简洁化、透明化</p>
         <div id="box3">
           <div id="box3-Left">
-            <img src="..\components\img\fee-left.png" alt />
+            <img src="..\components\img\fee-left.png" alt style="width:585px;height:303px;"/>
           </div>
           <div id="box3-Right">
             <div class="box3-Right-li">
@@ -124,7 +124,7 @@
     <div style="background-image: linear-gradient(0deg, #0057cb 0%, #007bff 100%);">
       <div id="train" class="liubai">
         <p id="train-title1">灵活的人才培养方案</p>
-        <p id="train-content1">免费的实习生培训计划、严格的实习生管理制度、真实的项目实战锻炼</p>
+        <p id="train-content1" style="height:22px;">免费的实习生培训计划、严格的实习生管理制度、真实的项目实战锻炼</p>
         <div class="train-pic-copy">
           <div id="train-pic" v-for="(item, index) in trainPicArry" :key="index">
             <div class="train-pic-con">
@@ -355,7 +355,7 @@ div#sale {
   font-size: 16px;
   letter-spacing: 0;
   line-height: 26px;
-  margin-top: 3px;
+  /* margin-top: 3px; */
   width: 20px;
 }
 #blurr .blurrtext {
@@ -436,6 +436,10 @@ div#box1-Up {
   text-align: center;
   line-height: 28px;
 }
+#box1-Up img{
+  width: 44px;
+  height: 44px;
+}
 div#box1-Dn {
   font-family: PingFangSC-Light;
   font-size: 16px;
@@ -706,7 +710,7 @@ export default {
           src: require("../assets/1.png"),
           title: "助力新零售",
           content: [
-            { con: "结合优秀硬件团队" },
+            { con: "结合优秀硬结合优秀硬件团队" },
             { con: "利用互联网优势" },
             { con: "完成基于物联网技术的新零售体系建立或推广" }
           ]

+ 0 - 1
src/views/Serve.vue

@@ -78,7 +78,6 @@
                 </ul>
             </div>
         </div>
-    
     </div>
     <home-footer></home-footer>
  </div>

+ 1 - 10
src/views/Teach.vue

@@ -386,7 +386,7 @@ export default {
 }
 #right .content .padding .job ul li{
     font-size: 22px;
-    height: 50px;
+    /* height: 50px; */
     line-height: 50px;
     padding-left: 6%;
 }
@@ -996,15 +996,11 @@ display: inline-block;
 #right .content .padding .job ul li{
     font-size: 13px;
     padding-left: 6%;
-    height: 50px;
     padding-right: 15px;
 }
 #right .content .padding .job ul li span{
     margin-right: 0;
 }
-#right .content .padding .job>div:last-child{
-    margin-top: 50px;
-}
 #right .content .padding .job :first-child ul li span{
     margin-right: 15px;
 }
@@ -1101,9 +1097,4 @@ display: inline-block;
     max-height: 200px;
 }
 }
-@media screen and (max-width: 340px) {
-#right .content .padding .job div:nth-of-type(2) ul li:nth-child(2){
-    margin-bottom: 40px;
-}   
-}
 </style>