Skip to content

M
marketing
Commit 7f1a7ef0 by caoyanzhi
Options

Merge branch 'bugfix/优化切换账号的提示' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/manifest.04c3fdd403f84ac44b44.js
parents 2ed59212 3e1a44f4
Showing with 16 additions and 7 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.4d079a478e023e7365b1ea8370cd38db.css rel=stylesheet></head><body><div id=app></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.0a6bb9ff06da93a32b6a9cfdfdf7bb07.css rel=stylesheet></head><body><div id=app></div><script>(function() {
>>>>>>> bugfix/优化切换账号的提示
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.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.04c3fdd403f84ac44b44.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.2843c0c9990ab243f302.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.04c3fdd403f84ac44b44.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.2843c0c9990ab243f302.js></script></body></html>
=======
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.d1d30d5342864900c8f1.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.2843c0c9990ab243f302.js></script></body></html>
>>>>>>> bugfix/优化切换账号的提示
dist/static/css/main.0a6bb9ff06da93a32b6a9cfdfdf7bb07.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.ef36ec426b8cc94f118a.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.d1d30d5342864900c8f1.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.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,o);d.length;)d.shift()();if(o)for(s=0;s<o.length;s++)u=a(a.s=o[s]);return u};var r={},t={17:0};function a(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,a),t.l=!0,t.exports}a.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,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"f37316b56c14667202b3",1:"ef36ec426b8cc94f118a",2:"9cf200a6d8fb373f4c1d",3:"1a68ef3d62e9a09c7282",4:"e9b4bbfeea4a3ccd76e0",5:"2c2121ada4f3863521e4",6:"5e57fe1beb143ec5df5f",7:"7f6636ae60d3eda39960",8:"13fde4a11cf179885420",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"5a996f4f6d9fab0ca84c",12:"904b5a302f41c02f8b89",13:"5fced6e9caaad4365e60",14:"2c3686115829ba023ea1"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/popup.904b5a302f41c02f8b89.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
......@@ -12,7 +12,8 @@ export default {
name: 'App',
data() {
return {
include: []
include: [],
userId: ''
};
},
methods: {
......@@ -20,8 +21,7 @@ export default {
saveUserId() {
getUserLogin().then(res => {
if (res.errorCode === 0) {
const uId = res.result && res.result.userId;
localStorage.setItem('m_uId', uId);
this.userId = res.result && res.result.userId;
}
});
},
......@@ -34,8 +34,8 @@ export default {
const uId = res.result && res.result.userId;
const enableAccessControl = res.result && res.result.enableAccessControl;
localStorage.setItem('enableAccessControl', enableAccessControl);
if (localStorage.getItem('m_uId') !== uId) {
localStorage.setItem('m_uId', uId);
if (this.userId !== uId) {
this.userId = uId;
// 串号
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请重新登录！', '登录账号变更提示', {
confirmButtonText: '重新登录',
......
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