Skip to content

S
shareConfig
Commit 2a183621 by caoyanzhi
Options

Merge branch 'feature/登录账号变更提示' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.52434b6018a48a00a6c5.js
#	dist/static/js/0.5b05d9e24b9678f53a28.js
#	dist/static/js/0.96dc1d257eff24de01a8.js
#	dist/static/js/app.fd13ff6fa6f5bc76d47d.js
parents 584a42e8 f35b1957
Showing with 17 additions and 11 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.1c674d1263e770b63b864b4e0ecb766a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.5ffccfdef0e161eee7a0.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.dcd0c61208d7d8dcabef.js></script></body></html>
\ No newline at end of file
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.5ffccfdef0e161eee7a0.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.dcd0c61208d7d8dcabef.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.1c674d1263e770b63b864b4e0ecb766a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.58.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.0dfb2b9662adfca26eb8.js></script><script type=text/javascript src=./static/js/vendor.94cb6f4559ee1a087349.js></script><script type=text/javascript src=./static/js/app.fd13ff6fa6f5bc76d47d.js></script></body></html>
>>>>>>> feature/登录账号变更提示
dist/static/js/app.fd13ff6fa6f5bc76d47d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.0dfb2b9662adfca26eb8.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={16:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"5b05d9e24b9678f53a28",1:"0b4debf702276a81a576",2:"0aea270bfe4cf0791866",3:"3275af2c7035855c80ca",4:"625912db30b589937e13",5:"bf04c543db410518daa3",6:"1a92685ac62fcb2499a6",7:"77854ed7bad11f815191",8:"99e63d6938e3e2cc698c",9:"2f6f9c5ddfdec55bd7ad",10:"b13e3a0e48cb424eddfe",11:"9529a2b8d9ed57634743",12:"35c46a8717276a0cefcc",13:"a792ce23fe879d2e71eb"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/App.vue
......@@ -50,17 +50,18 @@ export default {
const uId = res.data.result && res.data.result.userId;
// 两次的uId不等 表示账号有冲突
if (this.uniqueId !== uId) {
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请退出重新登录！', '登录账号变更提示', {
confirmButtonText: '退出重新登录',
this.$store.commit('changeUniqueId', uId);
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请重新登录！', '登录账号变更提示', {
confirmButtonText: '重新登录',
cancelButtonText: '刷新页面',
type: 'error'
}).then(() => {
this.laout();
window.location.reload();
}).catch(() => {
this.laout();
window.location.reload();
});
})
.then(() => {
window.location.href = '/gic-web/#/login';
})
.catch(() => {
window.location.href = '/report';
});
}
}
});
......
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