Commit b7abc31c by yuananting

Merge branch 'feature/zhangleyuan/20210720/go-to-college' into 'master'

Feature/zhangleyuan/20210720/go to college

See merge request !73
parents 62f296ce 786edbc4
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-31 09:34:25
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-23 16:08:50
* @LastEditTime: 2021-07-20 17:21:16
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -48,6 +48,10 @@ class User {
return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
}
getAvatar(){
return Storage.get(`${PREFIX}_avatar`);
}
getUserRole() {
return Storage.get(`${PREFIX}_userRole`);
}
......@@ -96,6 +100,10 @@ class User {
return Storage.set(`${PREFIX}_userId`, value);
}
setAvatar(value: any) {
return Storage.set(`${PREFIX}_avatar`, value);
}
setUserRole(value: any) {
return Storage.set(`${PREFIX}_userRole`, value);
}
......
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-14 14:14:16
* @LastEditTime: 2021-07-20 17:39:52
* @Description:
*/
import React, { useRef, useContext, useEffect, useState } from 'react';
......@@ -79,6 +79,7 @@ function Header(props) {
setNickName(nickName);
setPhone(phone);
setAvatar(res.result.avatar);
User.setAvatar(res.result.avatar);
});
}
......@@ -336,7 +337,7 @@ function Header(props) {
<div
className='url-link'
onClick={() => {
window.open(htmlUrl);
window.open(`${LIVE_SHARE}store/index?id=${window.currentStoreUserInfo.storeId||User.getStoreId()}&userId=${window.currentStoreUserInfo.userId||User.getUserId()}&enterpriseId=${window.currentStoreUserInfo.enterpriseId||User.getEnterpriseId()}&from=admin&avatar=${avatar}`);
}}>
{'立即前往 >'}
</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