+ alt=""> -->
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 16673d0..a592fd6 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,8 +1,15 @@
-
+
-
+ 
+ 产业学院平台
+
+
+
@@ -15,7 +22,7 @@
@showMoreBtns="updateBtnsType">
+
+ 产业学院平台
+
+
+
@@ -15,7 +22,7 @@
@showMoreBtns="updateBtnsType">
+ @click="toLogin">
注册登录
@@ -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 {
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 47c78bb..0057e7d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -1,6 +1,6 @@
注册登录
@@ -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 {
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 47c78bb..0057e7d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -1,6 +1,6 @@
-
@@ -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++
},
// 获取点击菜单的路径
diff --git a/src/main.js b/src/main.js
index 3af2693..e622ccc 100644
--- 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),
diff --git a/src/pages/aboutUs/index.vue b/src/pages/aboutUs/index.vue
index 4a233c6..7aa0cdb 100644
--- a/src/pages/aboutUs/index.vue
+++ b/src/pages/aboutUs/index.vue
@@ -1,9 +1,24 @@
diff --git a/src/setting.js b/src/setting.js
index a82039d..b260d0b 100644
--- 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,
/**
* 路由白名单
* */
- 
+
+
+
+ 
+
+
+ 扫一扫，关注公众号
+
+ 
+
+
+ 扫一扫，登录职站商城
+
@@ -177,7 +192,8 @@
- 
@@ -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 {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index c2441df..663b1e9 100644
--- 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;
}
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 977bf2d..392ae01 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -16,7 +16,7 @@
alt=""
@click="openLink(item)"> -->
扫一扫，关注公众号
-
import mixins from '@/mixins/page'
import { Loading } from "element-ui";
-import Setting from "@/setting";
export default {
mixins: [mixins],
data () {
diff --git a/src/pages/index/show/index.vue b/src/pages/index/show/index.vue
index 4f16639..c025f8f 100644
--- a/src/pages/index/show/index.vue
+++ b/src/pages/index/show/index.vue
@@ -79,7 +79,8 @@
-
import mixins from '@/mixins/page'
import { Loading } from "element-ui";
-import Setting from "@/setting";
export default {
mixins: [mixins],
data () {
diff --git a/src/pages/index/show/index.vue b/src/pages/index/show/index.vue
index 4f16639..c025f8f 100644
--- a/src/pages/index/show/index.vue
+++ b/src/pages/index/show/index.vue
@@ -79,7 +79,8 @@
{{ form.goodsRes.typeName }}