国泰安部署

1 year ago · 620e0d7c65
parent fe74587048
commit 620e0d7c65
15 changed files with 84 additions and 36 deletions
--- a/public/index.html
+++ b/public/index.html
@ -17,6 +17,7 @@
                s.parentNode.insertBefore(hm, s);
            })();
        </script>
+        <!-- <title>产业学院平台</title> -->
        <title>职站商城</title>
    </head>
    <body>
--- a/src/assets/images/about/banner-text.png
+++ b/src/assets/images/about/banner-text.png
--- a/src/assets/images/about/qrcode.jpg
+++ b/src/assets/images/about/qrcode.jpg
--- a/src/assets/images/about/qrcode.png
+++ b/src/assets/images/about/qrcode.png
--- a/src/assets/images/logo2.png
+++ b/src/assets/images/logo2.png
--- a/src/components/menuTree/index.vue
+++ b/src/components/menuTree/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="menu-child">
    <template v-for="item in this.menuList">
-      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
+      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : ''"
                  :class="{active: $route.query.id == item.id}"
                  :key="item.id"
                  :index="String(item.id)"
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@ -83,9 +83,9 @@
          <p class="name">Shenzhen</p>
        </div>
        <div class="info">
-          <img class="logo"
+          <!-- <img class="logo"
               src="@/assets/images/logo.png"
-               alt="">
+               alt=""> -->
          <div class="texts">
            <div class="lines">
              <div class="line">
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@ -1,8 +1,15 @@
 <template>
-  <div class="header">
+  <div :class="['header', { estate: isEstate, iasf: isIasf }]">
    <a class="logo"
       @click="toIndex">
-      <img src="@/assets/images/logo.png"
+      <template v-if="GTA">
+        <img src="@/assets/images/logo2.png"
+             alt="">
+        产业学院平台
+      </template>
+
+      <img v-else
+           src="@/assets/images/logo.png"
           alt="">
    </a>
    <!-- pc端 -->
@ -15,7 +22,7 @@
              @showMoreBtns="updateBtnsType"></navbar>
      <div class="tools">
        <div class="login"
-             @click="qrcodeVisible = true">
+             @click="toLogin">
          <img src="@/assets/images/user.png"
               alt="">
          <span>注册登录</span>
@ -158,6 +165,14 @@ export default {
      location.href = this.$router.resolve(`/column?siteId=${id}`).href
      location.reload()
    },
