fix

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`,

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>

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隐藏
@@ -145,9 +153,13 @@ export default {
     toLogin () {
       if (this.GTA) {
         window.open('https://izhixinyun.com/#/login')
+      } else {
+        if (this.site == 7) {
+          window.open('https://www.occupationlab.com/#/login')
         } else {
           this.qrcodeVisible = true
         }
+      }
     },
     // 全局搜索
     handleSearch () {
@@ -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;
     }
   }
 

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 () {

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()

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>

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}`);
     }
   }
 };

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",

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: "产品详情" }
+    },
+  ]
+};

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