From f2330c9a4445cd2fbc24a3f4198a6466cc871222 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Jul 2024 16:07:15 +0800
Subject: [PATCH] fix

---
 src/api/index.js                              |    1 +
 src/assets/images/logo.png                    |  Bin 7762 -> 19080 bytes
 src/layouts/footer/index.vue                  |   38 -
 src/layouts/header/index.vue                  |   37 +-
 src/mixins/article/index.js                   |    2 +-
 src/pages/application/index.vue               | 1730 +++++++++--------
 src/pages/course/index.vue                    |   29 +-
 src/pages/index/list/index.vue                |    2 +-
 .../index copy.vue => shop/list/index.vue}    |    3 +-
 .../index copy.vue => shop/show/index.vue}    |    0
 src/router/modules/index.js                   |    2 -
 src/router/modules/shop.js                    |   26 +
 src/setting.js                                |    4 +-
 13 files changed, 1029 insertions(+), 845 deletions(-)
 rename src/pages/{index/list/index copy.vue => shop/list/index.vue} (99%)
 rename src/pages/{index/show/index copy.vue => shop/show/index.vue} (100%)
 create mode 100644 src/router/modules/shop.js

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 4ff0ee1a4d0f035e91bb50c25481457a5c8d7992..4eae78c035a5d46301fcc0ae2bdb464ace54862f 100644
GIT binary patch
literal 19080
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

literal 7762
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

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