Skip to content

S
shareConfig
Commit 30f638ce by IgnoreMePlz
Options

修复

parent f33bd5ee
Showing with 6 additions and 14 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.361a06bbc6e645acd023c8bcb543cd03.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title></title><link href=./static/css/app.9c98d69f503faa873513a6ebdd8950c9.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> bugfix/活动创建bug
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>');
<<<<<<< HEAD
})();</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.588c1644be17598a31bf.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.bbfbc6705314535a50ea.js></script></body></html>
=======
})();</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.9762ad3567be30629c38.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.7c385e40c6a1f53565e9.js></script></body></html>
>>>>>>> bugfix/活动创建bug
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title></title><link href=./static/css/app.73bfb2b7f09408ee8f1a91eb1df1f48a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></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.7f10b84e60a0b3dc5c19.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.7c385e40c6a1f53565e9.js></script></body></html>
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