Commit afa87c41 authored by 罗超's avatar 罗超

修复BUG问题

parent 2187b4d6
{ {
"name": "MageOffice", "name": "MageOffice",
"version": "1.0.0", "version": "1.0.0",
"author": "成都微途科技有限公司", "author": "成都微途科技有限公司",
"description": "成都微途科技有限公司多年来,与众多行业内知名企业深度合作,主要提供旅游行业ERP综合管理系统、员工业绩计算系统、业绩综合评比系统、总分公司分红核算系统、同业查询系统等相关系统IT支持,帮助旅游行业快速进行互联网转型。", "description": "成都微途科技有限公司多年来,与众多行业内知名企业深度合作,主要提供旅游行业ERP综合管理系统、员工业绩计算系统、业绩综合评比系统、总分公司分红核算系统、同业查询系统等相关系统IT支持,帮助旅游行业快速进行互联网转型。",
"license": null, "license": null,
"main": "./dist/electron/main.js", "main": "./dist/electron/main.js",
"scripts": { "scripts": {
"build": "node .electron-vue/build.js && electron-builder --win --ia32", "build": "node .electron-vue/build.js && electron-builder --win --ia32",
"build:dir": "node .electron-vue/build.js && electron-builder --dir --win --ia32", "build:dir": "node .electron-vue/build.js && electron-builder --dir --win --ia32",
"build64:dir": "node .electron-vue/build.js && electron-builder --dir --win --x64", "build64:dir": "node .electron-vue/build.js && electron-builder --dir --win --x64",
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js", "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js", "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
"dev": "node .electron-vue/dev-runner.js", "dev": "node .electron-vue/dev-runner.js",
"e2e": "npm run pack && mocha test/e2e", "e2e": "npm run pack && mocha test/e2e",
"lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src test", "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src test",
"lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter --fix src test", "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter --fix src test",
"pack": "npm run pack:main && npm run pack:renderer", "pack": "npm run pack:main && npm run pack:renderer",
"pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js", "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
"pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js", "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
"test": "npm run unit && npm run e2e", "test": "npm run unit && npm run e2e",
"unit": "karma start test/unit/karma.conf.js", "unit": "karma start test/unit/karma.conf.js",
"postinstall": "npm run lint:fix", "postinstall": "npm run lint:fix",
"packager": "electron-packager . loveStudy --platform=win32" "packager": "electron-packager . loveStudy --platform=win32"
},
"build": {
"productName": "MageOffice",
"appId": "com.viitto.mageoffice",
"directories": {
"output": "build"
}, },
"files": [ "build": {
"dist/electron/**/*" "productName": "MageOffice",
], "appId": "com.viitto.mageoffice",
"win": { "directories": {
"icon": "build/icons/logo.ico" "output": "build"
},
"files": [
"dist/electron/**/*"
],
"win": {
"icon": "build/icons/logo.ico"
}
},
"dependencies": {
"axios": "^0.16.1",
"element-ui": "^2.6.0",
"js-md5": "^0.6.0",
"kscreenshot": "^1.2.0",
"moment": "^2.18.1",
"screenshot-desktop": "^1.7.0",
"v-viewer": "^1.4.0",
"vue": "^2.3.3",
"vue-draggable-resizable": "^2.0.0-rc1",
"vue-electron": "^1.0.6",
"vue-qart": "^2.1.0",
"vue-router": "^2.5.3",
"vue-video-player": "^5.0.2",
"vuex": "^2.3.1"
},
"devDependencies": {
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^4.1.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-stage-0": "^6.24.1",
"babel-preset-vue-app": "^1.2.0",
"babel-register": "^6.24.1",
"babili-webpack-plugin": "^0.1.2",
"cfonts": "^1.1.3",
"chai": "^4.0.0",
"chalk": "^2.1.0",
"copy-webpack-plugin": "^4.0.1",
"cross-env": "^5.0.5",
"css-loader": "^0.28.4",
"del": "^3.0.0",
"devtron": "^1.4.0",
"electron": "^1.7.5",
"electron-builder": "^19.19.1",
"electron-debug": "^1.4.0",
"electron-devtools-installer": "^2.2.0",
"electron-squirrel-startup": "^1.0.0",
"eslint": "^4.4.1",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-html": "^3.1.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"grunt": "^1.0.1",
"grunt-electron-installer": "^2.1.0",
"html-webpack-plugin": "^2.30.1",
"inject-loader": "^3.0.0",
"js-md5": "^0.6.0",
"karma": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-coverage": "^1.1.1",
"karma-electron": "^5.1.1",
"karma-mocha": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.1",
"mocha": "^3.0.2",
"multispinner": "^0.2.1",
"node-loader": "^0.6.0",
"require-dir": "^0.3.0",
"spectron": "^3.7.1",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"vue-html-loader": "^1.2.4",
"vue-html5-editor": "^1.1.1",
"vue-loader": "^12.2.2",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2",
"webpack": "^3.5.2",
"webpack-dev-server": "^2.7.1",
"webpack-hot-middleware": "^2.18.2",
"webpack-merge": "^4.1.0"
} }
}, }
"dependencies": { \ No newline at end of file
"axios": "^0.16.1",
"element-ui": "^2.6.0",
"js-md5": "^0.6.0",
"kscreenshot": "^1.2.0",
"moment": "^2.18.1",
"screenshot-desktop": "^1.7.0",
"v-viewer": "^1.4.0",
"vue": "^2.3.3",
"vue-draggable-resizable": "^2.0.0-rc1",
"vue-electron": "^1.0.6",
"vue-qart": "^2.1.0",
"vue-router": "^2.5.3",
"vue-video-player": "^5.0.2",
"vuex": "^2.3.1"
},
"devDependencies": {
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^4.1.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-stage-0": "^6.24.1",
"babel-preset-vue-app": "^1.2.0",
"babel-register": "^6.24.1",
"babili-webpack-plugin": "^0.1.2",
"cfonts": "^1.1.3",
"chai": "^4.0.0",
"chalk": "^2.1.0",
"copy-webpack-plugin": "^4.0.1",
"cross-env": "^5.0.5",
"css-loader": "^0.28.4",
"del": "^3.0.0",
"devtron": "^1.4.0",
"electron": "^1.7.5",
"electron-builder": "^19.19.1",
"electron-debug": "^1.4.0",
"electron-devtools-installer": "^2.2.0",
"electron-squirrel-startup": "^1.0.0",
"eslint": "^4.4.1",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-html": "^3.1.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"grunt": "^1.0.1",
"grunt-electron-installer": "^2.1.0",
"html-webpack-plugin": "^2.30.1",
"inject-loader": "^3.0.0",
"js-md5": "^0.6.0",
"karma": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-coverage": "^1.1.1",
"karma-electron": "^5.1.1",
"karma-mocha": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.1",
"mocha": "^3.0.2",
"multispinner": "^0.2.1",
"node-loader": "^0.6.0",
"require-dir": "^0.3.0",
"spectron": "^3.7.1",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"vue-html-loader": "^1.2.4",
"vue-html5-editor": "^1.1.1",
"vue-loader": "^12.2.2",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2",
"webpack": "^3.5.2",
"webpack-dev-server": "^2.7.1",
"webpack-hot-middleware": "^2.18.2",
"webpack-merge": "^4.1.0"
}
}
...@@ -290,7 +290,10 @@ app.on('activate', () => { ...@@ -290,7 +290,10 @@ app.on('activate', () => {
createWindow() createWindow()
} }
}) })
ipc.on('reconnect',function(event){
nim=null
initNIM(global.LOGINUSER.ImAccount, global.LOGINUSER.ImToken)
})
ipc.on('loginSuccess', function(event, userInfo) { ipc.on('loginSuccess', function(event, userInfo) {
initNIM(userInfo.ImAccount, userInfo.ImToken) initNIM(userInfo.ImAccount, userInfo.ImToken)
registScrollerHotKey() registScrollerHotKey()
...@@ -406,7 +409,7 @@ ipc.on('loginSuccess', function(event, userInfo) { ...@@ -406,7 +409,7 @@ ipc.on('loginSuccess', function(event, userInfo) {
app.setAsDefaultProtocolClient('Woyou') app.setAsDefaultProtocolClient('Woyou')
} catch (error) { } catch (error) {
console.log(error) // console.log(error)
} }
}, 1000 * 60 * 10) }, 1000 * 60 * 10)
}) })
...@@ -652,11 +655,11 @@ ipc.on('getNetworkImage', function(event, url) { ...@@ -652,11 +655,11 @@ ipc.on('getNetworkImage', function(event, url) {
var base64Img = data.toString('base64'); var base64Img = data.toString('base64');
let img = nativeImage.createFromDataURL(`data:image/png;base64,${base64Img}`) let img = nativeImage.createFromDataURL(`data:image/png;base64,${base64Img}`)
clipboard.writeImage(img) clipboard.writeImage(img)
console.log('结束');
}); });
}); });
}) })
ipc.on('getNetworkImageBASE64', function (event, img) { ipc.on('getNetworkImageBASE64', function(event, imgUrl) {
let img = nativeImage.createFromDataURL(imgUrl)
clipboard.writeImage(img) clipboard.writeImage(img)
}) })
ipc.on('screens-session', function(event) { ipc.on('screens-session', function(event) {
...@@ -723,7 +726,7 @@ ipc.on('read-clip', function(event) { ...@@ -723,7 +726,7 @@ ipc.on('read-clip', function(event) {
getDialogWindows() getDialogWindows()
} }
} else { } else {
console.log(error) // console.log(error)
} }
}) })
} }
...@@ -811,7 +814,7 @@ let getMainWinodw = function(isLoad) { ...@@ -811,7 +814,7 @@ let getMainWinodw = function(isLoad) {
mainWindow.show() mainWindow.show()
mainWindow.setAlwaysOnTop(true) mainWindow.setAlwaysOnTop(true)
mainWindow.setAlwaysOnTop(false) mainWindow.setAlwaysOnTop(false)
mainWindow.webContents.openDevTools(true); //mainWindow.webContents.openDevTools(true);
//getNoticeWindows() //getNoticeWindows()
}) })
} }
...@@ -967,7 +970,7 @@ let getAddNewUserWinodes = function() { ...@@ -967,7 +970,7 @@ let getAddNewUserWinodes = function() {
addNewUserWinodes.setMenu(null) addNewUserWinodes.setMenu(null)
addNewUserWinodes.once('ready-to-show', () => { addNewUserWinodes.once('ready-to-show', () => {
addNewUserWinodes.show() addNewUserWinodes.show()
addNewUserWinodes.webContents.openDevTools(true); //addNewUserWinodes.webContents.openDevTools(true);
}) })
} else { } else {
addNewUserWinodes.focus() addNewUserWinodes.focus()
...@@ -1086,12 +1089,12 @@ let initNIM = function(uid, token) { ...@@ -1086,12 +1089,12 @@ let initNIM = function(uid, token) {
}) })
function onConnect() { function onConnect() {
console.log('OK.......')
} }
function onWillReconnect(obj) { function onWillReconnect(obj) {
// 此时说明 SDK 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接 // 此时说明 SDK 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接
console.log('Try........')
} }
function onDisconnect(error) { function onDisconnect(error) {
...@@ -1115,7 +1118,8 @@ let initNIM = function(uid, token) { ...@@ -1115,7 +1118,8 @@ let initNIM = function(uid, token) {
} }
function onError(error) { function onError(error) {
console.log(error); // console.log(error);
console.log('error........')
} }
} catch (error) { } catch (error) {
......
...@@ -47,7 +47,8 @@ export default { ...@@ -47,7 +47,8 @@ export default {
headers: { headers: {
'Content-Type':'application/json', 'Content-Type':'application/json',
'Referer-Viitto':this.$route.path 'Referer-Viitto':this.$route.path
} },
timeout:1000*15
}) })
.then(res => { .then(res => {
if (res.resultCode == 10000 || res.resultCode == 10001) { if (res.resultCode == 10000 || res.resultCode == 10001) {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="rightPannel"> <div class="rightPannel">
<div class="navtool"> <div class="navtool" :class="{'errornet':netState}">
<div class="child__item navname">{{chosenState.name}}</div> <div class="child__item navname">{{chosenState.name}}</div>
<div class="child__item"> <div class="child__item">
<div class="header__opera"> <div class="header__opera">
...@@ -44,6 +44,11 @@ ...@@ -44,6 +44,11 @@
</span> </span>
</div> </div>
</div> </div>
<div class="error-msg">
当前网络不稳定,你已经和组织失去联系,稍后系统将自动链接或者
<span class="goconnect" v-if="!reconnecloading" @click="reconnect">手动呼叫组织</span>
<span v-else>正在呼叫组织</span>
</div>
</div> </div>
<div class="contentarea"> <div class="contentarea">
<msg :user=user v-show="chosenState.val==0"></msg> <msg :user=user v-show="chosenState.val==0"></msg>
...@@ -91,7 +96,8 @@ export default { ...@@ -91,7 +96,8 @@ export default {
top:0, top:0,
left:0, left:0,
currentAccount:'' currentAccount:''
} },
reconnecloading:false
}; };
}, },
mounted() { mounted() {
...@@ -170,7 +176,6 @@ export default { ...@@ -170,7 +176,6 @@ export default {
// //
}) })
document.getElementById('homebox').addEventListener("click", function(e) { document.getElementById('homebox').addEventListener("click", function(e) {
console.log(e.target.className.indexOf('u-circle'))
if ((that.usercardInfo.searchName!="" || that.atInfo.atName != '') && e.target.className.indexOf('u-circle') == -1) { if ((that.usercardInfo.searchName!="" || that.atInfo.atName != '') && e.target.className.indexOf('u-circle') == -1) {
that.usercardInfo.searchName = "" that.usercardInfo.searchName = ""
that.atInfo.atName = '' that.atInfo.atName = ''
...@@ -179,6 +184,15 @@ export default { ...@@ -179,6 +184,15 @@ export default {
}); });
}, },
methods: { methods: {
reconnect(){
this.reconnecloading=true
this.$store.dispatch("logout");
this.$store.dispatch("connect");
this.$electron.ipcRenderer.send('reconnect')
setTimeout(() => {
this.reconnecloading=false
}, 8*1000);
},
atMsg(){ atMsg(){
console.log(11111111111111) console.log(11111111111111)
this.MsgBus.$emit('send-at-name', this.atInfo.atName) this.MsgBus.$emit('send-at-name', this.atInfo.atName)
...@@ -212,6 +226,11 @@ export default { ...@@ -212,6 +226,11 @@ export default {
this.MsgBus.$emit("dispose-session") this.MsgBus.$emit("dispose-session")
this.$electron.remote.getCurrentWindow().hide(); this.$electron.remote.getCurrentWindow().hide();
} }
},
computed: {
netState(){
return this.$store.state.isNetError
}
} }
}; };
</script> </script>
...@@ -310,6 +329,36 @@ export default { ...@@ -310,6 +329,36 @@ export default {
display: flex; display: flex;
-webkit-app-region: drag !important; -webkit-app-region: drag !important;
} }
.homebox .rightPannel .navtool .error-msg{
display: none;
top: 0px;
left: 0px;
height: 40px;
line-height: 40px;
margin:0 130px;
text-align: center;
font-size: 12px;
font-family: 'microsoft yahei';
color: #f5f5f5;
position: absolute;
}
.homebox .rightPannel .navtool .error-msg .goconnect{
margin-left: 10px;
color: yellow !important;
text-decoration: underline;
cursor: pointer;
-webkit-app-region: no-drag !important;
}
.homebox .rightPannel .navtool.errornet{
background: #d25050 !important;
}
.homebox .rightPannel .navtool.errornet .error-msg{
display: block;
}
.homebox .rightPannel .navtool.errornet *{
color: #f1f1f1 !important;
}
.homebox .rightPannel .navtool .child__item { .homebox .rightPannel .navtool .child__item {
flex: 1; flex: 1;
} }
...@@ -325,7 +374,8 @@ export default { ...@@ -325,7 +374,8 @@ export default {
top: -2px; top: -2px;
right: -1px; right: -1px;
text-align: right; text-align: right;
width: 130px;
left: inherit;
} }
.homebox .rightPannel .navtool .child__item .header__opera .opera__item { .homebox .rightPannel .navtool .child__item .header__opera .opera__item {
padding: 5px 12px; padding: 5px 12px;
......
...@@ -144,7 +144,12 @@ export default { ...@@ -144,7 +144,12 @@ export default {
} }
this.loging = false; this.loging = false;
}, },
err => {} err => {
this.usermodel.voucher = "";
this.errorMsg = '网络请求超时,请检查网络';
this.isRemeber = false;
this.loging = false;
}
); );
} }
}, },
...@@ -199,6 +204,9 @@ export default { ...@@ -199,6 +204,9 @@ export default {
right: 0; right: 0;
animation: breathe 0.5s; animation: breathe 0.5s;
} }
.login-box .el-alert--error{
color: rgb(251, 197, 197);
}
@-webkit-keyframes breathe { @-webkit-keyframes breathe {
0% { 0% {
bottom: -26px; bottom: -26px;
......
...@@ -327,7 +327,7 @@ export default { ...@@ -327,7 +327,7 @@ export default {
teamId: this.teamInfo.teamId, teamId: this.teamInfo.teamId,
custom: JSON.stringify(custom), custom: JSON.stringify(custom),
done: (error, team) => { done: (error, team) => {
console.log('serverCustom Error:',error) // console.log('serverCustom Error:',error)
} }
} }
}) })
......
...@@ -328,7 +328,6 @@ export default { ...@@ -328,7 +328,6 @@ export default {
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0, img.width, img.height); ctx.drawImage(img, 0, 0, img.width, img.height);
var dataURL = canvas.toDataURL("image/png"); var dataURL = canvas.toDataURL("image/png");
alert(dataURL)
this.$electron.ipcRenderer.send("getNetworkImageBASE64", dataURL); this.$electron.ipcRenderer.send("getNetworkImageBASE64", dataURL);
return return
}, },
...@@ -337,7 +336,7 @@ export default { ...@@ -337,7 +336,7 @@ export default {
img.src = src; //此处自己替换本地图片的地址 img.src = src; //此处自己替换本地图片的地址
let _this = this; let _this = this;
img.onload =function() { img.onload =function() {
// console.log(_this.getBase64Image(img)) _this.getBase64Image(img)
} }
}, },
setClipboard() { setClipboard() {
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
padding: 20px; padding: 20px;
padding-right: 12px; padding-right: 12px !important;
height: 100%; height: 100%;
overflow-y: auto !important; overflow-y: auto !important;
overflow-x:hidden !important; overflow-x:hidden !important;
......
...@@ -169,8 +169,8 @@ ...@@ -169,8 +169,8 @@
<right-menu @update-session="updateSession" v-if="menu.show" :config='menu' :top="menu.t" :left="menu.l" :session="menu.s" ></right-menu> <right-menu @update-session="updateSession" v-if="menu.show" :config='menu' :top="menu.t" :left="menu.l" :session="menu.s" ></right-menu>
</div> </div>
<div class="messagebox"> <div class="messagebox">
<net-error v-if="netState"></net-error> <!-- <net-error v-if="netState"></net-error> -->
<div v-else-if="currentSession.id!=''"> <div v-if="currentSession.id!=''">
<chat :id="currentSession.id" :idServer='atIds' @update-session="updateSession"></chat> <chat :id="currentSession.id" :idServer='atIds' @update-session="updateSession"></chat>
</div> </div>
<notice v-else-if="openNoticeState" @clear-msg='clearNotice'></notice> <notice v-else-if="openNoticeState" @clear-msg='clearNotice'></notice>
...@@ -312,7 +312,6 @@ export default { ...@@ -312,7 +312,6 @@ export default {
this.TOPSESSION = topSession; this.TOPSESSION = topSession;
}, },
enterChat(session) { enterChat(session) {
console.log(session)
if(session.id!=this.currentSession.id){ if(session.id!=this.currentSession.id){
this.atIds=null this.atIds=null
pageUtil.openDown=true pageUtil.openDown=true
...@@ -358,7 +357,7 @@ export default { ...@@ -358,7 +357,7 @@ export default {
teamId: teamInfo.teamId, teamId: teamInfo.teamId,
custom: JSON.stringify(custom), custom: JSON.stringify(custom),
done: (error, team) => { done: (error, team) => {
console.log('serverCustom Error:',error) // console.log('serverCustom Error:',error)
} }
} }
}) })
...@@ -426,8 +425,6 @@ export default { ...@@ -426,8 +425,6 @@ export default {
return isplay; return isplay;
}, },
createSession(obj){ createSession(obj){
console.log('obj.id', obj.id)
console.log('this.createSessions', this.createSessions)
let h=null let h=null
this.sessionlist.forEach(x=>{ this.sessionlist.forEach(x=>{
if(x.id==obj.id){ if(x.id==obj.id){
...@@ -468,7 +465,6 @@ export default { ...@@ -468,7 +465,6 @@ export default {
}); });
this.MsgBus.$on("forward",function(msg){ this.MsgBus.$on("forward",function(msg){
that.forwardMsgInfo=msg that.forwardMsgInfo=msg
console.log(that.forwardMsgInfo)
that.$electron.ipcRenderer.send("open-forward-msg",that.sessionlist); that.$electron.ipcRenderer.send("open-forward-msg",that.sessionlist);
}) })
this.MsgBus.$on("goForward",function(sessions){ this.MsgBus.$on("goForward",function(sessions){
...@@ -674,10 +670,10 @@ export default { ...@@ -674,10 +670,10 @@ export default {
} }
this.newMsgList = unreadList; this.newMsgList = unreadList;
return sessionlist; return sessionlist;
},
netState(){
return this.$store.state.isNetError
} }
// netState(){
// return this.$store.state.isNetError
// }
} }
}; };
</script> </script>
......
...@@ -45,12 +45,7 @@ export default { ...@@ -45,12 +45,7 @@ export default {
}, },
methods: { methods: {
setSessionlist(){ setSessionlist(){
let sessionlist = this.$electron.remote.getGlobal("NEWMESSAGE"); this.sessionlist = this.$electron.remote.getGlobal("NEWMESSAGE")
let list = [];
for(let i = 0; i < 4; i ++) {
list.push(sessionlist[i])
}
this.sessionlist = list
}, },
openMsg(session) { openMsg(session) {
var sessions = new Array(); var sessions = new Array();
......
...@@ -279,7 +279,7 @@ export default { ...@@ -279,7 +279,7 @@ export default {
if(this.teamMembers.length<200) if(this.teamMembers.length<200)
this.teamMembers.push(member); this.teamMembers.push(member);
}else{ }else{
console.log('没有账号') // console.log('没有账号')
} }
}); });
this.$refs.tree.setCheckedKeys([]); this.$refs.tree.setCheckedKeys([]);
...@@ -350,7 +350,7 @@ export default { ...@@ -350,7 +350,7 @@ export default {
top: 0px; top: 0px;
right: 0px; right: 0px;
text-align: right; text-align: right;
height: 24px !important;
} }
.addNewUser .split { .addNewUser .split {
position: absolute; position: absolute;
......
...@@ -156,7 +156,6 @@ export default { ...@@ -156,7 +156,6 @@ export default {
x.groupType=3 x.groupType=3
return x; return x;
}); });
console.log(this.searchResults)
} }
}, },
err => {} err => {}
......
...@@ -262,7 +262,6 @@ export default { ...@@ -262,7 +262,6 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.webAllpartList = res.data.data; this.webAllpartList = res.data.data;
console.log(res.data.data);
} else { } else {
} }
}, },
......
...@@ -58,12 +58,10 @@ export default { ...@@ -58,12 +58,10 @@ export default {
}, },
mounted() { mounted() {
this.getUserInfo(); this.getUserInfo();
console.log(this.usercard)
}, },
methods: { methods: {
openChat(){ openChat(){
let _this = this let _this = this
console.log(_this.user.id)
this.MsgBus.$emit("change-create-session", _this.user); this.MsgBus.$emit("change-create-session", _this.user);
}, },
getUserInfo() { getUserInfo() {
......
...@@ -89,7 +89,6 @@ export default { ...@@ -89,7 +89,6 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
this.MsgBus.$on("send-at-name", function(name) { this.MsgBus.$on("send-at-name", function(name) {
console.log(name)
document.querySelector('#msgEditorBox').innerText = document.querySelector('#msgEditorBox').innerText + `@${name} ` document.querySelector('#msgEditorBox').innerText = document.querySelector('#msgEditorBox').innerText + `@${name} `
}) })
this.MsgBus.$on("close-copy", function() { this.MsgBus.$on("close-copy", function() {
...@@ -284,7 +283,6 @@ export default { ...@@ -284,7 +283,6 @@ export default {
}); });
}, },
createImage(dataurl){ createImage(dataurl){
console.log('图片来了!!!!!!!!!!!', dataurl)
var strLen = dataurl.length; var strLen = dataurl.length;
var size = strLen-(strLen/8)*2; var size = strLen-(strLen/8)*2;
let f = { let f = {
......
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
teamId: this.session.id.split("-")[1], teamId: this.session.id.split("-")[1],
muteTeam: !this.session.isMute, muteTeam: !this.session.isMute,
muteNotiType: !this.session.isMute ? 1 : 0, muteNotiType: !this.session.isMute ? 1 : 0,
done: (error, team) => {console.log(error)} done: (error, team) => {}
} }
}); });
this.config.show = false; this.config.show = false;
......
...@@ -31,7 +31,6 @@ export default { ...@@ -31,7 +31,6 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
this.imgPath = this.$electron.remote.getGlobal("DEFAULT_SCREENSHOT_PATH"); this.imgPath = this.$electron.remote.getGlobal("DEFAULT_SCREENSHOT_PATH");
console.log(this.imgPath,'imgPath')
document.onkeydown = function(event) { document.onkeydown = function(event) {
var e = event || window.event || arguments.callee.caller.arguments[0]; var e = event || window.event || arguments.callee.caller.arguments[0];
if (e && e.keyCode == 27) { if (e && e.keyCode == 27) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -102,7 +102,7 @@ export function sendChatroomFileMsg ({state, commit}, obj) { ...@@ -102,7 +102,7 @@ export function sendChatroomFileMsg ({state, commit}, obj) {
}, },
uploaderror: function () { uploaderror: function () {
fileInput.value = '' fileInput.value = ''
console && console.log('上传失败') // console && console.log('上传失败')
}, },
uploaddone: function(error, file) { uploaddone: function(error, file) {
fileInput.value = '' fileInput.value = ''
......
...@@ -85,12 +85,13 @@ export default { ...@@ -85,12 +85,13 @@ export default {
// 用户触发的登出逻辑 // 用户触发的登出逻辑
logout({ state, commit }) { logout({ state, commit }) {
cookie.delCookie('uid') // cookie.delCookie('uid')
cookie.delCookie('sdktoken') // cookie.delCookie('sdktoken')
if (state.nim) { if (state.nim) {
state.nim.disconnect() state.nim.disconnect()
state.nim=null
} }
pageUtil.turnPage('', 'login') //pageUtil.turnPage('', 'login')
}, },
// 初始化 重新连接SDK // 初始化 重新连接SDK
......
...@@ -32,13 +32,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) { ...@@ -32,13 +32,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
onerror: function onChatroomError (error, obj) { onerror: function onChatroomError (error, obj) {
dispatch('hideLoading') dispatch('hideLoading')
if (error) { if (error) {
alert('网络连接状态异常') //alert('网络连接状态异常')
location.href='#/room' location.href='#/room'
} }
}, },
onwillreconnect: function onChatroomWillReconnect (obj) { onwillreconnect: function onChatroomWillReconnect (obj) {
// 此时说明 `SDK` 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接 // 此时说明 `SDK` 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接
console.log('即将重连', obj) // console.log('即将重连', obj)
}, },
ondisconnect: function onChatroomDisconnect (error) { ondisconnect: function onChatroomDisconnect (error) {
// 此时说明 `SDK` 处于断开状态, 切换聊天室也会触发次回调 // 此时说明 `SDK` 处于断开状态, 切换聊天室也会触发次回调
...@@ -51,13 +51,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) { ...@@ -51,13 +51,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
// 如果单用聊天室功能需要在此做处理 // 如果单用聊天室功能需要在此做处理
break; break;
case 13003: case 13003:
alert('抱歉,你已被主播拉入了黑名单') //alert('抱歉,你已被主播拉入了黑名单')
location.href='#/room' location.href='#/room'
break break
// 被踢, 请提示错误后跳转到登录页面 // 被踢, 请提示错误后跳转到登录页面
case 'kicked': case 'kicked':
if (error.reason === 'managerKick') { if (error.reason === 'managerKick') {
alert('你已被管理员移出聊天室') //alert('你已被管理员移出聊天室')
location.href='#/room' location.href='#/room'
} else if (error.reason === 'blacked') { } else if (error.reason === 'blacked') {
alert('你已被管理员拉入黑名单,不能再进入') alert('你已被管理员拉入黑名单,不能再进入')
...@@ -65,7 +65,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) { ...@@ -65,7 +65,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
} }
break; break;
default: default:
console.log(error.message); // console.log(error.message);
break break
} }
} }
...@@ -75,7 +75,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) { ...@@ -75,7 +75,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
}) })
} }
} else { } else {
alert('没有聊天室地址') //alert('没有聊天室地址')
} }
} }
......
...@@ -42,14 +42,15 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) { ...@@ -42,14 +42,15 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) {
// 连接上以后更新uid // 连接上以后更新uid
commit('updateUserUID', loginInfo) commit('updateUserUID', loginInfo)
commit('updateNetError',false) commit('updateNetError',false)
console.log('链接完成......')
} }
}, },
onerror: function onError (event) { onerror: function onError (event) {
commit('updateNetError',true) commit('updateNetError',true)
console.log('断网了')
}, },
onwillreconnect: function onWillReconnect() { onwillreconnect: function onWillReconnect() {
commit('updateNetError',true) commit('updateNetError',true)
console.log('尝试中.........')
}, },
ondisconnect: function onDisconnect (error) { ondisconnect: function onDisconnect (error) {
switch (error.code) { switch (error.code) {
...@@ -71,7 +72,6 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) { ...@@ -71,7 +72,6 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) {
pageUtil.turnPage(errorMsg, 'login') pageUtil.turnPage(errorMsg, 'login')
break break
default: default:
console.log('断网了2')
break break
} }
}, },
......
...@@ -81,12 +81,11 @@ export function setCurrSession ({state, commit, dispatch}, sessionId) { ...@@ -81,12 +81,11 @@ export function setCurrSession ({state, commit, dispatch}, sessionId) {
if (nim) { if (nim) {
// 如果在聊天页面刷新,此时还没有nim实例,需要在onSessions里同步 // 如果在聊天页面刷新,此时还没有nim实例,需要在onSessions里同步
nim.setCurrSession(sessionId) nim.setCurrSession(sessionId)
console.log('初始化了')
commit('updateCurrSessionMsgs', { commit('updateCurrSessionMsgs', {
type: 'init', type: 'init',
sessionId sessionId
}) })
// 发送已读回执 // 发送已读回执
dispatch('sendMsgReceipt') dispatch('sendMsgReceipt')
} }
} }
......
...@@ -44,7 +44,6 @@ export function onSysMsgUnread (obj) { ...@@ -44,7 +44,6 @@ export function onSysMsgUnread (obj) {
} }
export function onCustomSysMsgs (customSysMsgs) { export function onCustomSysMsgs (customSysMsgs) {
console.log(customSysMsgs)
if (!Array.isArray(customSysMsgs)) { if (!Array.isArray(customSysMsgs)) {
customSysMsgs = [customSysMsgs] customSysMsgs = [customSysMsgs]
} }
......
...@@ -117,7 +117,6 @@ export function onTeamMsgReceipt(obj) { ...@@ -117,7 +117,6 @@ export function onTeamMsgReceipt(obj) {
store.commit('updateSingleTeamMsgReads', item) store.commit('updateSingleTeamMsgReads', item)
} }
}) })
console.log('群消息回执通知' + obj)
} }
// 进入可配置的群信息设置页,进入前改变state中的配置信息,进入页面后读取配置信息更新视图 // 进入可配置的群信息设置页,进入前改变state中的配置信息,进入页面后读取配置信息更新视图
...@@ -192,7 +191,6 @@ export function checkTeamMsgReceipt({state}, msgs) { ...@@ -192,7 +191,6 @@ export function checkTeamMsgReceipt({state}, msgs) {
nim.sendTeamMsgReceipt({ nim.sendTeamMsgReceipt({
teamMsgReceipts: needToPeceiptList, teamMsgReceipts: needToPeceiptList,
done: (err, obj, content) => { done: (err, obj, content) => {
console.log('标记群组消息已读' + (!err ? '成功' : '失败'));
if (!err) { if (!err) {
store.commit('updateSentReceipedMap', needToPeceiptList) store.commit('updateSentReceipedMap', needToPeceiptList)
} }
...@@ -226,9 +224,10 @@ export function getTeamMsgReads({ state }, needQuery) { ...@@ -226,9 +224,10 @@ export function getTeamMsgReads({ state }, needQuery) {
teamMsgReceipts: needQuery, teamMsgReceipts: needQuery,
done: (error, obj, content) => { done: (error, obj, content) => {
if (error) { if (error) {
console.log('获取群组消息已读' + error) //console.log('获取群组消息已读' + error)
let a=0;
}else { }else {
console.log('获取群组消息已读:', content) //('获取群组消息已读:', content)
store.commit('updateTeamMsgReads', content) store.commit('updateTeamMsgReads', content)
} }
} }
......
...@@ -334,7 +334,7 @@ export default { ...@@ -334,7 +334,7 @@ export default {
if (obj.msgs[0]) { if (obj.msgs[0]) {
state.currSessionLastMsg = obj.msgs[0] state.currSessionLastMsg = obj.msgs[0]
} }
console.log(state.currSessionMsgs) //console.log(state.currSessionMsgs)
store.dispatch('checkTeamMsgReceipt', currSessionMsgs) store.dispatch('checkTeamMsgReceipt', currSessionMsgs)
} else if (type === 'replace') { } else if (type === 'replace') {
let msgLen = state.currSessionMsgs.length let msgLen = state.currSessionMsgs.length
......
...@@ -350,7 +350,8 @@ Utils.showTips = function(msg){ ...@@ -350,7 +350,8 @@ Utils.showTips = function(msg){
dom.style.display='none' dom.style.display='none'
}, 2000); }, 2000);
}else{ }else{
console.log('没有找到div',dom.style.display) //console.log('没有找到div',dom.style.display)
let a=0
} }
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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