Skip to content

I
integral-mall
Commit b435a839 by caoyanzhi
Options

Merge branch 'bugfix/账号切换后无提示' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/main.aaa6338822c91aede08a.js
#	dist/js/main.aaa6338822c91aede08a.js.LICENSE.txt
#	dist/js/main.c55405cadeb8a49ef89b.js
#	dist/js/main.c55405cadeb8a49ef89b.js.LICENSE.txt
#	dist/js/main.c84ab8586d3f73bd0504.js
#	dist/js/main.c84ab8586d3f73bd0504.js.LICENSE.txt
parents 115f1cdf 84486278
Showing with 38 additions and 6 deletions
dist/css/main.160cbe6165f7e458df90.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="//at.alicdn.com/t/font_688955_izyug5a9kjr.css"/><script src="//at.alicdn.com/t/font_688955_izyug5a9kjr.js"></script><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.c55405cadeb8a49ef89b.js"></script><link href="/integral-mall/css/main.60e25d752f8cb7cf4fe2.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="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.aaa6338822c91aede08a.js"></script><link href="/integral-mall/css/main.160cbe6165f7e458df90.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;
......
dist/js/main.aaa6338822c91aede08a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.aaa6338822c91aede08a.js.LICENSE.txt 0 → 100644
/*!
* @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
*/
dist/js/main.c55405cadeb8a49ef89b.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
......@@ -9,7 +9,9 @@ import request from './service/request.js';
export default {
name: 'App',
data () {
return {};
return {
userId: '',
};
},
created () {
this.getUserId();
......@@ -20,8 +22,7 @@ export default {
getUserId () {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
const useId = res.data.result.userId;
localStorage.setItem('useId', useId);
this.useId = res.data.result.userId;
} else {
this.$message.error(res.data.message);
}
......@@ -34,8 +35,8 @@ export default {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
const useId = res.data.result && res.data.result.userId;
if (localStorage.getItem('useId') !== useId) {
localStorage.setItem('useId', useId);
if (this.userId !== useId) {
this.userId = useId;
// 串号
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请重新登录！', '登录账号变更提示', {
confirmButtonText: '重新登录',
......
src/components/store/store-part.vue
......@@ -70,7 +70,7 @@
<div class="list-content">
<div v-if="selectRightList.length > 0">
<div class="list-item" v-for="(item, index) in selectRightList" :key="index">
<span slot="content" class="storeGroup-name" :title="item.pickUpPointName"> {{ item.pickUpPointName }}</span>
<span class="storeGroup-name" :title="item.pickUpPointName"> {{ item.pickUpPointName }}</span>
<span class="el-icon-close" @click="removeItem(item, index)" />
</div>
</div>
......
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