fix

src/api/index.js

@@ -35,4 +35,6 @@ export default {
 	subjectCategoryCited: `${host}nakadai/nakadai/subject/subjectCategoryCited`,
 	goodsSchemeClassification: `${host}nakadai/mall/goodsSchemeClassification`,
 	schemeList: `${host}nakadai/nakadai/partner/schemeManagement/schemeList`,
+	curriculumChapter: `${host}nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections`,
+	curriculumGetSubsection: `${host}nakadai/nakadai/curriculum/subsection/getSubsection`,
 }

src/components/rightColumns/index.vue

@@ -64,7 +64,7 @@ export default {
         isSort: 1
       }).then(({ data }) => {
         this.columns = data
-        this.$parent.getInfo && this.$parent.getInfo()
+        this.$parent.getInfo && this.$route.query.id && this.$parent.getInfo()
       }).catch(err => { })
 
       this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => {

src/layouts/footer/index.vue

@@ -169,7 +169,7 @@ export default {
     // 获取iasf中文首页应用模块数据
     getInfo () {
       // 预览/详情
-      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.$route.query.id}`).then(({ data }) => {
+      this.$route.query.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.$route.query.id}`).then(({ data }) => {
         if (data.length) {
           // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
           const json = JSON.parse(this.preview ?

src/mixins/estate/index.js

@@ -12,7 +12,7 @@ export default {
     // 获取文章详情
     getInfo() {
       // 预览/详情
-      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+      this.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
         if (data.length) {
           // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
           const json = JSON.parse(this.preview ?

src/mixins/page/index.js

@@ -15,7 +15,7 @@ export default {
     }
   },
   mounted() {
-    this.getInfo && this.id && this.getInfo()
+    this.getInfo && this.$route.query.id && this.getInfo()
   },
   methods: {
     // 打开链接

src/pages/aboutUs/index.vue

@@ -454,7 +454,7 @@
         <p class="tips">微信扫码添加职站售前咨询</p>
         <p class="des">提供付费咨询及解决方案</p>
         <img width="150"
-             src="@/assets/images/index/customer.jpg"
+             src="@/assets/images/index/customer.png"
              alt="">
       </div>
       <div class="item tel"></div>
@@ -469,8 +469,8 @@
             <div class="text">
               <p class="title">售前咨询</p>
               <p class="tel-num"
-                 style="margin-bottom: 5px">刘老师</p>
-              <p class="tel-num">18019930142</p>
+                 style="margin-bottom: 5px">郭老师</p>
+              <p class="tel-num">17671782660</p>
             </div>
           </div>
           <div class="line">
@@ -1363,14 +1363,76 @@ export default {
         left: 100px;
     }
 }
-@media (max-width: 1470px) {
-    .wrap .banner {
-        .text2,
-        .text3 {
-            width: 500px;
+@media (max-width: 1200px) {
+    .wrap {
+        .banner {
+            .text {
+                left: 30px;
+            }
+        }
+        .inner {
+            width: 90%;
         }
+        .pics {
+            flex-direction: column;
             .text {
-            left: 50px;
+                width: 100%;
+                margin-bottom: 20px;
+            }
+            img {
+                display: none;
+            }
+        }
+        .service-intro {
+            margin-top: 0;
+        }
+        .service {
+            .service-pic {
+                flex-direction: column;
+                .text {
+                    margin: 0 0 30px 0;
+                }
+            }
+        }
+        .culture,
+        .adv,
+        .service,
+        .product {
+            .list {
+                flex-direction: column;
+                li {
+                    width: 100%;
+                    margin: 0 0 20px 0;
+                }
+            }
+        }
+        .adv {
+            .list {
+                li {
+                    padding-top: 30px;
+                }
+            }
+        }
+        .client-pic {
+            flex-direction: column;
+            .bg {
+                width: auto;
+                height: auto;
+                max-width: 100%;
+                margin-right: 0;
+            }
+        }
+        .contact {
+            .info {
+                margin-left: 0;
+                .texts {
+                    flex-direction: column;
+                    align-items: flex-start;
+                }
+                .item {
+                    margin: 0 0 30px 0;
+                }
+            }
         }
     }
 }

src/pages/index/list/index.vue

@@ -13,10 +13,19 @@
                :src="item.pic"
                alt=""
                @click="openLink(item)">
+          <div class="text-wrap">
+            <div v-if="!i"
+                 class="qrcode-wrap">
+              <img class="qrcode"
+                   src="https://www.occupationlab.com/images/mini-program.jpg"
+                   alt="">
+              <p class="text">扫小程序下单</p>
+            </div>
             <div class="texts">
               <h6>{{ item.title }}</h6>
               <p class="sub">{{ item.des }}</p>
             </div>
+          </div>
         </el-carousel-item>
       </template>
     </el-carousel>
@@ -42,12 +51,14 @@
     <div class="inner-wrap">
       <div class="inner">
         <div class="type-wrap">
+          <div class="tab-wrap">
             <div>
               <img src="@/assets/images/hot.png"
                    alt="">
               <img class="m-l-5 m-r-10"
                    src="@/assets/images/type.png"
                    alt="">
+            </div>
             <ul class="tab">
               <li v-for="(tab, i) in tabs"
                   :key="i"
@@ -337,7 +348,7 @@ export default {
     // 获取banner
     getBanner () {
       // 预览/详情
-      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+      this.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
         if (data.length) {
           // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
           const json = JSON.parse(this.preview ?
@@ -568,10 +579,12 @@ export default {
         /deep/.el-carousel__container {
             height: 100%;
         }
-        .texts {
+        .text-wrap {
             position: absolute;
-            top: 50%;
-            left: 188px;
+            top: 55%;
+            left: 12%;
+            display: flex;
+            align-items: center;
             color: #fff;
             transform: translateY(-50%);
         }
@@ -582,6 +595,23 @@ export default {
         .sub {
             font-size: 24px;
         }
+        .qrcode-wrap {
+            display: inline-block;
+            padding: 5px;
+            margin-right: 50px;
+            text-align: center;
+            background-color: #fff;
+            border-radius: 12px;
+            .text {
+                margin-top: 5px;
+                font-size: 12px;
+                color: #979797;
+            }
+        }
+        .qrcode {
+            width: 120px;
+            height: 120px;
+        }
     }
 
     .intro {
@@ -641,14 +671,21 @@ export default {
         .left {
             display: inline-flex;
         }
+        .tab-wrap {
+            display: inline-flex;
+            align-items: center;
+        }
         .tab {
             display: inline-flex;
             li {
                 position: relative;
                 margin: 0 20px;
                 font-size: 18px;
+                font-family: PingFangSC-Medium, PingFang SC;
+                font-weight: 600;
                 line-height: 25px;
                 color: #0b1d30;
+                white-space: nowrap;
                 cursor: pointer;
                 &:after {
                     content: '';
@@ -699,6 +736,7 @@ export default {
                 margin-right: 30px;
                 color: #666;
                 font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 600;
                 white-space: nowrap;
             }
@@ -706,6 +744,7 @@ export default {
                 padding: 5px 15px;
                 color: #333;
                 font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
                 white-space: nowrap;
                 cursor: pointer;
                 &.active {
@@ -837,6 +876,7 @@ export default {
                 min-height: 34px;
                 color: #757f92;
                 font-size: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
                 display: -webkit-box;
                 -webkit-box-orient: vertical;
                 -webkit-line-clamp: 2;
@@ -849,6 +889,7 @@ export default {
             }
             .tag {
                 margin-right: 8px;
+                font-family: PingFangSC-Regular, PingFang SC;
                 color: #1583ff;
                 background-color: #f9f9f9;
                 border: 0;
@@ -874,6 +915,7 @@ export default {
                 display: inline-flex;
                 align-items: center;
                 color: #b5bfd5;
+                font-family: PingFangSC-Regular, PingFang SC;
                 font-size: 12px;
                 .icon {
                     width: 14px;
@@ -891,14 +933,65 @@ export default {
         }
     }
 }
-@media (max-width: 1500px) {
+@media (max-width: 1200px) {
     .wrap {
-        .banner-item {
-            h6 {
-                font-size: 35px;
+        .carousel {
+            .texts {
+                left: 50px;
             }
-            .sub {
-                font-size: 18px;
+        }
+        .inner {
+            width: 90%;
+        }
+        .type-wrap {
+            flex-direction: column;
+        }
+        .search {
+            margin-top: 20px;
+        }
+        .filter {
+            .vals {
+                width: calc(100% - 100px);
+            }
+        }
+    }
+}
+@media (max-width: 1000px) {
+    .wrap {
+        .intro {
+            flex-direction: column;
+            justify-content: center;
+            align-items: flex-start;
+            li {
+                flex: 1;
+                margin-bottom: 20px;
+            }
+        }
+        .type-wrap {
+            .tab-wrap {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+            .tab {
+                margin-top: 10px;
+            }
+        }
+        .courses {
+            li {
+                width: calc((100% - 22px) / 2);
+                &:nth-child(2n) {
+                    margin-right: 0;
+                }
+            }
+        }
+    }
+}
+@media (max-width: 640px) {
+    .wrap {
+        .courses {
+            li {
+                width: 100%;
+                margin-right: 0;
             }
         }
     }

src/pages/index/show/index.vue

@@ -316,6 +316,7 @@ export default {
     },
     // 跳转播放资源
     toPreview (i, j) {
+      this.qrcodeVisible = true
       // this.form.goodsRes.logoOfOurSchool ?	
       //   this.$router.push(`/station/preview?courseId=${this.form.mall.associatedProduct}&curriculumName=${this.form.mall.productName}&mallId=${this.id}&chapter=${i}&section=${j}&admin=1`) :
       //   this.toTrail()

src/pages/member/index.vue

@@ -102,7 +102,7 @@ export default {
     }
     h6 {
         position: relative;
-        margin: 60px 0 30px;
+        margin: 60px 0 55px;
         font-size: 2rem;
         font-weight: 600;
         text-align: center;
@@ -126,15 +126,15 @@ export default {
     .step {
         display: flex;
         justify-content: space-between;
-        padding: 0 60px 0 100px;
+        padding: 0 160px 0 200px;
         li {
             position: relative;
-            font-size: 1.2rem;
+            font-size: 1.1rem;
             color: #a3a3a3;
             &:before {
                 content: '';
                 position: absolute;
-                top: 2px;
+                top: -2px;
                 left: -34px;
                 width: 24px;
                 height: 24px;
@@ -187,4 +187,47 @@ export default {
         }
     }
 }
+@media (max-width: 1200px) {
+    .reg {
+        .equity-wrap {
+            width: 90%;
+            .equity {
+                padding: 0 20px;
+            }
+        }
+        .step {
+            flex-wrap: wrap;
+            padding: 0 30px 0 50px;
+            li {
+                width: 50%;
+                &:first-child,
+                &:nth-child(2) {
+                    margin-bottom: 20px;
+                }
+            }
+        }
+        .param {
+            padding: 0;
+            li {
+                width: 50%;
+            }
+        }
+    }
+}
+@media (max-width: 640px) {
+    .reg {
+        .step {
+            li {
+                width: 100%;
+                margin-bottom: 20px;
+                &:last-child {
+                    margin-bottom: 0;
+                }
+            }
+        }
+        .btn {
+            width: 100%;
+        }
+    }
+}
 </style>

src/pages/publish/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="wrap">
-    <div v-if="info.columnBanner" class="banner">
-      <img width="100%" height="280" :src="info.columnBanner" alt="">
+    <div v-if="info.columnBanner"
+         class="banner">
+      <img width="100%"
+           height="280"
+           :src="info.columnBanner"
+           alt="">
       <div class="texts">
         <p class="text">{{ info.columnName }}</p>
         <p class="sub">{{ info.subtitle }}</p>
@@ -10,15 +14,23 @@
 
     <div class="inner">
       <ul class="tabs">
-        <li v-for="(item, i) in tabs" :key="i" :class="{active: active === i}" @click="tabChange(i)">{{ item }}</li>
+        <li v-for="(item, i) in tabs"
+            :key="i"
+            :class="{active: active === i}"
+            @click="tabChange(i)">{{ item }}</li>
       </ul>
 
       <ul class="list">
-        <li v-for="(item, i) in list" :key="i" @click="toArtice(item)">
-          <img class="pic" :src="item.titleImg" alt="">
+        <li v-for="(item, i) in list"
+            :key="i"
+            @click="toArtice(item)">
+          <img class="pic"
+               :src="item.titleImg"
+               alt="">
           <div class="texts">
             <h6>{{ item.title }}</h6>
-            <div v-html="item.quote" class="des"></div>
+            <div v-html="item.quote"
+                 class="des"></div>
           </div>
         </li>
       </ul>
@@ -50,7 +62,7 @@ export default {
   methods: {
     // 获取栏目详情
     getInfo () {
-      this.$post(`${this.api.findColumn}?id=${this.id}`).then(({ data }) => {
+      this.$route.query.id && this.$post(`${this.api.findColumn}?id=${this.id}`).then(({ data }) => {
         this.info = data
       }).catch(res => { })
     },
@@ -75,7 +87,7 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  background: #F8F9FB;
+    background: #f8f9fb;
 }
 .banner {
     position: relative;
@@ -116,7 +128,7 @@ export default {
         cursor: pointer;
         &.active {
             color: #fff;
-      background-color: #1583FF;
+            background-color: #1583ff;
         }
     }
 }
@@ -142,7 +154,7 @@ export default {
         font-size: 20px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
-    color: #1583FF;
+        color: #1583ff;
         cursor: pointer;
     }
     .des {

src/pages/publish/show.vue

@@ -115,7 +115,7 @@ export default {
   methods: {
     // 获取文章详情
     getInfo () {
-      this.$post(`${this.api.findArticle}?id=${this.id}`).then(({ data }) => {
+      this.$route.query.id && this.$post(`${this.api.findArticle}?id=${this.id}`).then(({ data }) => {
         // 设置面包屑
         const { columnName, path, id } = this.$route.query
         this.routes = [

src/pages/supplier/index.vue

@@ -11,11 +11,24 @@
     <div class="about">
       <div class="inner">
         <div class="text">如果您是从事高职、本科市场相应数字化场景的软件、硬件研发、生产或代理的供应商；如果您正面临拓展渠道难、精准触达客户难、售前支持难、按时回款难等发展瓶颈；请加入职站商城，让您的产品走进全国院校。</div>
-      </div>
-    </div>
 
         <div class="entry">
+          <!-- <div class="progress">
+						<img src="" alt="">
+					</div> -->
+          <el-steps :active="4"
+                    align-center>
+            <el-step title="申请供应商平台账号"></el-step>
+            <el-step title="提交云商店入驻申请"></el-step>
+            <el-step title="完成业务沟通"></el-step>
+            <el-step title="审核完成，加入云商店"></el-step>
+          </el-steps>
 
+          <el-button class="apply"
+                     type="primary"
+                     @click="qrcodeVisible = true">申请</el-button>
+        </div>
+      </div>
     </div>
 
     <!-- 我们提供的支持 -->
@@ -74,6 +87,18 @@
            src="@/assets/images/love.png"
            alt="">
     </div>
+
+    <el-dialog title="请扫码添加职站商城运营"
+               :visible.sync="qrcodeVisible"
+               width="350px"
+               center
+               :close-on-click-modal="false">
+      <div>
+        <img width="100%"
+             src="@/assets/images/index/customer.png"
+             alt="">
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -82,7 +107,7 @@ export default {
   name: 'cityPartner',
   data () {
     return {
-
+      qrcodeVisible: false,
     }
   },
   mounted () { },
@@ -132,6 +157,20 @@ export default {
         padding: 67px 0;
         margin: 0 auto;
     }
+    .entry {
+        margin-top: 30px;
+        text-align: center;
+        .apply {
+            margin-top: 20px;
+        }
+        // /deep/.el-step__head.is-finish {
+        //     color: #f00;
+        //     border-color: #f00;
+        // }
+        // /deep/.el-step__title.is-finish {
+        //     color: #f00;
+        // }
+    }
     .about {
         position: relative;
         margin: -60px 0 20px;
@@ -220,9 +259,13 @@ export default {
             background: url(../../assets/images/dev/profit-bg1.png) 0 0/100% 100% no-repeat;
         }
         .item2 {
+            display: flex;
+            justify-content: center;
+            align-items: center;
             width: 70%;
+            height: 202px;
+            padding: 0 30px;
             margin: -100px auto 0;
-            line-height: 202px;
             font-size: 30px;
             color: #0b1d30;
             background: url(../../assets/images/dev/profit-bg2.png) 0 0/100% 100% no-repeat;
@@ -240,4 +283,42 @@ export default {
         }
     }
 }
+@media (max-width: 1200px) {
+    .wrap {
+        .banner {
+            padding: 50px 0 0 50px;
+            .dev {
+                bottom: 80px;
+            }
+        }
+        .inner {
+            width: 90%;
+        }
+    }
+}
+@media (max-width: 1000px) {
+    .wrap {
+        .sup {
+            .list {
+                flex-direction: column;
+                li {
+                    width: 100%;
+                    padding: 140px 80px 50px;
+                }
+            }
+        }
+        .con {
+            .list {
+                flex-direction: column;
+                li {
+                    margin-bottom: 20px;
+                }
+            }
+        }
+        .profit {
+            .item2 {
+            }
+        }
+    }
+}
 </style>