zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

管理端和商家端userInfo字段名变更，管理端会员详情，他的积分字段调整

master
mabo 2021-08-04 17:51:43 +08:00
parent 726ae1f856
commit 0387ac510a
22 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manager/src/libs/axios.js
View File

@ -52,7 +52,7 @@ service.interceptors.response.use(
break;
case 401:
// 未登录 清除已登录状态
Cookies.set("userInfo", "");
Cookies.set("userInfoManager", "");
setStore("accessToken", "");
if (router.history.current.name != "login") {
if (data.message !== null) {
@ -95,7 +95,7 @@ service.interceptors.response.use(
router.go(0)
}
} else {
Cookies.set("userInfo", "");
Cookies.set("userInfoManager", "");
router.push('/login')
}
isRefreshToken = 0

2
manager/src/libs/util.js
View File

@ -320,7 +320,7 @@ util.initRouter = function (vm) { // 初始化路由
frontRoute: 'error-page/404'
}];
// 判断用户是否登录
let userInfo = Cookies.get('userInfo')
let userInfo = Cookies.get('userInfoManager')
if (!userInfo) {
// 未登录
return;

4
manager/src/router/index.js
View File

@ -23,12 +23,12 @@ router.beforeEach((to, from, next) => {
const name = to.name;
if (!Cookies.get('userInfo') && name !== 'login') {
if (!Cookies.get('userInfoManager') && name !== 'login') {
// 判断是否已经登录且前往的页面不是登录页
next({
name: 'login'
});
} else if (Cookies.get('userInfo') && name === 'login') {
} else if (Cookies.get('userInfoManager') && name === 'login') {
// 判断是否已经登录且前往的是登录页
Util.title();
next({

2
manager/src/store/modules/user.js
View File

@ -4,7 +4,7 @@ const user = {
state: {},
mutations: {
logout () {
Cookies.remove('userInfo');
Cookies.remove('userInfoManager');
// 清空打开的页面等数据
localStorage.clear();
}

2
manager/src/views/Main.vue
View File

@ -96,7 +96,7 @@ export default {
methods: {
init() {
// 菜单初始化
let userInfo = JSON.parse(Cookies.get("userInfo"));
let userInfo = JSON.parse(Cookies.get("userInfoManager"));
this.userInfo = userInfo;
this.checkTag(this.$route.name);

3
manager/src/views/login.vue
View File

@ -87,8 +87,7 @@ export default {
userInfo().then((res) => {
if (res.success) {
// 加载菜单
this.setStore("userInfo", res.result);
Cookies.set("userInfo", JSON.stringify(res.result));
Cookies.set("userInfoManager", JSON.stringify(res.result));
this.$store.commit("setAvatarPath", res.result.avatar);
util.initRouter(this);
this.$router.push({

6
manager/src/views/member/list/memberDetail.vue
View File

@ -417,7 +417,7 @@
{
title: "变动积分",
key: "point",
key: "variablePoint",
width: 150,
render: (h, params) => {
if (params.row.pointType == 'INCREASE') {
@ -426,7 +426,7 @@
style: {
color: 'green'
}
}, "+" + params.row.point),
}, "+" + params.row.variablePoint),
]);
} else {
return h('div', [
@ -434,7 +434,7 @@
style: {
color: 'red'
}
}, "-" + params.row.point),
}, "-" + params.row.variablePoint),
]);
}

4
manager/src/views/personal-center/personal-center.vue
View File

@ -82,7 +82,7 @@ export default {
methods: {
// 初始化数据
init() {
let v = JSON.parse(Cookies.get("userInfo"));
let v = JSON.parse(Cookies.get("userInfoManager"));
// 转换null为""
for (let attr in v) {
if (v[attr] == null) {
@ -112,7 +112,7 @@ export default {
if (res.success) {
this.$Message.success("保存成功");
// 更新用户信息
Cookies.set("userInfo", this.userForm);
Cookies.set("userInfoManager", this.userForm);
// 更新头像
this.$store.commit("setAvatarPath", this.userForm.avatar);
setTimeout(()=>{

16
seller/src/config/index.js
View File

@ -18,14 +18,14 @@ export default {
* @description api请求基础路径
*/
api_dev: {
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.100:8887'
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
// common: 'http://192.168.0.100:8890',
// buyer: 'http://192.168.0.100:8888',
// seller: 'http://192.168.0.100:8889',
// manager: 'http://192.168.0.100:8887'
},
api_prod: {
common: "https://common-api.pickmall.cn",

4
seller/src/libs/axios.js
View File

@ -58,7 +58,7 @@ service.interceptors.response.use(
break;
case 401:
// 未登录 清除已登录状态
Cookies.set("userInfo", "");
Cookies.set("userInfoSeller", "");
setStore("accessToken", "");
if (router.history.current.name != "login") {
if (data.message !== null) {
@ -103,7 +103,7 @@ service.interceptors.response.use(
router.go(0);
}
} else {
Cookies.set("userInfo", "");
Cookies.set("userInfoSeller", "");
router.push("/login");
}
isRefreshToken = 0;

10
seller/src/libs/util.js
View File

@ -318,11 +318,11 @@ util.initRouter = function (vm) { // 初始化路由
component: 'error-page/404'
}];
// 判断用户是否登录
let userInfo = Cookies.get('userInfo')
// if (!userInfo) {
// // 未登录
// return;
// }
let userInfo = Cookies.get('userInfoSeller')
if (!userInfo) {
// 未登录
return;
}
if (!vm.$store.state.app.added) {
// 第一次加载 读取数据

4
seller/src/router/index.js
View File

@ -23,12 +23,12 @@ router.beforeEach((to, from, next) => {
const name = to.name;
if (!Cookies.get('userInfo') && name !== 'login') {
if (!Cookies.get('userInfoSeller') && name !== 'login') {
// 判断是否已经登录且前往的页面不是登录页
next({
name: 'login'
});
} else if (Cookies.get('userInfo') && name === 'login') {
} else if (Cookies.get('userInfoSeller') && name === 'login') {
// 判断是否已经登录且前往的是登录页
Util.title();
next({

2
seller/src/store/modules/user.js
View File

@ -4,7 +4,7 @@ const user = {
state: {},
mutations: {
logout () {
Cookies.remove('userInfo');
Cookies.remove('userInfoSeller');
// 清空打开的页面等数据
localStorage.clear();
}

2
seller/src/views/Main.vue
View File

@ -98,7 +98,7 @@ export default {
this.$store.commit("addOpenSubmenu", pathArr[1].name);
}
let userInfo = JSON.parse(Cookies.get("userInfo"));
let userInfo = JSON.parse(Cookies.get("userInfoSeller"));
this.userInfo = userInfo;
this.checkTag(this.$route.name);

2
seller/src/views/home/home.vue
View File

@ -225,7 +225,7 @@ export default {
},
// 初始化数据
async init() {
let userInfo = JSON.parse(Cookies.get("userInfo"));
let userInfo = JSON.parse(Cookies.get("userInfoSeller"));
this.userData = userInfo;

2
seller/src/views/lili-components/affix-time.vue
View File

@ -64,7 +64,7 @@ export default {
};
},
mounted() {
this.storeId = JSON.parse(Cookies.get("userInfo")).id;
this.storeId = JSON.parse(Cookies.get("userInfoSeller")).id;
this.getFiveYears();
},
methods: {

5
seller/src/views/login.vue
View File

@ -103,13 +103,12 @@ export default {
this.setStore("saveLogin", this.saveLogin);
if (this.saveLogin) {
// 保存7天
Cookies.set("userInfo", JSON.stringify(res.result), {
Cookies.set("userInfoSeller", JSON.stringify(res.result), {
expires: 7,
});
} else {
Cookies.set("userInfo", JSON.stringify(res.result));
Cookies.set("userInfoSeller", JSON.stringify(res.result));
}
this.setStore("userInfo", res.result);
this.$store.commit("setAvatarPath", res.result.storeLogo);
// 加载菜单
util.initRouter(this);

3
seller/src/views/order/order/orderList.vue
View File

@ -254,8 +254,7 @@ export default {
},
// 导出的待发货订单数据
async exportOrder () {
let userInfo = JSON.parse(Cookies.get("userInfo"));
console.log(userInfo);
let userInfo = JSON.parse(Cookies.get("userInfoSeller"));
const params = {
// 搜索框初始化对象
pageNumber: 1, // 当前页数

2
seller/src/views/shop/shopSetting.vue
View File

@ -201,7 +201,7 @@ export default {
this.$set(this.form, "address", res.result.storeAddressPath);
this.storeName = res.result.storeName;
this.form.center = res.result.storeCenter;
Cookies.set("userInfo", JSON.stringify(res.result));
Cookies.set("userInfoSeller", JSON.stringify(res.result));
//库存预警数赋值
this.$nextTick(() => {

2
seller/src/views/statistics/goods.vue
View File

@ -31,7 +31,7 @@ export default {
searchType: "LAST_SEVEN",
year: "",
month: "",
storeId: JSON.parse(Cookies.get("userInfo")).id || '',
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || '',
type: "NUM"
},
columns: [ // 表格表头

8
seller/src/views/statistics/order.vue
View File

@ -397,20 +397,20 @@ export default {
orderParams: {
searchType: "LAST_SEVEN", // TODAY , YESTERDAY , LAST_SEVEN , LAST_THIRTY
year: "",
storeId: JSON.parse(Cookies.get("userInfo")).id || "",
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || "",
memberId: "",
},
// 订单概念
overViewParams: {
month: "",
searchType: "LAST_SEVEN", // TODAY , YESTERDAY , LAST_SEVEN , LAST_THIRTY
storeId: JSON.parse(Cookies.get("userInfo")).id || "",
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || "",
year: "",
},
defaultParams: {
month: "",
searchType: "LAST_SEVEN", // TODAY , YESTERDAY , LAST_SEVEN , LAST_THIRTY
storeId: JSON.parse(Cookies.get("userInfo")).id || "",
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || "",
year: "",
},
@ -420,7 +420,7 @@ export default {
pageNumber: 1,
pageSize: 10,
searchType: "LAST_SEVEN",
storeId: JSON.parse(Cookies.get("userInfo")).id || "",
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || "",
year: "",
},

2
seller/src/views/statistics/traffic.vue
View File

@ -92,7 +92,7 @@ export default {
searchType: "LAST_SEVEN",
year: "",
month: "",
storeId: JSON.parse(Cookies.get("userInfo")).id || "",
storeId: JSON.parse(Cookies.get("userInfoSeller")).id || "",
},
columns: [
{