Skip to content

M
memberTag-web
Commit ff218910 by caoyanzhi
Options

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

# Conflicts:
#	dist/index.html
parents 8660f015 d9b1c28c
Showing with 17 additions and 11 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f91029f2ac2db7168157c5361b149ef8.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.12/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/index2.15.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.27.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.8.js></script><script type=text/javascript src=./static/js/manifest.5572ece2776ed4bbafee.js></script><script type=text/javascript src=./static/js/vendor.8d2fb0c51456228d1431.js></script><script type=text/javascript src=./static/js/app.1abaecf91d1fe4e46d3e.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f91029f2ac2db7168157c5361b149ef8.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.12/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/index2.15.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.27.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.8.js></script><script type=text/javascript src=./static/js/manifest.5572ece2776ed4bbafee.js></script><script type=text/javascript src=./static/js/vendor.8d2fb0c51456228d1431.js></script><script type=text/javascript src=./static/js/app.1abaecf91d1fe4e46d3e.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.9ca053d24c60eb0ab49a2328b4367c91.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.12/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/index2.15.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.27.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.8.js></script><script type=text/javascript src=./static/js/manifest.bee39bc17cf4e19566a8.js></script><script type=text/javascript src=./static/js/vendor.8d2fb0c51456228d1431.js></script><script type=text/javascript src=./static/js/app.1abaecf91d1fe4e46d3e.js></script></body></html>
>>>>>>> feature/登录账号变更提示
dist/static/css/app.9ca053d24c60eb0ab49a2328b4367c91.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.b9f180df7e147410f960.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.bee39bc17cf4e19566a8.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,f,c){for(var o,d,b,i=0,u=[];i<n.length;i++)d=n[i],r[d]&&u.push(r[d][0]),r[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(a&&a(n,f,c);u.length;)u.shift()();if(c)for(i=0;i<c.length;i++)b=t(t.s=c[i]);return b};var n={},r={36:0};function t(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,t){a=r[e]=[n,t]});a[2]=n;var f=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,t.nc&&c.setAttribute("nonce",t.nc),c.src=t.p+"static/js/"+e+"."+{0:"b9f180df7e147410f960",1:"61b1089acf1f67b03444",2:"7a089bb261c283c562b8",3:"a28794c268dd1fa8ae5e",4:"8509f3d8850381af80a2",5:"5905e24242fb4d81bc20",6:"52b1f994c700fee03877",7:"62871677f361ad326e47",8:"8d966e31d8722f5ac12d",9:"b459e06efee677b57562",10:"68c1375083d175dae9db",11:"cfa61640d1a3d8d26b48",12:"d351f58d3c390dbb3c5e",13:"49af49043def44dde4ea",14:"8cc53bc5285d95c95044",15:"a18365fab4e9beac0f46",16:"9a5908682c769ead69af",17:"ab2c69d70102f1cd22e9",18:"b68886e4980269e590b4",19:"e1d56a80d5402fefe9b5",20:"ee16432ad853f9ce6ed6",21:"af47283b2c7851059d7b",22:"4985a38ec89a12ab291d",23:"4dde9e951067205a2138",24:"91862acbf5b9546c8551",25:"119b07b58acf60d258b4",26:"f42bb6f75a04a8cf7880",27:"f7d2baeb938e2eb2690f",28:"d1375fb2d911e4155bea",29:"7d29c1529618775a1416",30:"1effbe735dcda20465ae",31:"89112c23956e9fb0a782",32:"fa1076fd160a51f1653e",33:"eb32b82a4fea671a494b"}[e]+".js";var o=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(o);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return c.onerror=c.onload=d,f.appendChild(c),n},t.m=e,t.c=n,t.d=function(e,a,n){t.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(a,"a",a),a},t.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/App.vue
......@@ -52,17 +52,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