Commit 5a9f8ed1 authored by 黄奎's avatar 黄奎

页面修改

parent d649f9bc
......@@ -48,15 +48,15 @@ module.exports = function(ctx) {
env: ctx.dev ? {
//API: 'http://localhost:5001/api',
API: 'http://192.168.10.128:5001/api',
API: 'http://192.168.10.128:8300/api',
// API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.10.2:8087/api',
API_SK: 'ws:192.168.10.214:',
API_SK: 'ws://websocket.oytour.com/ws',
API_SIG: 'http://localhost:5001/messagecenter'
} : {
API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://propertyedu.oytour.com/api',
API_SK: 'ws://47.96.23.199:',
API_SK: 'ws://websocket.oytour.com/ws',
API_SK_WSS: 'wss://sk.kookaku.com',
API_SIG: 'http://eduapi.oytour.com/messagecenter'
},
......
var websock = null;
var global_callback = null;
//webSocket连接端口
var serverPort = '10086';
var serverPort = '';
/**
* 初始化weosocket
......
......@@ -91,16 +91,14 @@
<script>
import {
GetMyNoticePageList,
GetMsgLogList,
BeatchReadMsgLog
} from '../../api/course/index'
import {
sendSock
} from '../../api/common/socket'
import {url_jump_zc} from "../../utils/url"
import {
url_jump_zc
} from "../../utils/url"
import noneData from './none-data'
import NoneData from './none-data.vue'
export default {
props: {
showObj: {
......@@ -328,31 +326,31 @@ import {url_jump_zc} from "../../utils/url"
},
//跳转链接 新页面打开
goMsgDetail(url,item) {
if(item.CategoryId == 5){
let zcurl=url_jump_zc+'#'+url;
// let zcurl='http://www.test.com:8080/#'+url;
window.open(zcurl)
}else{
var hostName = window.location.hostname;
var port = window.location.port;
var newurl = ""
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
if (url.indexOf("www") == -1) {
newurl = "http://" + hostName + (port != 80 ? ":" + port : "") + "/#" + url;
} else {
newurl = "http://" + url;
}
goMsgDetail(url, item) {
if (item.CategoryId == 5) {
let zcurl = url_jump_zc + '#' + url;
// let zcurl='http://www.test.com:8080/#'+url;
window.open(zcurl)
} else {
var hostName = window.location.hostname;
var port = window.location.port;
var newurl = ""
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
if (url.indexOf("www") == -1) {
newurl = "http://" + hostName + (port != 80 ? ":" + port : "") + "/#" + url;
} else {
newurl = url
newurl = "http://" + url;
}
} else {
newurl = url
}
if (newurl) {
window.open(newurl, "_blank");
}
}
if (newurl) {
window.open(newurl, "_blank");
}
}
},
//看过后删除
readMsgLog(Id, index) {
......
......@@ -455,7 +455,6 @@ export default {
this.socektArr.unshift(newData[i]);
}
}
// this.socektArr = this.socektArr.concat(newData)
this.showNotification(
newData[0].Title,
newData[0].Content,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment