huoran
/
FE_huoran_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国泰安部署

Browse Source
master
yujialong 1 year ago
parent fe74587048
commit 620e0d7c65
15 changed files with 84 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      public/index.html
  2. BIN
      src/assets/images/about/banner-text.png
  3. BIN
      src/assets/images/about/qrcode.jpg
  4. BIN
      src/assets/images/about/qrcode.png
  5. BIN
      src/assets/images/logo2.png
  6. 2
      src/components/menuTree/index.vue
  7. 4
      src/layouts/footer/index.vue
  8. 27
      src/layouts/header/index.vue
  9. 24
      src/layouts/navbar/index.vue
  10. 3
      src/main.js
  11. 47
      src/pages/aboutUs/index.vue
  12. 2
      src/pages/column/index.vue
  13. 3
      src/pages/index/list/index.vue
  14. 3
      src/pages/index/show/index.vue
  15. 4
      src/setting.js

1
public/index.html
Unescape View File

@ -17,6 +17,7 @@
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();
</script> </script>
<!-- <title>产业学院平台</title> -->
<title>职站商城</title> <title>职站商城</title>
</head> </head>
<body> <body>

BIN
src/assets/images/about/banner-text.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
src/assets/images/about/qrcode.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/assets/images/about/qrcode.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
src/assets/images/logo2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

2
src/components/menuTree/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="menu-child"> <div class="menu-child">
<template v-for="item in this.menuList"> <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}" :class="{active: $route.query.id == item.id}"
:key="item.id" :key="item.id"
:index="String(item.id)" :index="String(item.id)"

4
src/layouts/footer/index.vue
Unescape View File

@ -83,9 +83,9 @@
<p class="name">Shenzhen</p> <p class="name">Shenzhen</p>
</div> </div>
<div class="info"> <div class="info">
<img class="logo" <!-- <img class="logo"
src="@/assets/images/logo.png" src="@/assets/images/logo.png"
alt=""> alt=""> -->
<div class="texts"> <div class="texts">
<div class="lines"> <div class="lines">
<div class="line"> <div class="line">

27
src/layouts/header/index.vue
Unescape View File

