公司地址更改

package-lock.json

@@ -2428,7 +2428,7 @@
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "async-limiter": {
@@ -2771,9 +2771,19 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "requires": {
         "inherits": "~2.0.0"
@@ -3863,6 +3873,11 @@
         }
       }
     },
+    "comutils": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/comutils/-/comutils-1.1.19.tgz",
+      "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw=="
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3926,7 +3941,7 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "consolidate": {
@@ -4538,7 +4553,7 @@
     },
     "cssfilter": {
       "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+      "resolved": "https://registry.npm.taobao.org/cssfilter/download/cssfilter-0.0.10.tgz",
       "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
     },
     "cssnano": {
@@ -5038,7 +5053,7 @@
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
@@ -6032,6 +6047,13 @@
         }
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-2.0.4.tgz",
@@ -6379,7 +6401,7 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "resolved": "https://registry.nlark.com/gauge/download/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
         "aproba": "^1.0.3",
@@ -7210,7 +7232,7 @@
     },
     "has-unicode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
@@ -9593,7 +9615,7 @@
     },
     "nopt": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649905420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "requires": {
         "abbrev": "1"
@@ -9910,7 +9932,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
@@ -12466,7 +12488,7 @@
     },
     "scss-tokenizer": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "requires": {
         "js-base64": "^2.1.8",
@@ -12475,7 +12497,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "requires": {
             "amdefine": ">=0.0.4"
@@ -14506,6 +14528,14 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
       "integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="
     },
+    "vue-seamless-scroll": {
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz",
+      "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==",
+      "requires": {
+        "comutils": "^1.1.9"
+      }
+    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -14633,6 +14663,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

package.json

@@ -24,6 +24,7 @@
     "vue-pdf": "^4.3.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.3",
+    "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
     "wow.js": "^1.2.2"

public/index.html

@@ -3,12 +3,12 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="keywords" content="职站,教学,教育,在线编程">
+    <meta name="keywords" content="深圳或然科技官网,深圳或然科技,或然科技,教育产业互联网,金融科技,实训软件,虚拟仿真">
     <meta name="description" content="致力于成为教育产业数字化的推动者，成就百万教育产业数字化的创业者"/>
     <meta name="baidu-site-verification" content="code-TRfXe8xIkJ" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css">
-    <title>深圳或然科技有限公司</title>
+    <title>深圳或然科技官网</title>
   </head>
   <body>
     <noscript>

src/layouts/footer/index.vue

@@ -1,22 +1,46 @@
 <template>
-    <div class="footer">
+  <div :class="['footer', {isIndex}]">
-        <div class="info" v-if="isIndex">
+    <template v-if="isIndex">
-            <span class="m-r-20">客服邮箱：service@huorantech.cn</span>
+      <div class="info">
+        <div class="texts">
+          <a class="logo">深圳或然科技</a>
+          <p style="margin-bottom: 5px">
+            <span>公司电话：0755-28109829</span>
+            <span>合作咨询：郭经理  17671782660</span>
+          </p>
+          <p>
+            <span>地址：广东省深圳市南山区粤海街道海天二路盈峰中心2101</span>
+            <span>客户建议：service@huorantech.cn</span>
+          </p>
         </div>
+        <div class="qrcode">
+          <img src="@/assets/img/about/qrcode.png" alt="">
+          <p class="text">扫一扫，关注公众号</p>
+        </div>
+        <div class="qrcode m-l-20">
+          <img width="103" src="@/assets/img/about/qrcode1.png" alt="">
+          <p class="text">扫描添加顾问咨询</p>
+        </div>
+      </div>
+    </template>
     <div class="copyright">
-            <span v-if="isIndex">© Copyright 2021 Occupation Lab 职站</span>
+      <!-- <span>© Copyright 2021 Occupation Lab 职站</span> -->
       <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a>
     </div>
   </div>
 </template>
 <script>
-import Setting from "@/setting";
 export default {
   data() {
       return {
-            isIndex: this.$route.path !== '/login' && Setting.whiteList.some(e => e === this.$route.path) // 官网3个页面才能显示邮箱和版权号
+        isIndex: this.$route.path !== '/about'
       };
   },
+  watch: {
+    '$route'() {
+      this.isIndex = this.$route.path !== '/about'
+    }
+  },
   mounted(){
       
   },
@@ -28,13 +52,50 @@ export default {
 <style lang="scss" scoped>
 .footer{
   padding: 17px 0 9px;
-        text-align: center;
   background-color: #0F1D2E;
+  &.isIndex {
+    padding-top: 30px;
+  }
+  .logo {
+    display: inline-block;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
+    font-size: 20px;
+    font-weight: bold;
+    color: #757F8A;
+    border-bottom: 1px solid rgba(117, 127, 138, 0.4);
+  }
   .info{
-            margin-bottom: 7px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
     font-size: 14px;
     line-height: 20px;
     color: #D7DFE7;
+    border-bottom: 1px solid #2a2a2a;
+  }
+  .texts {
+    margin-right: 150px;
+    p {
+      display: flex;
+    }
+    span {
+      font-size: 12px;
+      color: #757F8A;
+      &:first-child {
+        width: 350px;
+      }
+    }
+  }
+  .qrcode {
+    text-align: center;
+    .text {
+      margin-top: 10px;
+      font-size: 12px;
+      color: #757F8A;
+    }
   }
   .copyright{
     font-size: 12px;

src/layouts/header/index.vue

@@ -21,7 +21,16 @@ export default {
       
     },
     methods: {
-      
+      toIndex() {
+        // 如果是在首页，直接刷新页面，否则，跳转到首页，并且
+        if (this.$route.path === '/index') {
+          location.reload()
+        } else {
+          this.$refs.nav.jump({
+            index: '/index'
+          })
+        }
+      }
     }
 };
 </script>
@@ -41,6 +50,7 @@ $height: 64px;
     box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32);
     .logo{
       margin: 0 50px 0 63px;
+      cursor: pointer;
     }
     .nav-wrap {
       position: absolute;

src/pages/about/list/index.vue

@@ -13,7 +13,6 @@
                 <p class="en">HUORAN TECH</p>
               </div>
               <p class="desc wow fadeInLeft" data-wow-delay="0.7s">公司致力于采用业界领先的信息化技术和过硬的软件研发能力服务于各大高校、金融机构等行业，利用我司技术优势将区块链、云计算、大数据、人工智能等行业前沿技术与金融、教育等行业进行深度融合，为客户提供功能先进、运行高效且便于使用的产业信息化综合解决方案。</p>
-              <p class="desc wow fadeInLeft" data-wow-delay="0.7s">公司自组建以来已成功研发并交付多款信息化产品的定制项目。截至目前，或然累计服务包括河海大学、电科科技大学、四川大学、闽江学院、巢湖学院、山东财经大学等高校。</p>
             </div>
             <img class="bg" src="@/assets/img/about/about1.png" alt="">
         </div>
@@ -106,13 +105,13 @@
               </div>
               <div class="line">
                 <img class="icon" src="@/assets/img/about/tel.png" alt="">
-                地址：深圳市宝安区创业二路华联城市全景1栋G座403室
+                地址：广东省深圳市南山区粤海街道海天二路盈峰中心2101
               </div>
             </div>
             <div class="item">
               <div class="line">
                 <img class="icon" src="@/assets/img/about/phone.png" alt="">
-                合作咨询：孙经理 18565785395
+                合作咨询：郭经理  17671782660
               </div>
               <div class="line">
                 <img class="icon" src="@/assets/img/about/mail.png" alt="">
@@ -227,8 +226,7 @@ export default {
       color: #E5E5E5;
     }
     .desc{
-      margin-bottom: 20px;
+      font-size: 15px;
-      font-size: 14px;
       color: #535C6E;
       line-height: 25px;
     }

src/pages/devPlatform/list/index.vue

@@ -3,6 +3,7 @@
         <div class="banner">
             <h6>教育数字化产品开发者平台</h6>
             <p class="text">与3000所高校共建数字化教育产业未来</p>
+            <el-button class="dev" type="primary" @click="openDev">登录开发者平台</el-button>
         </div>
         <!-- 关于教育产业数字化开发者 -->
         <div class="about">
@@ -76,7 +77,11 @@ export default {
         }
     },
     mounted() {},
-    methods: {}
+    methods: {
+      openDev() {
+        window.open('https://dev.huorantech.cn')
+      }
+    }
 };
 </script>
 
@@ -85,10 +90,18 @@ export default {
     position: relative;
     background-color: #fff;
     .banner {
+        position: relative;
         height: 350px;
         padding: 100px 0 0 180px;
         background: url(../../../assets/img/dev/banner2.png) (90% 32px)/auto no-repeat,
                     url(../../../assets/img/dev/banner1.png) 0 0/100% 100% no-repeat;
+        .dev {
+          position: absolute;
+          bottom: 120px;
+          left: 50%;
+          transform: translateX(-50%);
+          text-align: center;
+        }
         h6 {
             margin-bottom: 30px;
             font-size: 42px;
@@ -111,9 +124,10 @@ export default {
         margin: 0 auto;
     }
     .about {
+        position: relative;
         margin: -60px 0 20px;
         .inner {
-            padding: 40px 0 60px;
+            padding: 40px 0;
             text-align: center;
             background-color: #fff;
             border-radius: 8px;

src/pages/index/list/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="wrap index">
+        <img class="screen" src="@/assets/img/index/index0.png" alt="首页">
         <div class="banner">
           <el-carousel height="688px" autoplay :interval="5000">
             <el-carousel-item>
@@ -215,23 +216,13 @@
                 </div>
               </div>
             </div>
-            <ul class="client-list">
+            <scroll class="clients" :data="clients" :class-option="{limitMoveNum: 2, direction: 2}">
-              <li>
+              <ul class="client-list" ref="client">
-                <img src="@/assets/img/index/school1.png" alt="">
+                <li v-for="i in clients" :key="i">
-              </li>
+                  <img :src="require('@/assets/img/index/school' + i + '.png')" alt="">
-              <li>
-                <img src="@/assets/img/index/school2.png" alt="">
-              </li>
-              <li>
-                <img src="@/assets/img/index/school3.png" alt="">
-              </li>
-              <li>
-                <img src="@/assets/img/index/school4.png" alt="">
-              </li>
-              <li>
-                <img src="@/assets/img/index/school5.png" alt="">
                 </li>
               </ul>
+            </scroll>
           </div>
         </div>
 
@@ -278,14 +269,19 @@ import WOW from 'wow.js'
 import * as echarts from 'echarts'
 import 'echarts/map/js/china.js'
 import chinaFull from './chinaFull.json'
+import scroll from 'vue-seamless-scroll'
 export default {
     name: 'index',
     data() {
       return {
         token: util.local.get(Setting.tokenKey),
-            active: ''
+        active: '',
+        clients: [1, 2, 3, 4, 5]
       }
     },
+    components: {
+      scroll
+    },
     mounted() {
       new WOW().init()
       this.initMap()
@@ -436,7 +432,7 @@ export default {
             index = -1
           }
         }, 2000)
-      },
+      }
     }
 };
 </script>
@@ -446,6 +442,10 @@ export default {
 .wrap{
     position: relative;
     background-color: #F3F6FA;
+    .screen {
+      position: absolute;
+      top: -1000px;
+    }
     .banner {
       position: relative;
       height: 688px;
@@ -465,7 +465,7 @@ export default {
       }
       .banner-bg3 {
         background: url(../../../assets/img/index/banner3-2.png) (right 176px)/auto no-repeat,
-                    url(../../../assets/img/index/banner3-1.png) (left 92px)/auto no-repeat,
+                    url(../../../assets/img/index/banner3-1.png) (left 92px)/100% auto no-repeat,
                     url(../../../assets/img/index/banner3-3.png) (top right)/auto no-repeat;
       }
       .text {
@@ -539,7 +539,7 @@ export default {
       }
       .a-en {
         position: absolute;
-        top: -21px;
+        top: -28px;
         font-size: 46px;
         color: #B6C4D9;
         opacity: .7;
@@ -878,10 +878,16 @@ export default {
         line-height: 33px;
       }
     }
+    .clients {
+      width: 1200px;
+      margin-top: 30px;
+      overflow: hidden;
+    }
     .client-list {
       display: flex;
-      flex-wrap: wrap;
+      &::-webkit-scrollbar {
-      margin-top: 30px;
+        display: none;
+      }
       li {
         display: flex;
         justify-content: center;
@@ -892,9 +898,6 @@ export default {
         background-color: #fff;
         box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.0400);
         border: 1px solid #ECECEC;
-        &:nth-child(5n) {
-          margin-right: 0;
-        }
       }
     }
     .pics{

src/setting.js

@@ -26,7 +26,7 @@ const Setting = {
      * 基础配置
      * */
     platformId: 1, // 平台标识，1职站，2数据平台，3中台
-    titleSuffix: '深圳或然科技有限公司', // 网页标题的后缀
+    titleSuffix: '深圳或然科技官网', // 网页标题的后缀
     routerMode: "hash", // 路由模式，可选值为 history 或 hash
     showProgressBar: true, // 页面切换时，是否显示模拟的进度条
     apiBaseURL: host, // 接口请求地址
@@ -46,7 +46,7 @@ const Setting = {
     /**
      * 路由白名单
      * */
-    whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list'],
+    whiteList: ['/index/list', '/cityPartner/list', '/devPlatform/list'],
     /**
      * 平台列表
      * */