Skip to content

S
shop-new
提交 7a708076 authored 作者: 郑伟娜's avatar 郑伟娜
浏览文件
操作

Merge branch 'scm_optimize' into test 

# Conflicts:
#	public/index.html
#	src/api/webSite.js
上级 95dac8e1 cb96d406
隐藏空白字符变更
内嵌 并排
正在显示 包含 152 行增加 和 71 行删除
public/index.html
浏览文件 @ 7a708076
......@@ -211,7 +211,7 @@
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (xhttp.readyState == 4 && xhttp.status == 200) {
var channel_id = JSON.parse(xhttp.response).data.channel_id
var channel_id = JSON.parse(xhttp.response).data.channel.id
if (channel_id == 0) {
var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
link.type = 'image/x-inon';
......@@ -229,8 +229,14 @@
};
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send();
// xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.open("post", '//'+ ssa +'/api/v1/channelSite/domain/info', true);
let data = {
domain: ssa,
type: 2,
site_type: 4
}
xhttp.send(JSON.stringify(data));
}
</script>
</html>
src/api/system/user.js
浏览文件 @ 7a708076
......@@ -137,10 +137,10 @@ export function importTemplate() {
})
}
export function getBaseSettingTitle(params) {
export function getBaseSettingTitle(data) {
return request({
url: '/system/oem/getBaseSettingTitle',
method: 'get',
params
url: '/system/channelSite/info',
method: 'POST',
data: data
})
}
src/api/webSite.js
浏览文件 @ 7a708076
import request from '@/utils/request'
// 获取渠道id
export function indexInfo(params) {
export function indexInfo(data) {
return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
url: '/system/channelSite/info',
// url: '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get',
params
method: 'post',
data
})
}
// 获取所有域名
......@@ -44,19 +44,19 @@ export function getallCloudList(params) {
//获取sso域名
export function getssoUrl(data) {
return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
url: '/channelSite/domain/info',
// url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: '//newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get',
params: data
method: 'post',
data
})
}
// 获取logo
export function backDetailsView(params) {
export function backDetailsView(data) {
return request({
url: '/local/oem/backDetails',
method: 'get',
params
url: '/system/channelSite/info',
method: 'post',
data
})
}
src/layout/components/Navbar.vue
浏览文件 @ 7a708076
......@@ -91,6 +91,9 @@ export default {
value: val
})
}
},
channelInfo() {
return this.$store.getters.channelInfo
}
},
data(){
......@@ -101,21 +104,30 @@ export default {
},
created() {
/** 获取渠道id */
this.getChannelId()
// this.getChannelId()
},
methods: {
/** 判断渠道 值=0才显示 查看历史数据 链接 */
getChannelId() {
let ssa = window.location.host
const data = {
domain: ssa,
watch: {
channelInfo() {
if (this.channelInfo) {
this.channel_id = this.channelInfo.channel.id
}
indexInfo(data).then(res=> {
if (res.code == 1) {
this.channel_id = res.data.channel_id
}
});
},
},
methods: {
/** 判断渠道 值=0才显示 查看历史数据 链接 */
// getChannelId() {
// let ssa = window.location.host
// const data = {
// type: 2,
// site_type: 4,
// // domain: ssa,
// }
// indexInfo(data).then(res=> {
// if (res.code == 1) {
// this.channel_id = res.data.channel.id
// }
// });
// },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
......@@ -123,11 +135,13 @@ export default {
ssooutinfo(){
var ssa = window.location.host
let data={
type: 2,
site_type: 7,
domain:ssa
}
this.$store.dispatch('getssourl',data).then((res) => {
if(res.code==1){
this.ssourl = res.data.sso_url
this.ssourl = res.data.channel_site[0].domain
this.logout()
}
})
......
src/layout/components/Sidebar/Logo.vue
浏览文件 @ 7a708076
......@@ -34,21 +34,35 @@ export default {
logo: logoImg
}
},
computed: {
channelInfo() {
return this.$store.getters.channelInfo
}
},
watch: {
channelInfo() {
this.title = this.channelInfo.channel_site[0].base_setting_res.name
this.logo = this.channelInfo.channel_site[0].base_setting_res.logo
document.title = this.channelInfo.channel_site[0].base_setting_res.title
},
},
mounted() {
this.getBackDetailsView()
// this.getBackDetailsView()
},
methods: {
getBackDetailsView() {
let params = {
type: 'SHOP',
}
backDetailsView(params).then(res => {
if (res.code == 1) {
this.title = res.data[0]['SHOP'].shop_name
this.logo = res.data[0]['SHOP'].shop_logo
}
})
}
// getBackDetailsView() {
// let params = {
// type: 2,
// site_type: 4
// }
// backDetailsView(params).then(res => {
// if (res.code == 1) {
// this.title = res.data.channel_site[0].base_setting_res.name
// this.logo = res.data.channel_site[0].base_setting_res.logo
// document.title = res.data.channel_site[0].base_setting_res.title
// }
// })
// }
}
}
</script>
......
src/layout/index.vue
浏览文件 @ 7a708076
......@@ -49,6 +49,13 @@ export default {
}
}
},
mounted() {
const data = {
type: 2,
site_type: 4
}
this.$store.dispatch('getChannelSiteInfo', data)
},
methods: {
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
......
src/permission.js
浏览文件 @ 7a708076
......@@ -16,11 +16,11 @@ router.beforeEach((to, from, next) => {
const hasToken = getToken()
// console.log("getToken()",getToken())
if (hasToken) {
if (sessionStorage.getItem('saveTitle')) {
document.title = sessionStorage.getItem('saveTitle')
} else {
getPageTitle()
}
// if (sessionStorage.getItem('saveTitle')) {
// document.title = sessionStorage.getItem('saveTitle')
// } else {
// getPageTitle()
// }
/* has token*/
if (to.path === '/platformlogin') {
......
src/store/getters.js
浏览文件 @ 7a708076
......@@ -10,6 +10,7 @@ const getters = {
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permissions: state => state.user.permissions,
permission_routes: state => state.permission.routes
permission_routes: state => state.permission.routes,
channelInfo: state => state.user.channelInfo
}
export default getters
src/store/modules/user.js
浏览文件 @ 7a708076
import { login, login2,logout, getInfo, getStatistics } from '@/api/login'
import { getssoUrl } from '@/api/webSite'
import { getssoUrl, backDetailsView } from '@/api/webSite'
import { getToken, setToken, removeToken } from '@/utils/auth'
const user = {
......@@ -18,9 +18,13 @@ const user = {
// 3-审核拒绝；
applyState: -1,
cateFee: 0,
channelInfo: null
},
mutations: {
SET_CHANNELINFO: (state, channelInfo) => {
state.channelInfo = channelInfo
},
SET_SSOURL:(state,ssourl)=>{
state.ssourl = ssourl
},
......@@ -51,13 +55,22 @@ const user = {
},
actions: {
getChannelSiteInfo({commit}, data) {
return new Promise((resolve, reject) => {
backDetailsView(data).then(response => {
if (response.code == 1) {
commit('SET_CHANNELINFO', response.data)
}
})
})
},
getssourl({commit},data){
return new Promise((resolve, reject) => {
getssoUrl(data).then(response => {
const date = response.data
const date = response.data.channel_site[0]
//debugger
if (response.code == 1) {
commit('SET_SSOURL', date.access_token)
commit('SET_SSOURL', date.domain)
}
resolve(response)
}).catch(error => {
......
src/utils/get-page-title.js
浏览文件 @ 7a708076
......@@ -5,10 +5,14 @@ import { getBaseSettingTitle } from '@/api/system/user'
const title = defaultSettings.title || '胜天半子'
export default function getPageTitle() {
getBaseSettingTitle({ type: 'SHOP' }).then(res => {
let params = {
type: 2,
site_type: 4
}
getBaseSettingTitle( params ).then(res => {
if (res.code == 1) {
document.title = res.data
sessionStorage.setItem('saveTitle', res.data)
document.title = res.data.channel_site[0].base_setting_res.title
sessionStorage.setItem('saveTitle', res.data.channel_site[0].base_setting_res.title)
}
})
}
\ No newline at end of file
src/views/entry/newyuncang.vue
浏览文件 @ 7a708076
......@@ -613,7 +613,7 @@
// console.log(222,navigator.userAgent);
},
mounted() {
this.getIndexInfo()
// this.getIndexInfo()
window.addEventListener('scroll', this.handleScroll, true);
},
destroyed() {
......@@ -624,11 +624,23 @@
/** 动态获取 sso 配置域名 */
getssourl() {
var ssa = window.location.host
let data = {domain: ssa}
let data = {
type: 2,
site_type: 7,
domain: ssa
}
this.$store.dispatch('getssourl', data)
.then((res) => {
if (res.code == 1) {
this.ssourl = res.data.sso_url
this.ssourl = res.data.channel_site[0].domain
this.channel_id = res.data.channel.id
this.keyTitle = res.data.channel_site[0].title;
this.keyWords = res.data.channel_site[0].keywords;
this.keyDescriptions = res.data.channel_site[0].describe;
this.getWebSite()
this.getDomain()
this.getAllcloud()
//this.gotosso()
}
}).catch(() => {
......@@ -651,15 +663,17 @@
}
const data = {
// domain: 'newsys.jxhh.com',
domain: ssa,
type: 2,
site_type: 4,
// domain: ssa,
// field: op
}
indexInfo(data).then(res => {
if (res.code == 1) {
this.channel_id = res.data.channel_id
this.keyTitle = res.data.title;
this.keyWords = res.data.keywords;
this.keyDescriptions = res.data.describe;
this.channel_id = res.data.channel.id
this.keyTitle = res.data.channel_site[0].title;
this.keyWords = res.data.channel_site[0].keywords;
this.keyDescriptions = res.data.channel_site[0].describe;
this.getWebSite()
this.getDomain()
this.getAllcloud()
......
src/views/entry/process.vue
浏览文件 @ 7a708076
......@@ -50,11 +50,13 @@
let op = 'open'
let ssa = window.location.host
const data = {
domain: ssa,
type: 2,
site_type: 4,
// domain: ssa,
}
indexInfo(data).then(res => {
if (res.code == 1) {
this.channel_id = res.data.channel_id
this.channel_id = res.data.channel.id
this.getWebSite()
}
})
......
src/views/login.vue
浏览文件 @ 7a708076
......@@ -45,12 +45,14 @@ export default {
var ssa = window.location.host
// var ssa = 'scm.jxhh.com'
let data = {
type: 2,
site_type: 7,
domain:ssa
}
this.$store.dispatch('getssourl', data)
.then((res) => {
if(res.code==1){
this.ssourl = res.data.sso_url
this.ssourl = res.data.channel_site[0].domain
this.tiaozuan()
}
})
......
src/views/platformlogin.vue
浏览文件 @ 7a708076
......@@ -20,12 +20,14 @@
var ssa = window.location.host
// var ssa = 'scm.jxhh.com'
let data = {
type: 2,
site_type: 7,
domain:ssa
}
this.$store.dispatch('getssourl', data)
.then((res) => {
if(res.code==1){
this.ssourl = res.data.sso_url
this.ssourl = res.data.channel_site[0].domain
this.gotosso()
}
})
......
src/views/system/order/index.vue
浏览文件 @ 7a708076
......@@ -408,11 +408,13 @@
getChannelId() {
let ssa = window.location.host
const data = {
domain: ssa,
type: 2,
site_type: 4,
// domain: ssa,
}
indexInfo(data).then(res=> {
if (res.code == 1) {
this.channel_id = res.data.channel_id
this.channel_id = res.data.channel.id
}
});
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论