@ -1,8 +1,15 @@
<template> <template>
<div class="header"> <div :class="['header', { estate: isEstate, iasf: isIasf }]">
<a class="logo" <a class="logo"
@click="toIndex"> @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=""> alt="">
</a> </a>
<!-- pc端 --> <!-- pc端 -->
@ -15,7 +22,7 @@
@showMoreBtns="updateBtnsType"></navbar> @showMoreBtns="updateBtnsType"></navbar>
<div class="tools"> <div class="tools">
<div class="login" <div class="login"
@click="qrcodeVisible = true"> @click="toLogin">
<img src="@/assets/images/user.png" <img src="@/assets/images/user.png"
alt=""> alt="">
<span>注册登录</span> <span>注册登录</span>
@ -158,6 +165,14 @@ export default {
location.href = this.$router.resolve(`/column?siteId=${id}`).href location.href = this.$router.resolve(`/column?siteId=${id}`).href
location.reload() location.reload()
}, },
// 注册登录
toLogin () {
if (this.GTA) {
window.open('https://izhixinyun.com/#/login')
} else {
this.qrcodeVisible = true
}
},
// 全局搜索 // 全局搜索
handleSearch () { handleSearch () {
this.setKeyword(this.title) this.setKeyword(this.title)
@ -198,10 +213,14 @@ $height: 90px;
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
} }
.logo { .logo {
display: inline-flex;
align-items: center;
font-size: 20px;
font-weight: 600;
color: #333;
cursor: pointer; cursor: pointer;
img { img {
width: 150px; width: 150px;
margin-right: 10px;
} }
} }
.tools { .tools {

24
src/layouts/navbar/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-menu :class="['nav', {home: isHome, estate: isEstate,changing: !showMenu}]" <el-menu :class="['nav', {estate: isEstate,changing: !showMenu}]"
ref="elMenu" ref="elMenu"
:key="menuRefresh" :key="menuRefresh"
:mode="$store.getters.getModelType ? 'horizontal' : 'vertical' " :mode="$store.getters.getModelType ? 'horizontal' : 'vertical' "
@ -11,7 +11,7 @@
@select="jump" @select="jump"
:default-active="String(active)"> :default-active="String(active)">
<menuTree :menuList="menus" /> <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" v-show="showMoreBtns"
index="522222"> index="522222">
<template slot="title"> <template slot="title">
@ -129,16 +129,16 @@ export default {
}, },
// 改变菜单颜色 // 改变菜单颜色
handleColor () { handleColor () {
const home = this.isHome // const home = this.isHome
if (this.lastHome !== home) this.showMenu = false // if (this.lastHome !== home) this.showMenu = false
this.bgColor = home ? 'transparent' : '#fff' // this.bgColor = home ? 'transparent' : '#fff'
this.textColor = home ? '#f9f9f9' : '#333' // this.textColor = home ? '#f9f9f9' : '#333'
this.lastHome !== home && this.$nextTick(() => { // this.lastHome !== home && this.$nextTick(() => {
setTimeout(() => { // setTimeout(() => {
this.showMenu = true // this.showMenu = true
}, 200) // }, 200)
}) // })
this.lastHome = home // this.lastHome = home
// this.menuRefresh++ // this.menuRefresh++
}, },
// 获取点击菜单的路径 // 获取点击菜单的路径

3
src/main.js
Unescape View File

@ -31,6 +31,7 @@ Vue.prototype.$get = get;
Vue.prototype.$post = post; Vue.prototype.$post = post;
Vue.prototype.$del = del; Vue.prototype.$del = del;
Vue.prototype.$put = put; Vue.prototype.$put = put;
Vue.prototype.GTA = Setting.isGta; // 国泰安网站标识
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.use(VueI18n); Vue.use(VueI18n);
Vue.use(VueAnimateNumber); Vue.use(VueAnimateNumber);
@ -40,7 +41,7 @@ Vue.use(ElementUI, {
const siteId = Util.getQuery('siteId') const siteId = Util.getQuery('siteId')
const i18n = new VueI18n({ const i18n = new VueI18n({
locale: Setting.enIds.includes(siteId ? +siteId : store.state.content.site) ? 'en' : 'zh', locale: 'zh',
messages: { messages: {
'en':Object.assign(messages.en,enLocale),//将我们项目中的语言包与Element的语言包进行合并 'en':Object.assign(messages.en,enLocale),//将我们项目中的语言包与Element的语言包进行合并
'zh':Object.assign(messages.zh,zhLocale), 'zh':Object.assign(messages.zh,zhLocale),

47
src/pages/aboutUs/index.vue
Unescape View File

@ -1,9 +1,24 @@
<template> <template>
<div class="wrap index"> <div class="wrap index">
<div class="banner"> <div class="banner">
<img class="text" <img class="texts"
src="@/assets/images/about/banner-text.png" src="@/assets/images/about/banner-text.png"
alt=""> 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>
<div class="intro"> <div class="intro">
<div class="inner"> <div class="inner">
@ -177,7 +192,8 @@
</div> </div>
</div> </div>
<div class="qrcode"> <div class="qrcode">
<img src="@/assets/images/about/qrcode.png" <img width="103"
src="@/assets/images/about/qrcode.jpg"
alt=""> alt="">
<p class="text">扫一扫，关注公众号</p> <p class="text">扫一扫，关注公众号</p>
</div> </div>
@ -286,10 +302,25 @@ export default {
background: url(../../assets/images/about/banner1.png) 0 0 / auto no-repeat, background: url(../../assets/images/about/banner1.png) 0 0 / auto no-repeat,
url(../../assets/images/about/banner2.png) (90% 37px) / auto no-repeat; url(../../assets/images/about/banner2.png) (90% 37px) / auto no-repeat;
background-color: #0f5bed; background-color: #0f5bed;
.text { .texts {
position: absolute;
top: 130px;
left: 165px;
}
.qrcodes {
position: absolute; position: absolute;
top: 167px; bottom: 80px;
left: 165px; left: 165px;
display: flex;
}
}
.qrcode {
text-align: center;
.text {
margin-top: 10px;
font-size: 12px;
color: #fff;
} }
} }
.i-title { .i-title {
@ -564,14 +595,6 @@ export default {
} }
} }
} }
.qrcode {
text-align: center;
.text {
margin-top: 10px;
font-size: 12px;
color: #fff;
}
}
} }
.about { .about {

2
src/pages/column/index.vue
Unescape View File

@ -789,7 +789,7 @@ export default {
} }
.texts { .texts {
position: absolute; position: absolute;
bottom: 87px; top: 180px;
left: 213px; left: 213px;
} }

3
src/pages/index/list/index.vue
Unescape View File

@ -16,7 +16,7 @@
alt="" alt=""
@click="openLink(item)"> --> @click="openLink(item)"> -->
<div class="text-wrap"> <div class="text-wrap">
<div v-if="!i" <div v-if="!GTA && !i"
class="qrcode-wrap"> class="qrcode-wrap">
<img class="qrcode" <img class="qrcode"
src="https://www.occupationlab.com/images/mini-program.jpg" src="https://www.occupationlab.com/images/mini-program.jpg"
@ -255,7 +255,6 @@
<script> <script>
import mixins from '@/mixins/page' import mixins from '@/mixins/page'
import { Loading } from "element-ui"; import { Loading } from "element-ui";
import Setting from "@/setting";
export default { export default {
mixins: [mixins], mixins: [mixins],
data () { data () {

3
src/pages/index/show/index.vue
Unescape View File

@ -79,7 +79,8 @@
<div class="text">{{ form.goodsRes.typeName }}</div> <div class="text">{{ form.goodsRes.typeName }}</div>
</div> </div>
</div> </div>
<button class="btn" <button v-if="!GTA"
class="btn"
@click="showQrcode">会员价采购</button> @click="showQrcode">会员价采购</button>
</div> </div>
</div> </div>

4
src/setting.js
Unescape View File

@ -1,11 +1,14 @@
/** /**
* 业务配置 * 业务配置
* */ * */
const url = location.host;
const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isDev = process.env.NODE_ENV === 'development' // 开发环境
const isGta = url.includes('139.159.254.212'); // 国泰安
let host = `${location.origin}/` let host = `${location.origin}/`
if (isDev) { if (isDev) {
// host = 'http://192.168.31.52:10000/' // host = 'http://192.168.31.52:10000/'
host = 'https://huorantech.com/' host = 'https://huorantech.com/'
// host = 'http://139.159.254.212/'
} }
const Setting = { const Setting = {
@ -20,6 +23,7 @@ const Setting = {
modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒 modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
isDev, isDev,
isGta,
/** /**
* 路由白名单 * 路由白名单
* */ * */

Write Preview
Loading…
Cancel
Save