Merge branch 'feature/切换账号' into dev

# Conflicts: # dist/css/main.80982f8932a34de8c7a8.css # dist/index.html # dist/js/main.bd2843772baae732071a.js # dist/js/main.bd2843772baae732071a.js.LICENSE.txt

Merge branch 'feature/切换账号' into dev
# Conflicts: # dist/css/main.80982f8932a34de8c7a8.css # dist/index.html # dist/js/main.bd2843772baae732071a.js # dist/js/main.bd2843772baae732071a.js.LICENSE.txt
7a3f05e0 · caoyanzhi · 3d4578a6 · 9fa129fd · 7a3f05e0 · 7a3f05e0
Commit 7a3f05e0 authored Aug 17, 2022 by caoyanzhi
5 changed files
--- a/dist/css/main.80982f8932a34de8c7a8.css
+++ b/dist/css/main.80982f8932a34de8c7a8.css
--- a/dist/index.html
+++ b/dist/index.html
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.bd2843772baae732071a.js"></script><link href="/integral-mall/css/main.80982f8932a34de8c7a8.css" rel="stylesheet"></head><body><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.8.js"></script><script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script></body></html>
\ No newline at end of file
--- a/dist/js/main.bd2843772baae732071a.js
+++ b/dist/js/main.bd2843772baae732071a.js
--- a/dist/js/main.bd2843772baae732071a.js.LICENSE.txt
+++ b/dist/js/main.bd2843772baae732071a.js.LICENSE.txt
+/*!
+ * @overview es6-promise - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
+ * @version   v4.2.6+9869a4bc
+ */
+
+/*!
+ * clipboard.js v2.0.1
+ * https://zenorocha.github.io/clipboard.js
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+
+/*!
+ * vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
+ * Released under the MIT License.
+ * https://vue-treeselect.js.org/
+ */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */
--- a/src/App.vue
+++ b/src/App.vue
@@ -37,6 +37,8 @@ export default {
              const useId = res.data.result && res.data.result.userId;
              if (this.userId !== useId) {
                this.userId = useId;
+                // 切换账号后，不缓存权限数据、菜单数据、面包屑数据
+                window.notCache = true;
                // 串号
                this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请重新登录！', '登录账号变更提示', {
                  confirmButtonText: '重新登录',