diff --git a/src/api/index.js b/src/api/index.js
index c871b3d..8addee7 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -24,6 +24,7 @@ export default {
   seoList: `/iasf/seo/list`,
   columnDisplayFloatingBar: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/columnDisplayFloatingBar`,
   showTheFooterAccordingToTheColumn: `/iasf/SysFooterSetupService/SysFooterSetup/showTheFooterAccordingToTheColumn`,
+  findLogo: `/iasf/LogoService/Logo/findById`,
 
   listMarketing: `/nakadai/nakadai/mall/marketing/promotion/pagingQueryList`,
   courseProduct: `/iasf/productDetails/courseProduct`,
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 4ff0ee1..4eae78c 100644
Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ
diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 7e98924..f101a49 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -118,44 +118,6 @@
       </div>
     </template>
 
-    <div v-if="showContactPath.includes($route.path)" class="contact">
-      <div class="inner">
-        <div class="title">
-          <h6>Contact us</h6>
-          <p class="text">CONTACT US</p>
-        </div>
-        <div class="region">
-          <img class="dot" src="@/assets/images/dot.png" alt="">
-          <p class="name">Shenzhen</p>
-        </div>
-        <div class="info">
-          <!-- <img class="logo"
-               src="@/assets/images/logo.png"
-               alt=""> -->
-          <div class="texts">
-            <div class="lines">
-              <div class="line">
-                <img class="icon" src="@/assets/images/mail.png" alt="">
-                Email: {{ isSfel ? 'fel@mail.iasf.ac.cn' : 'std@mail.iasf.ac.cn' }}
-              </div>
-              <div class="line">
-                <img class="icon" src="@/assets/images/tel.png" alt="">
-                Telephone: {{ isSfel ? '0755-21096052' : '0086-755-21096026' }}
-              </div>
-              <div class="line">
-                <img class="icon" src="@/assets/images/address.png" alt="">
-                Address: {{ isSfel ? '自由电子激光工程经理部' :
-                  '268 Zhenyuan St, Building A3, Floor 3-6, Guangming District, Shenzhen, Guangdong, P.R.China' }}
-              </div>
-            </div>
-            <div class="qrcode">
-              <!-- <img src="@/assets/images/about/qrcode.png" alt=""> -->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
     <div class="tool">
       <div v-for="(item, i) in floatings" :key="i" class="float">
         <div class="item" :style="{ backgroundImage: 'url(' + item.pictureAddress + ')' }"></div>
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 7a144cd..cdf41ea 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,12 +1,10 @@
 <template>
   <div :class="['header', { channel: isHome, estate: isEstate, iasf: isIasf }]">
     <a class="logo" @click="toIndex">
-      <template v-if="GTA">
-        <img src="@/assets/images/logo2.png" alt="">
-        产业学院平台
+      <template>
+        <img :src="logoForm.logoUrl" alt="">
+        {{ logoForm.title }}
       </template>
-
-      <img v-else src="@/assets/images/logo.png" alt="">
     </a>
     <!-- pc端 -->
     <template v-if="$store.getters.getModelType">
@@ -50,6 +48,10 @@ export default {
       modelType: false,
       navShow: true,
       qrcodeVisible: false,
+      logoForm: {
+        title: '',
+        logoUrl: require('@/assets/images/logo.png')
+      },
     };
   },
   components: {
@@ -79,6 +81,7 @@ export default {
     window.removeEventListener('scroll', this.handleScroll)
   },
   mounted () {
+    this.getLogo()
     this.setKeyword('')
     window.addEventListener('scroll', this.handleScroll) // 监听页面滚动
     document.body.addEventListener('click', e => {
@@ -90,12 +93,17 @@ export default {
     ...mapMutations('content', [
       'setKeyword'
     ]),
+    // 获取logo
+    async getLogo () {
+      const res = await this.$post(`${this.api.findLogo}?siteId=${this.site}`)
+      if (res.data) {
+        this.logoForm = res.data
+      }
+    },
     toIndex () {
       this.$refs.nav.jump()
     },
-    stop () {
-
-    },
+    stop () { },
     /**
      * pc端下,当导航栏条目大于10的情况下,显示更多按钮
      * type : true显示,false隐藏
@@ -146,7 +154,11 @@ export default {
       if (this.GTA) {
         window.open('https://izhixinyun.com/#/login')
       } else {
-        this.qrcodeVisible = true
+        if (this.site == 7) {
+          window.open('https://www.occupationlab.com/#/login')
+        } else {
+          this.qrcodeVisible = true
+        }
       }
     },
     // 全局搜索
@@ -195,13 +207,14 @@ $height: 90px;
   .logo {
     display: inline-flex;
     align-items: center;
-    font-size: 20px;
-    font-weight: 600;
+    font-size: 18px;
+    font-weight: 700;
     color: #333;
     cursor: pointer;
 
     img {
-      width: 150px;
+      max-height: 50px;
+      margin-right: 10px;
     }
   }
 
diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js
index 1300c44..c5b771d 100644
--- a/src/mixins/article/index.js
+++ b/src/mixins/article/index.js
@@ -8,7 +8,7 @@ export default {
   },
   computed: {
     site () {
-      return this.$route.query.siteId || this.$store.state.content.site
+      return this.$route.query.siteId || (location.href.includes('eduvessel') ? 7 : 1)
     }
   },
   mounted () {
diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue
index f27161a..6765be0 100644
--- a/src/pages/application/index.vue
+++ b/src/pages/application/index.vue
@@ -1,16 +1,12 @@
 <template>
-  <div class="wrap"
-       v-if="modules.length>=1">
+  <div class="wrap" v-if="modules.length >= 1">
     <el-carousel :interval="6000"
-                 :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
-                 :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+      :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
+      :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
       <template v-for="(item, i) in modules[0].list">
-        <el-carousel-item v-if="item.pic && item.isEnable"
-                          :key="i">
-          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]"
-               @click="openLink(item)">
-            <img :src="item.pic"
-                 alt="">
+        <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
+          <div :class="['banner-item', { 'cursor-pointer': isLink(item.link.linkName) }]" @click="openLink(item)">
+            <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
         </el-carousel-item>
@@ -19,24 +15,16 @@
 
     <div class="block history gray">
       <div class="inner">
-        <h2 class="wow fadeInLeft"
-            style="margin-left: 57px">{{ modules[1].form.title }}</h2>
-        <div class="texts wow fadeInDown"
-             data-wow-delay="0.5s">
+        <h2 class="wow fadeInLeft" style="margin-left: 57px">{{ modules[1].form.title }}</h2>
+        <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
             <h2>{{ modules[1].form.subTitle }}</h2>
             <!-- <div class="line"></div> -->
             <div class="des">{{ modules[1].form.des }}</div>
-            <img :class="{'arrow': isLink(modules[1].form.link.linkName)}"
-                 src="@/assets/images/arrow.png"
-                 alt=""
-                 @click="openLink(modules[1].form)">
+            <img v-if="modules[1].form.link" :class="{ 'arrow': isLink(modules[1].form.link.linkName) }"
+              src="@/assets/images/arrow.png" alt="" @click="openLink(modules[1].form)">
           </div>
-          <img class="bg"
-               width="562"
-               height="506"
-               :src="modules[1].form.pic"
-               alt="">
+          <img class="bg" width="562" height="506" :src="modules[1].form.pic" alt="">
         </div>
       </div>
     </div>
@@ -44,21 +32,13 @@
     <div class="block">
       <div class="inner app-inner">
         <h2 class="b-title wow fadeInUp">{{ modules[2].form.title }}</h2>
-        <p class="intro wow fadeInUp"
-           data-wow-delay="0.5s">{{ modules[2].form.des }}</p>
+        <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[2].form.des }}</p>
         <ul class="app">
-          <li v-for="(item, i) in modules[3].list"
-              :key="i"
-              class="wow fadeInDown"
-              :data-wow-delay="(0.2 * i).toFixed(1) + 's'"
-              :class="{'cursor-pointer': isLink(item.link.linkName)}"
-              @click="openLink(item)">
-            <img class="bg"
-                 :src="require('@/assets/images/application/app' + (i + 1) + '.png')"
-                 alt="">
-            <img class="icon"
-                 :src="require('@/assets/images/application/app' + (i + 1) + '-1.png')"
-                 alt="">
+          <li v-for="(item, i) in modules[3].list" :key="i" class="wow fadeInDown"
+            :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{ 'cursor-pointer': isLink(item.link.linkName) }"
+            @click="openLink(item)">
+            <img class="bg" :src="require('@/assets/images/application/app' + (i + 1) + '.png')" alt="">
+            <img class="icon" :src="require('@/assets/images/application/app' + (i + 1) + '-1.png')" alt="">
             <p class="text">{{ item.title }}</p>
           </li>
         </ul>
@@ -68,17 +48,12 @@
     <div class="block gray">
       <div class="inner">
         <h2 class="b-title wow fadeInUp">{{ modules[4].form.title }}</h2>
-        <p class="intro wow fadeInUp"
-           data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
+        <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
         <ul class="group">
-          <li v-for="(item, i) in modules[5].list"
-              :key="i"
-              class="wow fadeInDown"
-              :data-wow-delay="(0.2 * i).toFixed(1) + 's'"
-              :class="{'cursor-pointer': isLink(item.link.linkName)}"
-              @click="openLink(item)">
-            <img :src="item.pic"
-                 alt="">
+          <li v-for="(item, i) in modules[5].list" :key="i" class="wow fadeInDown"
+            :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{ 'cursor-pointer': isLink(item.link.linkName) }"
+            @click="openLink(item)">
+            <img :src="item.pic" alt="">
             <p class="text">{{ item.title }}</p>
           </li>
         </ul>
@@ -88,29 +63,20 @@
     <div class="block news-block">
       <div class="inner">
         <h2 class="b-title wow fadeInUp">{{ modules[6].form.title }}</h2>
-        <p class="intro wow fadeInUp"
-           data-wow-delay="0.5s">{{ modules[6].form.des }}</p>
+        <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[6].form.des }}</p>
         <ul class="news">
-          <li v-for="(item, i) in articles"
-              :key="i"
-              class="wow fadeInDown"
-              :data-wow-delay="(0.2 * i).toFixed(1) + 's'"
-              @click="toArtice(item, modules[7].form)">
-            <img :src="item.titleImg"
-                 alt="">
+          <li v-for="(item, i) in articles" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'"
+            @click="toArtice(item, modules[7].form)">
+            <img :src="item.titleImg" alt="">
             <div class="texts">
               <h6>{{ item.title }}</h6>
-              <div class="des"
-                   v-html="item.mainBody"></div>
+              <div class="des" v-html="item.mainBody"></div>
               <span class="meta">{{ item.releaseTime }}</span>
             </div>
           </li>
         </ul>
-        <div class="all-link"
-             @click="toAll(modules[7].form)">
-          <span>{{$t('column.all')}} <img class="icon"
-                 src="@/assets/images/arrow.png"
-                 alt=""></span>
+        <div class="all-link" @click="toAll(modules[7].form)">
+          <span>{{ $t('column.all') }} <img class="icon" src="@/assets/images/arrow.png" alt=""></span>
         </div>
       </div>
     </div>
@@ -150,7 +116,7 @@ export default {
           if (column.length) {
             this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
               this.articles = Util.removeTag(data.slice(0, articleNum || 6))
-            }).catch(err => {})
+            }).catch(err => { })
           }
         }
       }).catch(err => { })
@@ -164,817 +130,1009 @@ export default {
 @import '../../styles/page/page.scss';
 
 .wrap {
-    /deep/ .el-carousel {
-        height: 21.6rem;
-        .el-carousel__container {
-            height: 21.6rem;
-        }
-        img {
-            height: 21.6rem;
-        }
+  /deep/ .el-carousel {
+    height: 21.6rem;
+
+    .el-carousel__container {
+      height: 21.6rem;
+    }
+
+    img {
+      height: 21.6rem;
     }
+  }
 }
+
 .banner-item {
-    .banner-name {
-        font-size: 2.16rem;
-    }
+  .banner-name {
+    font-size: 2.16rem;
+  }
 }
+
 .block {
-    padding: 3.15rem 0;
-    .inner {
-        .b-title {
-            font-size: 2.25rem;
-            margin-bottom: 2.25rem;
-        }
-        .intro {
-            margin-bottom: 2.25rem;
-        }
+  padding: 3.15rem 0;
+
+  .inner {
+    .b-title {
+      font-size: 2.25rem;
+      margin-bottom: 2.25rem;
     }
+
+    .intro {
+      margin-bottom: 2.25rem;
+    }
+  }
 }
+
 .history {
-    h2 {
-        font-size: 1.35rem;
-        color: #333;
-    }
-    .texts {
-        display: flex;
-        justify-content: space-between;
-        padding: 2.7rem 2.56rem 2.7rem;
-        margin-top: 20px;
-        background-color: #fff;
-        border-radius: 100px 0px 0px 0px;
-        transition: 0.3s;
-        position: relative;
-        &:hover {
-            transform: scale(1.05);
-        }
-        // .line {
-        //   padding: 2.7rem 0;
-        // }
-        .des {
-            margin: 2.7rem 0;
-        }
-    }
-    .left {
-        width: 50%;
+  h2 {
+    font-size: 1.35rem;
+    color: #333;
+  }
+
+  .texts {
+    display: flex;
+    justify-content: space-between;
+    padding: 2.7rem 2.56rem 2.7rem;
+    margin-top: 20px;
+    background-color: #fff;
+    border-radius: 100px 0px 0px 0px;
+    transition: 0.3s;
+    position: relative;
+
+    &:hover {
+      transform: scale(1.05);
     }
+
+    // .line {
+    //   padding: 2.7rem 0;
+    // }
     .des {
-        margin: 20px 0;
-        font-size: 1.2rem;
-        color: #181818;
-        line-height: 31px;
-    }
-    .bg {
-        width: 32.88rem;
-        height: auto;
-        position: absolute;
-        right: -1rem;
-        bottom: 2.9rem;
+      margin: 2.7rem 0;
     }
+  }
+
+  .left {
+    width: 50%;
+  }
+
+  .des {
+    margin: 20px 0;
+    font-size: 1.2rem;
+    color: #181818;
+    line-height: 31px;
+  }
+
+  .bg {
+    width: 32.88rem;
+    height: auto;
+    position: absolute;
+    right: -1rem;
+    bottom: 2.9rem;
+  }
 }
+
 .app-inner {
-    width: 1558px;
+  width: 1558px;
 }
+
 .app {
+  display: flex;
+  flex-wrap: wrap;
+
+  li {
+    position: relative;
     display: flex;
-    flex-wrap: wrap;
-    li {
-        position: relative;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        width: 368px;
-        height: 252px;
-        margin: 0 14px 14px 0;
-        transition: 0.3s;
-        &:hover {
-            transform: scale(1.05);
-            .icon {
-                transform: rotateY(180deg);
-            }
-        }
-        &:first-child {
-            width: 750px;
-        }
-        &:nth-child(3),
-        &:nth-child(7),
-        &:nth-child(10) {
-            margin-right: 0;
-        }
-        &:nth-child(9) {
-            width: 563px;
-        }
-        &:nth-child(10) {
-            width: 555px;
-        }
-    }
-    .bg {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 368px;
+    height: 252px;
+    margin: 0 14px 14px 0;
+    transition: 0.3s;
+
+    &:hover {
+      transform: scale(1.05);
+
+      .icon {
+        transform: rotateY(180deg);
+      }
     }
-    .icon {
-        position: relative;
-        transition: 0.3s;
+
+    &:first-child {
+      width: 750px;
     }
-    .text {
-        position: relative;
-        margin-top: 20px;
-        font-size: 2rem;
-        color: #fff;
+
+    &:nth-child(3),
+    &:nth-child(7),
+    &:nth-child(10) {
+      margin-right: 0;
     }
+
+    &:nth-child(9) {
+      width: 563px;
+    }
+
+    &:nth-child(10) {
+      width: 555px;
+    }
+  }
+
+  .bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+
+  .icon {
+    position: relative;
+    transition: 0.3s;
+  }
+
+  .text {
+    position: relative;
+    margin-top: 20px;
+    font-size: 2rem;
+    color: #fff;
+  }
 }
+
 .group {
-    display: flex;
-    flex-wrap: wrap;
-    li {
-        position: relative;
-        width: calc((100% - 56px) / 3);
-        margin: 0 28px 39px 0;
-        transition: 0.3s;
-        &:hover {
-            transform: scale(1.05);
-            .text {
-                color: #fff;
-                background-color: #394f6d;
-            }
-        }
-        &:nth-child(3n) {
-            margin-right: 0;
-        }
+  display: flex;
+  flex-wrap: wrap;
+
+  li {
+    position: relative;
+    width: calc((100% - 56px) / 3);
+    margin: 0 28px 39px 0;
+    transition: 0.3s;
+
+    &:hover {
+      transform: scale(1.05);
+
+      .text {
+        color: #fff;
+        background-color: #394f6d;
+      }
     }
-    img {
-        width: 100%;
-        height: auto;
-    }
-    .text {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 6.43rem;
-        font-size: 1.44rem;
-        font-family: SFProDisplay-Bold, SFProDisplay;
-        font-weight: bold;
-        line-height: 6.43rem;
-        text-align: center;
-        color: #272727;
-        background-color: #f5f5f5;
-        transition: 0.3s;
+
+    &:nth-child(3n) {
+      margin-right: 0;
     }
+  }
+
+  img {
+    width: 100%;
+    height: auto;
+  }
+
+  .text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 6.43rem;
+    font-size: 1.44rem;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    font-weight: bold;
+    line-height: 6.43rem;
+    text-align: center;
+    color: #272727;
+    background-color: #f5f5f5;
+    transition: 0.3s;
+  }
 }
+
 .news-block {
-    background: url(../../assets/images/info-bg.png) 0 0/100% 100% no-repeat;
+  background: url(../../assets/images/info-bg.png) 0 0/100% 100% no-repeat;
 }
+
 .news {
-    position: relative;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    li {
-        display: inline-flex;
-        width: calc((100% - 28px) / 2);
-        padding: 1.53rem;
-        margin-bottom: 1.26rem;
-        background-color: #fff;
-        cursor: pointer;
-        transition: 0.3s;
-        &:hover {
-            transform: scale(1.05);
-        }
-    }
-    img {
-        width: 10.66rem;
-        height: auto;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+  li {
+    display: inline-flex;
+    width: calc((100% - 28px) / 2);
+    padding: 1.53rem;
+    margin-bottom: 1.26rem;
+    background-color: #fff;
+    cursor: pointer;
+    transition: 0.3s;
+
+    &:hover {
+      transform: scale(1.05);
     }
-    .texts {
-        margin-left: 34px;
+  }
+
+  img {
+    width: 10.66rem;
+    height: auto;
+  }
+
+  .texts {
+    margin-left: 34px;
+  }
+
+  h6 {
+    font-size: 1.1rem;
+    color: #0648a8;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .des {
+    margin: 2px 0;
+    font-size: 0.9rem;
+    color: #333;
+    line-height: 22px;
+    -webkit-line-clamp: 2;
+  }
+
+  .meta {
+    font-size: 0.8rem;
+    color: #999;
+  }
+}
+
+@media (max-width: 1520px) {
+  .app-inner {
+    width: 1558px;
+  }
+}
+
+@media (min-width: 280px) and (max-width: 1200px) {
+  .wrap {
+    /deep/ .el-carousel {
+      height: 15rem;
+
+      .el-carousel__container {
+        height: 15rem;
+      }
+
+      img {
+        height: 15rem;
+      }
     }
-    h6 {
-        font-size: 1.1rem;
-        color: #0648a8;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        text-overflow: ellipsis;
-        overflow: hidden;
+  }
+
+  .banner-item .banner-name {
+    font-size: 1.5rem;
+    bottom: 2.25rem;
+    left: 16.125rem;
+  }
+
+  .block {
+    padding: 50px 0;
+
+    .inner {
+      width: 95%;
+      margin: 0 auto;
+
+      .texts {
+        flex-direction: column;
+
+        .left {
+          width: 100%;
+        }
+
+        .bg {
+          margin: 0;
+          width: 100%;
+          height: 20rem !important;
+        }
+      }
     }
-    .des {
-        margin: 2px 0;
-        font-size: 0.9rem;
-        color: #333;
-        line-height: 22px;
-        -webkit-line-clamp: 2;
+
+    .app {
+      li {
+        width: 100%;
+      }
     }
-    .meta {
-        font-size: 0.8rem;
-        color: #999;
+
+    .intro {
+      margin-bottom: 30px;
     }
-}
 
-@media (max-width: 1520px) {
-    .app-inner {
-        width: 1558px;
+    .group {
+      flex-direction: column;
+
+      li {
+        width: 100%;
+
+        img {
+          height: 20rem;
+        }
+      }
     }
-}
 
-@media (min-width: 280px) and (max-width: 1200px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 15rem;
-            .el-carousel__container {
-                height: 15rem;
-            }
-            img {
-                height: 15rem;
-            }
-        }
-    }
-    .banner-item .banner-name {
-        font-size: 1.5rem;
-        bottom: 2.25rem;
-        left: 16.125rem;
-    }
-    .block {
-        padding: 50px 0;
-        .inner {
-            width: 95%;
-            margin: 0 auto;
-            .texts {
-                flex-direction: column;
-                .left {
-                    width: 100%;
-                }
-                .bg {
-                    margin: 0;
-                    width: 100%;
-                    height: 20rem !important;
-                }
-            }
-        }
-        .app {
-            li {
-                width: 100%;
-            }
-        }
-        .intro {
-            margin-bottom: 30px;
-        }
-        .group {
-            flex-direction: column;
-            li {
-                width: 100%;
-                img {
-                    height: 20rem;
-                }
-            }
-        }
-        .news {
-            flex-direction: column;
-            li {
-                width: 95%;
-                margin: 0 auto;
-                flex-direction: column;
-                img {
-                    width: 100%;
-                    height: 12rem;
-                }
-                .texts {
-                    margin-left: 0;
-                    margin-top: 20px;
-                }
-            }
+    .news {
+      flex-direction: column;
+
+      li {
+        width: 95%;
+        margin: 0 auto;
+        flex-direction: column;
+
+        img {
+          width: 100%;
+          height: 12rem;
         }
+
+        .texts {
+          margin-left: 0;
+          margin-top: 20px;
+        }
+      }
     }
+  }
 }
+
 @media (max-width: 1200px) {
-    .block {
-        padding: 50px 0;
-        .inner {
-            width: 95%;
-            margin: 0 auto;
-            .texts {
-                flex-direction: column;
-                .left {
-                    width: 100%;
-                }
-                .bg {
-                    margin: 0;
-                    width: 100%;
-                    height: 450px;
-                }
-            }
-        }
-        .app {
-            li {
-                width: 100%;
-            }
-        }
-        .intro {
-            margin-bottom: 30px;
-        }
-        .group {
-            flex-direction: column;
-            li {
-                width: 100%;
-            }
-        }
-        .news {
-            flex-direction: column;
-            li {
-                width: 95%;
-                margin: 0 auto;
-                flex-direction: column;
-                img {
-                    width: 100%;
-                    height: 200px;
-                }
-                .texts {
-                    margin-left: 0;
-                    margin-top: 20px;
-                }
-            }
+  .block {
+    padding: 50px 0;
+
+    .inner {
+      width: 95%;
+      margin: 0 auto;
+
+      .texts {
+        flex-direction: column;
+
+        .left {
+          width: 100%;
+        }
+
+        .bg {
+          margin: 0;
+          width: 100%;
+          height: 450px;
+        }
+      }
+    }
+
+    .app {
+      li {
+        width: 100%;
+      }
+    }
+
+    .intro {
+      margin-bottom: 30px;
+    }
+
+    .group {
+      flex-direction: column;
+
+      li {
+        width: 100%;
+      }
+    }
+
+    .news {
+      flex-direction: column;
+
+      li {
+        width: 95%;
+        margin: 0 auto;
+        flex-direction: column;
+
+        img {
+          width: 100%;
+          height: 200px;
         }
+
+        .texts {
+          margin-left: 0;
+          margin-top: 20px;
+        }
+      }
     }
+  }
 }
+
 @media (max-width: 320px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        padding: 5rem 1.25rem;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        li {
+          img {
+            height: auto;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                padding: 5rem 1.25rem;
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    height: auto !important;
-                }
-            }
-            .group {
-                li {
-                    img {
-                        height: auto;
-                    }
-                }
-            }
-            .news {
-                li {
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        li {
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 320px) and (max-width: 375px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        padding: 5rem 1.25rem;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        li {
+          img {
+            height: auto;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                padding: 5rem 1.25rem;
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    height: auto !important;
-                }
-            }
-            .group {
-                li {
-                    img {
-                        height: auto;
-                    }
-                }
-            }
-            .news {
-                li {
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        li {
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 375px) and (max-width: 480px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        padding: 5rem 1.25rem;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        li {
+          img {
+            height: auto;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                padding: 5rem 1.25rem;
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    height: auto !important;
-                }
-            }
-            .group {
-                li {
-                    img {
-                        height: auto;
-                    }
-                }
-            }
-            .news {
-                li {
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        li {
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 480px) and (max-width: 640px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        padding: 5rem 1.25rem;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        li {
+          img {
+            height: auto;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                padding: 5rem 1.25rem;
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    height: auto !important;
-                }
-            }
-            .group {
-                li {
-                    img {
-                        height: auto;
-                    }
-                }
-            }
-            .news {
-                li {
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        li {
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 640px) and (max-width: 768px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        padding: 5rem 1.25rem;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        li {
+          img {
+            height: auto;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                padding: 5rem 1.25rem;
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    height: auto !important;
-                }
-            }
-            .group {
-                li {
-                    img {
-                        height: auto;
-                    }
-                }
-            }
-            .news {
-                li {
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        li {
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 768px) and (max-width: 980px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        flex-direction: row;
+        padding: 3rem 1.25rem;
+
+        .left {
+          width: 50%;
+        }
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        .bg {
+          width: 50%;
+          margin: -3rem 0 0 0;
+          height: auto !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+      }
+
+      .group {
+        flex-direction: row;
+
+        li {
+          width: calc((100% - 56px) / 3);
+
+          img {
+            height: auto;
+          }
+
+          .text {
+            line-height: 1.5rem;
+          }
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                flex-direction: row;
-                padding: 3rem 1.25rem;
-                .left {
-                    width: 50%;
-                }
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    width: 50%;
-                    margin: -3rem 0 0 0;
-                    height: auto !important;
-                }
-            }
-            .group {
-                flex-direction: row;
-                li {
-                    width: calc((100% - 56px) / 3);
-                    img {
-                        height: auto;
-                    }
-                    .text {
-                        line-height: 1.5rem;
-                    }
-                }
-            }
-            .news {
-                flex-direction: row;
-                li {
-                    width: calc((100% - 28px) / 2);
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
-            .app {
-                flex-direction: row;
-                li {
-                    width: 45%;
-                    &:nth-child(2n + 1) {
-                        margin-right: 1rem;
-                    }
-                }
-            }
+      }
+
+      .news {
+        flex-direction: row;
+
+        li {
+          width: calc((100% - 28px) / 2);
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
+        }
+      }
+
+      .app {
+        flex-direction: row;
+
+        li {
+          width: 45%;
+
+          &:nth-child(2n + 1) {
+            margin-right: 1rem;
+          }
         }
+      }
     }
+  }
 }
+
 @media (min-width: 980px) and (max-width: 1200px) {
-    .wrap {
-        /deep/ .el-carousel {
-            height: 12rem !important;
+  .wrap {
+    /deep/ .el-carousel {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__container {
+      height: 12rem !important;
+    }
+
+    /deep/ .el-carousel__item {
+      height: 12rem !important;
+    }
+  }
+
+  .banner-item {
+    img {
+      height: 12rem !important;
+    }
+
+    .banner-name {
+      font-size: 1.5rem;
+      line-height: 1rem;
+      left: 2rem;
+      bottom: 2rem;
+    }
+  }
+
+  .block {
+    padding: 1.25rem 0;
+
+    .inner {
+      h2 {
+        margin-left: 1.5rem !important;
+      }
+
+      .b-title {
+        font-size: 1.5rem;
+      }
+
+      .texts {
+        flex-direction: row;
+        padding: 3rem 1.25rem;
+
+        .left {
+          width: 50%;
         }
-        /deep/ .el-carousel__container {
-            height: 12rem !important;
+
+        h2 {
+          margin-left: 0 !important;
         }
-        /deep/ .el-carousel__item {
-            height: 12rem !important;
+
+        .bg {
+          width: 50%;
+          margin: -3rem 0 0 0;
+          height: auto !important;
         }
-    }
-    .banner-item {
-        img {
-            height: 12rem !important;
-        }
-        .banner-name {
-            font-size: 1.5rem;
-            line-height: 1rem;
-            left: 2rem;
-            bottom: 2rem;
-        }
-    }
-    .block {
-        padding: 1.25rem 0;
-        .inner {
-            h2 {
-                margin-left: 1.5rem !important;
-            }
-            .b-title {
-                font-size: 1.5rem;
-            }
-            .texts {
-                flex-direction: row;
-                padding: 3rem 1.25rem;
-                .left {
-                    width: 50%;
-                }
-                h2 {
-                    margin-left: 0 !important;
-                }
-                .bg {
-                    width: 50%;
-                    margin: -3rem 0 0 0;
-                    height: auto !important;
-                }
-            }
-            .group {
-                flex-direction: row;
-                li {
-                    width: calc((100% - 56px) / 3);
-                    img {
-                        height: auto;
-                    }
-                    .text {
-                        line-height: 1.5rem;
-                    }
-                }
-            }
-            .news {
-                flex-direction: row;
-                li {
-                    width: calc((100% - 28px) / 2);
-                    padding: 1.25rem;
-                    img {
-                        height: auto;
-                    }
-                    .texts {
-                        padding: 1.25rem;
-                    }
-                }
-            }
-            .app {
-                flex-direction: row;
-                li {
-                    width: 45%;
-                    &:nth-child(2n + 1) {
-                        margin-right: 1rem;
-                    }
-                }
-            }
+      }
+
+      .group {
+        flex-direction: row;
+
+        li {
+          width: calc((100% - 56px) / 3);
+
+          img {
+            height: auto;
+          }
+
+          .text {
+            line-height: 1.5rem;
+          }
         }
+      }
+
+      .news {
+        flex-direction: row;
+
+        li {
+          width: calc((100% - 28px) / 2);
+          padding: 1.25rem;
+
+          img {
+            height: auto;
+          }
+
+          .texts {
+            padding: 1.25rem;
+          }
+        }
+      }
+
+      .app {
+        flex-direction: row;
+
+        li {
+          width: 45%;
+
+          &:nth-child(2n + 1) {
+            margin-right: 1rem;
+          }
+        }
+      }
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index 7c903bc..e11d1ab 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -36,6 +36,11 @@
                 :class="{ active: form.classificationTagId === item.categoryId }" @click="changeType(item.categoryId)">
                 {{ item.name }}</dd>
             </dl>
+            <dl>
+              <dt>是否免费：</dt>
+              <dd v-for="(item, i) in types" :key="i" :class="{ active: form.courseType === item.id }"
+                @click="changeCourseType(item.id)">{{ item.name }}</dd>
+            </dl>
           </div>
 
           <div class="courses">
@@ -92,9 +97,24 @@ export default {
         value: 'id',
         label: 'columnName'
       },
+      types: [
+        {
+          id: '',
+          name: '不限'
+        },
+        {
+          id: 1,
+          name: '免费'
+        },
+        {
+          id: 0,
+          name: '付费'
+        }
+      ],
       form: {
         categoryId: '',
-        classificationTagId: ''
+        classificationTagId: '',
+        courseType: '',
       },
       categories: [],
       classifications: [],
@@ -147,7 +167,7 @@ export default {
         pageNum: this.page,
         pageSize: this.pageSize,
         columnId: this.id,
-        keyWord: this.keyword
+        keyWord: this.keyword,
       }).then(({ data }) => {
         this.list = data.records
         this.total = +data.total
@@ -238,6 +258,11 @@ export default {
       this.form.classificationTagId = id
       this.initData()
     },
+    // 是否免费切换
+    changeCourseType (id) {
+      this.form.courseType = id
+      this.initData()
+    },
     handleCurrentChange (val) {
       this.page = val
       this.getData()
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index bc50ec9..59e51d7 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -8,7 +8,7 @@
           <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
             <div class="pic" :style="{ backgroundImage: 'url(' + item.pic + ')' }"></div>
             <div class="text-wrap">
-              <div v-if="!GTA && !i" class="qrcode-wrap">
+              <div v-if="!GTA && site == 1 && !i" class="qrcode-wrap">
                 <img class="qrcode" src="https://occupationlab.com/images/mini-program.jpg" alt="">
                 <p class="text">扫小程序下单</p>
               </div>
diff --git a/src/pages/index/list/index copy.vue b/src/pages/shop/list/index.vue
similarity index 99%
rename from src/pages/index/list/index copy.vue
rename to src/pages/shop/list/index.vue
index 84902a7..b72f394 100644
--- a/src/pages/index/list/index copy.vue	
+++ b/src/pages/shop/list/index.vue
@@ -363,6 +363,7 @@ export default {
         }
       }).catch(err => { })
     },
+
     // 获取列表
     getData () {
       this.loadIns = Loading.service()
@@ -505,7 +506,7 @@ export default {
     },
     // 跳转详情
     toDetail (id) {
-      this.$router.push(`/index/show?id=${id}`);
+      this.$router.push(`/shop/show?id=${id}`);
     }
   }
 };
diff --git a/src/pages/index/show/index copy.vue b/src/pages/shop/show/index.vue
similarity index 100%
rename from src/pages/index/show/index copy.vue
rename to src/pages/shop/show/index.vue
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index b557562..c9d0066 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -2,8 +2,6 @@ import BasicLayout from "@/layouts/home";
 
 const meta = {};
 
-const pre = "index-";
-
 export default {
   path: "/index",
   name: "index",
diff --git a/src/router/modules/shop.js b/src/router/modules/shop.js
new file mode 100644
index 0000000..6c7f746
--- /dev/null
+++ b/src/router/modules/shop.js
@@ -0,0 +1,26 @@
+import BasicLayout from "@/layouts/home";
+
+const meta = {};
+
+export default {
+  path: "/shop",
+  name: "shop",
+  redirect: {
+    name: `shop`
+  },
+  meta,
+  component: BasicLayout,
+  children: [
+    {
+      name: 'shop',
+      path: `/shop`,
+      component: () => import("@/pages/shop/list"),
+      meta: { title: "职站商城" }
+    },
+    {
+      path: `show`,
+      component: () => import("@/pages/shop/show"),
+      meta: { title: "产品详情" }
+    },
+  ]
+};
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 38c8386..0fd9005 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -7,7 +7,7 @@ const isGta = url.includes('139.159.254.212'); // 国泰安
 let host = `${location.origin}/`
 if (isDev) {
   host = 'http://192.168.31.217:10000/'
-  host = 'https://huorantech.com'
+  // host = 'https://huorantech.com'
   // host = 'http://139.159.254.212/'
 }
 
@@ -18,7 +18,7 @@ const Setting = {
   titleSuffix: '深圳或然科技官网', // 网页标题的后缀
   routerMode: "hash", // 路由模式，可选值为 history 或 hash
   apiBaseURL: host, // 接口请求地址
-  huoranApi: `http://121.37.12.51`,
+  huoranApi: `https://occupationlab.com`,
   autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间
   modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
   errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice