feat:解决合并代码后的冲突

src/common/js/user.ts

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:25
  * @Date: 2020-08-31 09:34:25
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-23 16:14:11
+ * @LastEditTime: 2021-07-20 17:41:20
  * @Description:
  * @Description:
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -48,6 +48,10 @@ class User {
     return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
     return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
   }
   }
 
 
+  getAvatar(){
+    return Storage.get(`${PREFIX}_avatar`);
+  }
+  
   getUserRole() {
   getUserRole() {
     return Storage.get(`${PREFIX}_userRole`);
     return Storage.get(`${PREFIX}_userRole`);
   }
   }
@@ -96,6 +100,10 @@ class User {
     return Storage.set(`${PREFIX}_userId`, value);
     return Storage.set(`${PREFIX}_userId`, value);
   }
   }
 
 
+  setAvatar(value: any) {
+    return Storage.set(`${PREFIX}_avatar`, value);
+  }
+
   setUserRole(value: any) {
   setUserRole(value: any) {
     return Storage.set(`${PREFIX}_userRole`, value);
     return Storage.set(`${PREFIX}_userRole`, value);
   }
   }

src/modules/root/Header.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
  * @Date: 2019-09-10 18:26:03
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-14 14:14:16
+ * @LastEditTime: 2021-07-20 17:39:52
  * @Description:
  * @Description:
  */
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -79,6 +79,7 @@ function Header(props) {
       setNickName(nickName);
       setNickName(nickName);
       setPhone(phone);
       setPhone(phone);
       setAvatar(res.result.avatar);
       setAvatar(res.result.avatar);
+      User.setAvatar(res.result.avatar);
     });
     });
   }
   }
 
 
@@ -336,7 +337,7 @@ function Header(props) {
                     <div
                     <div
                       className='url-link'
                       className='url-link'
                       onClick={() => {
                       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>
                     </div>