feat:处理字端显示

src/modules/personalInfo/index.less

@@ -3,7 +3,7 @@
             padding: 24px 60px 60px 40px !important;
         }
         .label{
-            width:84px;
+            width:100px;
             text-align:right;
             font-size: 14px;
             color: #666666;
@@ -37,10 +37,10 @@
                     color:#FFF;
                     font-size:22px;
                 }
-                &:hover{
-                    display: inline-block;
-                    opacity:0.5;
-                }
+                // &:hover{
+                //     display: inline-block;
+                //     opacity:0.5;
+                // }
             }
         }
         .name-item{
@@ -58,7 +58,8 @@
             }
         }
         .save-btn {
-            margin-left: 92px;
+            margin-top:20px;
+            margin-left: 106px;
         }
 
 }
\ No newline at end of file

src/modules/personalInfo/index.tsx

 /*
  * @Author: zhangleyuan
  * @Date: 2020-11-27 15:06:31
- * @LastEditors: wufan
- * @LastEditTime: 2021-05-28 15:31:06
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-02 16:35:20
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -17,6 +17,7 @@ import IdentificationModal from "./IdentificationModal";
 import ChangePhoneModal from "./ChangePhoneModal";
 import BaseService from "@/domains/basic-domain/baseService";
 import StoreService from "@/domains/store-domain/storeService";
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import User from "@/common/js/user";
 import "./index.less";
 import { XMContext } from "@/store/context";
@@ -35,7 +36,7 @@ function PersonalInfoPage() {
   const [roleCodes, setRoleCodes] = useState([]);
   const [phone, setPhone] = useState("");
   const [weChatAccount, setWeChatAccount] = useState("");
-
+  const [departmentList,setDepartmentList] = useState([]);
   const storeUserId = User.getStoreUserId();
   const ctx: any = useContext(XMContext);
   const userId = User.getUserId();
@@ -51,11 +52,12 @@ function PersonalInfoPage() {
       storeUserId: User.getStoreUserId(),
     };
     BaseService.getStoreUser(param).then((res) => {
-      const { nickName, phone, roleCodes, weChatAccount } = res.result;
+      const { nickName, phone, roleCodes, weChatAccount,depNameList=[]} = res.result;
       setNickName(nickName);
       setPhone(phone);
       setRoleCodes(roleCodes);
       setWeChatAccount(weChatAccount);
+      setDepartmentList(depNameList)
       if (res.result.avatar) {
         setAvatar(res.result.avatar);
       }
@@ -122,7 +124,6 @@ function PersonalInfoPage() {
     setPhone(phone);
   }
 
-console.log('User.getStoreType()',User.getStoreType());
   return (
     <div className="page personal-info-page">
         <div className="content-header">个人设置</div>
@@ -130,18 +131,7 @@ console.log('User.getStoreType()',User.getStoreType());
           <Form>
             <div className="avatat-item">
               <span className="label">头像：</span>
-              <input
-                type="file"
-                accept="image/*"
-                value={""}
-                id="CrpperAvatarPic"
-                style={{ display: "none" }}
-                onChange={_handleUpdateAvatar}
-              />
               <img className="avatar" src={avatar}></img>
-              <span className="avatar-cover" onClick={_onUpload}>
-                <span className="icon iconfont pen">&#xe82c;</span>
-              </span>
               {cropperModalVisible && (
                 <CropperModal
                   imgUrl={imgUrl}
@@ -162,9 +152,13 @@ console.log('User.getStoreType()',User.getStoreType());
                 }}
               />
             </div>
+            <div className="phone-item">
+                <span className="label">企业微信姓名：</span>
+                <span><WWOpenDataCom type="userName" openid={weChatAccount}/></span>
+            </div>
             {isWorkWechat ? (
               <div className="phone-item">
-                <span className="label">企业微信号：</span>
+                <span className="label">企业微信帐号：</span>
                 <span>{weChatAccount}</span>
               </div>
             ) : (
@@ -181,6 +175,12 @@ console.log('User.getStoreType()',User.getStoreType());
                 </Button>
               </div>
             )}
+            <div>
+                <span className="label">所在部门：</span>
+                {departmentList.map((item,index)=>{
+                  return  <span>{item}{index<departmentList.length-1?'、':''}</span>
+                })}
+            </div>
             <div className="save-btn">
               <Button
                 type="primary"

src/modules/root/CollegeManagePage.jsx

@@ -222,9 +222,10 @@ export default class CollegeManagePage extends React.Component {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      User.clearUserInfo();
-      const htmlUrl = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
-      window.location.href = htmlUrl;
+      window.RCHistory.replace('/login');
+      // User.clearUserInfo();
+      // const htmlUrl = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      // window.location.href = htmlUrl;
     });
   }
 

src/modules/root/ErrorCollege.jsx

@@ -71,9 +71,10 @@ export default class ErrorCollege extends React.Component {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      User.clearUserInfo();
-      const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
-      window.location.href = url;
+      window.RCHistory.replace('/login');
+      // User.clearUserInfo();
+      // const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      // window.location.href = url;
 
     });
   }

src/modules/root/Header.jsx

@@ -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-08-02 16:40:31
  * @Description:
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -19,6 +19,7 @@ import CourseService from '@/domains/course-domain/CourseService';
 import qrcode from '@/libs/qrcode/qrcode.js';
 import Bus from '@/core/tbus';
 import ClickOutside from '../../components/ClickOutside';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import _ from 'underscore';
 
 const baseImg = 'https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png';
@@ -133,7 +134,9 @@ function Header(props) {
         <div className='user-detail'>
           <div className='box'>
             <Tooltip title={nickName}>
-              <div className='name'>{nickName}</div>
+              <div className='name'>
+                <WWOpenDataCom type="userName" openid={nickName}/>
+              </div>
             </Tooltip>
             <span className='phone'>{phone}</span>
           </div>
@@ -200,9 +203,10 @@ function Header(props) {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      User.clearUserInfo();
-      const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId() || User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
-      window.location.href = url;
+      window.RCHistory.replace('/login');
+      // User.clearUserInfo();
+      // const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId() || User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      // window.location.href = url;
     });
   }