‘fix:通讯录优化1’

3ef3f08f · zhujian · 67055fc7 · 3ef3f08f · 3ef3f08f
Commit 3ef3f08f authored Jul 15, 2021 by zhujian
Show whitespace changes
Inline Side-by-side

Showing with 21 additions and 19 deletions

src/modules/college-manage/EmployeeManage.tsx
+7 -9

src/modules/root/App.tsx
+14 -10

No files found.
--- a/src/modules/college-manage/EmployeeManage.tsx
+++ b/src/modules/college-manage/EmployeeManage.tsx
@@ -108,12 +108,10 @@ function EmployeeManage() {
  useEffect(() => {
    getListInfo();
-    // initWechatConfig();
  }, [storeId]);
-  async function initWechatConfig() {
-    WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] })
-  }
  async function getListInfo() {
    await getStoreRole();
@@ -162,7 +160,7 @@ function EmployeeManage() {
              {/* <span className="title">{val}</span> */}
              <span className="title">
-              <WWOpenDataCom type="userName" openid={val}/>
+                <WWOpenDataCom type="userName" openid={val} />
              </span>
            </div>
          );
@@ -199,7 +197,7 @@ function EmployeeManage() {
              <span className="divider-line">{" | "}</span>
              <span
                className="delete"
-                onClick={() =>{
+                onClick={() => {
                  handleDeleteWorkWechatEmployeeConfirm(record)
                }}
              >
@@ -248,7 +246,7 @@ function EmployeeManage() {
            role: [],
            avatar: "",
            storeUserId: "",
-            weChatAccount:""
+            weChatAccount: ""
          });
        }}
        isWorkWechat={isWorkWechat}
@@ -279,7 +277,7 @@ function EmployeeManage() {
  function handleDeleteEmployee(storeUserId: string) {
    StoreService.deleteEmployee({ storeUserId }).then((res: any) => {
-      const msg = isWorkWechat ? "员工已删除":"讲师已删除";
+      const msg = isWorkWechat ? "员工已删除" : "讲师已删除";
      message.success(msg);
      getEmployeeList();
    });
@@ -386,7 +384,7 @@ function EmployeeManage() {
            </Button>
          }
        </div>
-          <LimitTip type="员工" total={realTotal} tip={()=>{return (<div>数据为当前学院的员工数，若员工存在多个学院，企业人数只统计为1人</div>)}}/>
+        <LimitTip type="员工" total={realTotal} tip={() => { return (<div>数据为当前学院的员工数，若员工存在多个学院，企业人数只统计为1人</div>) }} />
        <div className="box-body">
          <XMTable
            renderEmpty={{

--- a/src/modules/root/App.tsx
+++ b/src/modules/root/App.tsx
@@ -15,7 +15,7 @@ import zhCN from 'antd/es/locale/zh_CN'
 import User from '@/common/js/user';
 import BaseService from "@/domains/basic-domain/baseService";
 import moment from 'moment';
-import WechatApi from "@/core/wechatApi"
+import WechatApi from '@/common/js/wechatApi';
 import { VersionContext, VersionInfo, XMContext } from '@/store/context';
 import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList } from '@/store/actions/index';
 import Service from "@/common/js/service";
@@ -29,7 +29,7 @@ declare var window: any;
 const App: React.FC = (props: any) => {
  const [storeUserId, setStoreUserId] = useState('')
  const ctx: any = useContext(XMContext);
-  const [versionInfo, setVersionInfo] = useState<VersionInfo|null>(null)
+  const [versionInfo, setVersionInfo] = useState<VersionInfo | null>(null)
  const userId = User.getUserId();
  const [menuType, setMenuType] = useState(true);
  const enterpriseId = User.getEnterpriseId();
@@ -37,7 +37,7 @@ const App: React.FC = (props: any) => {
  useEffect(() => {
-    WechatApi.initShareConfig();
+    initWechatConfig();
    getStoreAndUserInfo();
    getVersion();
    if (window.location.hash === "#/") {
@@ -47,6 +47,10 @@ const App: React.FC = (props: any) => {
    }
  }, [])
+  async function initWechatConfig() {
+    WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] })
+  }
  useEffect(() => {
    getStorePermission();
  }, [window.location.hash])
@@ -68,7 +72,7 @@ const App: React.FC = (props: any) => {
      let version = res.result;
      User.setVersion(version);
      User.setExpirationTime(res.result.validEndTime)
-      let versioninfo:VersionInfo = {
+      let versioninfo: VersionInfo = {
        dayTime: version.dayTime,
        stateEnum: version.stateEnum,
        userNum: version.userNum === -1 ? '不限人数' : version.userNum,
@@ -89,28 +93,28 @@ const App: React.FC = (props: any) => {
  }
  function getStoreInfo() {
-    console.log("currentStoreUserInfo",window.currentStoreUserInfo);
+    console.log("currentStoreUserInfo", window.currentStoreUserInfo);
    const params = {
      storeId: User.getStoreId(),
      userId: User.getUserId(),
    };
    Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
-      if(res.success){
+      if (res.success) {
        const { id, storeUserId, storeName, userRole, storeType } = res.result;
        User.setStoreId(id);
        User.setStoreUserId(storeUserId);
        User.setStoreName(storeName);
-        Bus.trigger('storeNameChange',storeName);
+        Bus.trigger('storeNameChange', storeName);
        User.setUserRole(userRole);
        User.setStoreType(storeType);
-        setCurrentStoreUserInfo(id,storeUserId)
+        setCurrentStoreUserInfo(id, storeUserId)
        setStoreUserId(storeUserId);
        getUserPermission();
      }
    })
  }
-  function setCurrentStoreUserInfo(storeId:any,storeUserId:any){
+  function setCurrentStoreUserInfo(storeId: any, storeUserId: any) {
    window.currentStoreUserInfo.storeId = storeId;
    window.currentStoreUserInfo.storeUserId = storeUserId;
    window.currentStoreUserInfo.userId = User.getUserId();
@@ -136,7 +140,7 @@ const App: React.FC = (props: any) => {
      Bus.trigger('storeNameChange', storeName);
      User.setUserRole(userRole);
      User.setStoreType(storeType);
-      setCurrentStoreUserInfo(id,storeUserId);
+      setCurrentStoreUserInfo(id, storeUserId);
      ctx.dispatch(setStoreGroupList(storeGroupVOS))
      ctx.dispatch(setStoreList(storeVOS));
      setStoreUserId(storeUserId)