+    // 注册登录
+    toLogin () {
+      if (this.GTA) {
+        window.open('https://izhixinyun.com/#/login')
+      } else {
+        this.qrcodeVisible = true
+      }
+    },
    // 全局搜索
    handleSearch () {
      this.setKeyword(this.title)
@ -198,10 +213,14 @@ $height: 90px;
        background-color: rgba(0, 0, 0, 0.15);
    }
    .logo {
+        display: inline-flex;
+        align-items: center;
+        font-size: 20px;
+        font-weight: 600;
+        color: #333;
        cursor: pointer;
        img {
            width: 150px;
-            margin-right: 10px;
        }
    }
    .tools {
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@ -1,6 +1,6 @@
 <template>
  <div>
-    <el-menu :class="['nav', {home: isHome, estate: isEstate,changing: !showMenu}]"
+    <el-menu :class="['nav', {estate: isEstate,changing: !showMenu}]"
             ref="elMenu"
             :key="menuRefresh"
             :mode="$store.getters.getModelType ? 'horizontal' : 'vertical' "
@ -11,7 +11,7 @@
             @select="jump"
             :default-active="String(active)">
      <menuTree :menuList="menus" />
-      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
+      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : ''"
                  v-show="showMoreBtns"
                  index="522222">
        <template slot="title">
@ -129,16 +129,16 @@ export default {
    },
    // 改变菜单颜色
    handleColor () {
-      const home = this.isHome
-      if (this.lastHome !== home) this.showMenu = false
-      this.bgColor = home ? 'transparent' : '#fff'
-      this.textColor = home ? '#f9f9f9' : '#333'
-      this.lastHome !== home && this.$nextTick(() => {
-        setTimeout(() => {
-          this.showMenu = true
-        }, 200)
-      })
-      this.lastHome = home
+      // const home = this.isHome
+      // if (this.lastHome !== home) this.showMenu = false
+      // this.bgColor = home ? 'transparent' : '#fff'
+      // this.textColor = home ? '#f9f9f9' : '#333'
+      // this.lastHome !== home && this.$nextTick(() => {
+      //   setTimeout(() => {
+      //     this.showMenu = true
+      //   }, 200)
+      // })
+      // this.lastHome = home
      // this.menuRefresh++
    },
    // 获取点击菜单的路径
--- a/src/main.js
+++ b/src/main.js
@ -31,6 +31,7 @@ Vue.prototype.$get = get;
 Vue.prototype.$post = post;
 Vue.prototype.$del = del;
 Vue.prototype.$put = put;
+Vue.prototype.GTA = Setting.isGta; // 国泰安网站标识
 Vue.config.productionTip = false;
 Vue.use(VueI18n);
 Vue.use(VueAnimateNumber);
@ -40,7 +41,7 @@ Vue.use(ElementUI, {

 const siteId = Util.getQuery('siteId')
 const i18n = new VueI18n({
-  locale: Setting.enIds.includes(siteId ? +siteId : store.state.content.site) ? 'en' : 'zh',
+  locale: 'zh',
  messages: {
    'en':Object.assign(messages.en,enLocale),//将我们项目中的语言包与Element的语言包进行合并
    'zh':Object.assign(messages.zh,zhLocale),
--- a/src/pages/aboutUs/index.vue
+++ b/src/pages/aboutUs/index.vue
@ -1,9 +1,24 @@
 <template>
  <div class="wrap index">
    <div class="banner">
-      <img class="text"
+      <img class="texts"
           src="@/assets/images/about/banner-text.png"
           alt="">
+      <div v-if="!GTA"
+           class="qrcodes">
+        <div class="qrcode">
+          <img width="103"
+               src="@/assets/images/about/qrcode.jpg"
+               alt="">
+          <p class="text">扫一扫，关注公众号</p>
+        </div>
+        <div class="qrcode m-l-30">
+          <img width="103"
+               src="@/assets/images/mini-program-sm.jpg"
+               alt="">
+          <p class="text">扫一扫，登录职站商城</p>
+        </div>
+      </div>
    </div>
    <div class="intro">
      <div class="inner">
@ -177,7 +192,8 @@
              </div>
            </div>
            <div class="qrcode">
-              <img src="@/assets/images/about/qrcode.png"
+              <img width="103"
+                   src="@/assets/images/about/qrcode.jpg"
                   alt="">
              <p class="text">扫一扫，关注公众号</p>
            </div>
@ -286,10 +302,25 @@ export default {
        background: url(../../assets/images/about/banner1.png) 0 0 / auto no-repeat,
            url(../../assets/images/about/banner2.png) (90% 37px) / auto no-repeat;
        background-color: #0f5bed;
-        .text {
+        .texts {
+            position: absolute;
+            top: 130px;
+            left: 165px;
+        }
+        .qrcodes {
            position: absolute;
-            top: 167px;
+            bottom: 80px;
            left: 165px;
+            display: flex;
+        }
+    }
+
+    .qrcode {
+        text-align: center;
+        .text {
+            margin-top: 10px;
+            font-size: 12px;
+            color: #fff;
        }
    }
    .i-title {
@ -564,14 +595,6 @@ export default {
                }
            }
        }
-        .qrcode {
-            text-align: center;
-            .text {
-                margin-top: 10px;
-                font-size: 12px;
-                color: #fff;
-            }
-        }
    }

    .about {
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@ -789,7 +789,7 @@ export default {
    }
    .texts {
        position: absolute;
-        bottom: 87px;
+        top: 180px;
        left: 213px;
    }

--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@ -16,7 +16,7 @@
               alt=""
               @click="openLink(item)"> -->
          <div class="text-wrap">
-            <div v-if="!i"
+            <div v-if="!GTA && !i"
                 class="qrcode-wrap">
              <img class="qrcode"
                   src="https://www.occupationlab.com/images/mini-program.jpg"
@ -255,7 +255,6 @@
 <script>
 import mixins from '@/mixins/page'
 import { Loading } from "element-ui";
-import Setting from "@/setting";
 export default {
  mixins: [mixins],
  data () {
--- a/src/pages/index/show/index.vue
+++ b/src/pages/index/show/index.vue
@ -79,7 +79,8 @@
              <div class="text">{{ form.goodsRes.typeName }}</div>
            </div>
          </div>
-          <button class="btn"
+          <button v-if="!GTA"
+                  class="btn"
                  @click="showQrcode">会员价采购</button>
        </div>
      </div>
--- a/src/setting.js
+++ b/src/setting.js
@ -1,11 +1,14 @@
 /**
 * 业务配置
 * */
+const url = location.host;
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
+const isGta = url.includes('139.159.254.212'); // 国泰安
 let host = `${location.origin}/`
 if (isDev) {
  // host = 'http://192.168.31.52:10000/'
  host = 'https://huorantech.com/'
+  // host = 'http://139.159.254.212/'
 }

 const Setting = {
@ -20,6 +23,7 @@ const Setting = {
  modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
  errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
  isDev,
+	isGta,
  /**
  * 路由白名单
  * */