F

src/components/OrgTree/index.jsx

@@ -1,69 +1,89 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { Popup, Button, Cell, Icon } from '@antmjs/vantui';
-import { ScrollView, View } from '@tarojs/components';
-import { getSysOrg } from '@/services/sysorg';
-import VABC from '@/components/VABC';
-import Tree from '@/components/Tree';
-import { arr2Tree } from '@/utils/array';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { Popup, Button, Cell, Icon, Empty } from "@antmjs/vantui";
+import { ScrollView, View } from "@tarojs/components";
+import { getSysOrg } from "@/services/sysorg";
+import VABC from "@/components/VABC";
+import Tree from "@/components/Tree";
+import { arr2Tree } from "@/utils/array";
 
 const wrapperStyle = {
-  width: '90vw',
-  height: '100vh',
-  paddingBottom: 'env(safe-area-inset-bottom)',
-}
+  width: "90vw",
+  height: "100vh",
+  paddingBottom: "env(safe-area-inset-bottom)",
+};
 
 export default function OrgTree(props) {
   const { show, onCancel, onChange } = props;
 
   const [dict, setDict] = React.useState([]);
   const [checked, setChecked] = React.useState();
-  
+
   const onSubmit = () => {
     if (!checked) return;
-    onChange(checked?.orgId, checked)
-  }
+    onChange(checked?.orgId, checked);
+  };
 
   const onCheck = (e, it) => {
     // e.stopPropagation();
     // e.preventDefault();
     setChecked(it);
-  }
-  
+  };
+
   React.useEffect(() => {
-    getSysOrg({pageSize: 500, isResponsible: 1, parentId: props.parentId }).then(res => {
-      const [treeData] = arr2Tree(res.records || [], 'orgPId', 'orgId');
-      console.log('-------treeData-------', treeData)
+    getSysOrg({
+      pageSize: 500,
+      isResponsible: 1,
+      parentId: props.parentId,
+    }).then((res) => {
+      const [treeData] = arr2Tree(res.records || [], "orgPId", "orgId");
+      console.log("-------treeData-------", treeData);
       setDict(treeData);
-    })
+    });
   }, [props.parentId]);
 
   return (
-    <Popup position="right" show={show} onClose={onCancel} >
+    <Popup position="right" show={show} onClose={onCancel}>
       <VABC
-        footer={(
-          <View style={{ padding: '8px 2em' }}>
-            <Button block type="primary" disabled={!checked} onClick={onSubmit}>确定</Button>
+        footer={
+          <View style={{ padding: "8px 2em" }}>
+            <Button block type="primary" disabled={!checked} onClick={onSubmit}>
+              确定
+            </Button>
           </View>
-        )}
+        }
         style={wrapperStyle}
       >
-        <ScrollView scrollY style={{ height: '100%' }}>
-          <Tree
-            data={dict}
-            renderTitle={(it) => (
-              <Cell
-                title={it.name}
-                value={(
-                  <View>
-                    { checked?.orgId == it.orgId ? <Icon name="success" color="#1A7565" /> : <View style={{ width: '100%', minHeight: '10px' }} /> }
-                  </View>
-                )}
-                renderIcon={it.children?.length > 0 ? <Icon name="arrow" /> : <View style={{ minWidth: '16px' }} />}
-                onClick={e => onCheck(e, it)}
-              />
-            )}
-          />
+        <ScrollView scrollY style={{ height: "100%" }}>
+          {dict.length == 0 ? (
+            <Empty description="暂无数据" />
+          ) : (
+            <Tree
+              data={dict}
+              renderTitle={(it) => (
+                <Cell
+                  title={it.name}
+                  value={
+                    <View>
+                      {checked?.orgId == it.orgId ? (
+                        <Icon name="success" color="#1A7565" />
+                      ) : (
+                        <View style={{ width: "100%", minHeight: "10px" }} />
+                      )}
+                    </View>
+                  }
+                  renderIcon={
+                    it.children?.length > 0 ? (
+                      <Icon name="arrow" />
+                    ) : (
+                      <View style={{ minWidth: "16px" }} />
+                    )
+                  }
+                  onClick={(e) => onCheck(e, it)}
+                />
+              )}
+            />
+          )}
         </ScrollView>
       </VABC>
     </Popup>

src/layouts/index.jsx

@@ -12,7 +12,7 @@ import { useEffect } from "react";
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user, duty, current } = useModel("user");
+  const { person, user, duty, current, setUser, initDuty } = useModel("user");
 
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
@@ -22,26 +22,21 @@ export default (props) => {
 
   React.useEffect(() => {
     const isLoginPage = currentPage.route.includes("pages/login/index");
-
+console.log(isLoginPage)
     if (!user) {
-      try {
-        current()
-          .then((res) => {
-            console.log("---当前人员----", res);
-          })
-          .catch((err) => {
-            console.log("---当前人员--报错了--");
-            console.error(err);
-
-            if (!isLoginPage) {
-              Taro.navigateTo({
-                url: "/pages/login/index",
-              });
-            }
-          });
-      } catch (error) {
-        console.error(error);
-      }
+      current()
+        .then((res) => {
+          console.log("---当前人员----", res);
+        })
+        .catch((err) => {
+          console.log("---当前人员--报错了--");
+          console.error(err);
+          if (!isLoginPage) {
+            Taro.switchTab({
+              url: "/pages/login/index",
+            });
+          }
+        });
     }
 
     // if (!person || !user) {
@@ -105,7 +100,7 @@ export default (props) => {
             </Loading>
           </View>
         )} */}
-  
+
         <Auth roles={roles}>{props.children}</Auth>
         {!tabBar && <View className={laySty["pdm-space"]}></View>}
       </View>

src/pages/issue/components/Issue/index.jsx

@@ -4,8 +4,7 @@ import { Textarea, View } from "@tarojs/components";
 import { Field, Cell, CellGroup } from "@antmjs/vantui";
 import LocType from "@/components/LocType";
 import IssueType from "@/components/IssueType";
-// import OrgPicker from "@/components/OrgPicker";
-import OrgTree from "@/components/OrgTree";
+import OrgPicker from "@/components/OrgPicker";
 import DatePicker from "@/components/DatePicker";
 import Map from "@/components/map";
 import Uploader from "@/components/Uploader/index";
@@ -103,8 +102,8 @@ export default (props) => {
   };
 
   const setFieldChange = (field, value) => {
-    // console.log("field->>>>>>>>>>>>>>>>",field)
-    // console.log("value->>>>>>>>>>>>>>>>",value)
+    console.log("field->>>>>>>>>>>>>>>>",field)
+    console.log("value->>>>>>>>>>>>>>>>",value)
     const data = {
       ...fmRef.current,
       [field]: value,
@@ -167,7 +166,7 @@ export default (props) => {
         onChange={onIssueTypeChange}
       />
 
-      <OrgTree
+      <OrgPicker
         show={showOrgPicker}
         value={formData.orgName}
         onCancel={() => setShowOrgPicker(false)}

src/pages/issue/edit/components/Assigned.jsx

@@ -15,6 +15,7 @@ export default (props) => {
 
   // 交办
   const onAssigned = () => {
+    console.log(formData)
     try {
       warn(!formData.addr, '请填写地址')
       warn(!formData.locId, '请选择点位')

src/pages/login/components/Form1.jsx

@@ -106,8 +106,8 @@ export default (props) => {
           <Button
             block
             type="primary"
-            // formType="submit"
-            loading={loading}
+            formType="submit"
+            // loading={loading}
             disabled={loading}
             onClick={handleClick}
           >

src/store/user.js

@@ -11,7 +11,7 @@ import {
 } from "@/services/wxma";
 import { changePassword } from "@/services/sysuser";
 import { ROLE_CITIZEN } from "@/utils/user";
-import { setToken } from "@/utils/token";
+import { setToken ,clearToken} from "@/utils/token";
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -65,14 +65,16 @@ export default function useUser() {
 
   const maSignup = (data) => {
     return new Promise((resolve, reject) => {
-      signup(data).then(res => {
-        setPerson(res.person);
-        setUser(res.user);
-        initDuty(res.user);
-        resolve(res);
-      }).catch(reject);
+      signup(data)
+        .then((res) => {
+          setPerson(res.person);
+          setUser(res.user);
+          initDuty(res.user);
+          resolve(res);
+        })
+        .catch(reject);
     });
-  }
+  };
 
   const current = () => {
     return new Promise((resolve, reject) => {
@@ -109,11 +111,11 @@ export default function useUser() {
   };
 
   const signOut = () => {
-    console.log(111111)
+    console.log(111111);
     setPerson(null);
     setUser(null);
     initDuty(null);
-    setToken();
+    clearToken();
     Taro.navigateTo({
       url: "/pages/login/index",
     });
@@ -127,8 +129,7 @@ export default function useUser() {
 
     changePassword(data)
       .then((res) => {
-        signOut()
-
+        signOut();
       })
       .catch((e) => {
         console.error(e);
@@ -149,5 +150,7 @@ export default function useUser() {
     changePwd,
     setPerson,
     signup: maSignup,
+    setUser,
+    initDuty,
   };
 }

src/utils/message.js

@@ -7,6 +7,7 @@ export function warn(predicate, message) {
       message,
       type: 'warning',
     })
+    throw new Error(message)
     // //Weapp
     // throw new Error(message);
   }

src/utils/token.js

@@ -7,6 +7,9 @@ export const getToken = function () {
 export const setToken = function (data) {
   return Taro.setStorage({ key: "token", data });
 };
+export const clearToken = function (data) {
+  return Taro.clearStorage({ key: "token" });
+};
 
 export const TARO_ENV = process.env.TARO_ENV; //那个端的