F

src/layouts/TabBar.jsx

@@ -83,7 +83,8 @@ export default (props) => {
 
     // 责任单位用户
     if (duty == ROLE_ORG_USER || duty == ROLE_ORG_MANAGER) {
-      return [home, notice,feedback, mine];
+      return [home, notice, mine];
+      // return [home, notice,feedback, mine];
     }
 
     if (duty == ROLE_CITIZEN) {

src/layouts/index.jsx

@@ -12,28 +12,34 @@ 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 } = useModel("user");
 
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
+
+  const currentPage = Taro.getCurrentPages().slice().pop();
+  const isLoginPage = currentPage.route.includes("pages/login/index");
+
   React.useEffect(() => {
-    const currentPage = Taro.getCurrentPages().slice().pop();
+    //  currentPage = Taro.getCurrentPages().slice().pop();
 
     if (!user) {
       try {
-        current().then((res) => {
-          console.log('---当前人员----', res);
-        }).catch((err) => {
-          console.log('---当前人员--报错了--');
-          console.error(err);
-  
-          if (!currentPage.route.includes("pages/login/index")) {
-            Taro.navigateTo({
-              url: "/pages/login/index",
-            });
-          }
-        });
+        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);
       }
@@ -48,8 +54,7 @@ export default (props) => {
     //     return;
     //   }
     // }
-  }, [current, user]);
-
+  }, [current, user, isLoginPage]);
 
   // React.useEffect(() => {
   //   console.log("personRef******************");
@@ -80,12 +85,12 @@ export default (props) => {
   });
 
   useEffect(() => {
-      // 获取当前编码后的标题
-      var encodedTitle = document.title;
-      // 解码标题
-      var decodedTitle = decodeURIComponent(encodedTitle);
-      // 设置解码后的标题
-      document.title = decodedTitle;
+    // 获取当前编码后的标题
+    var encodedTitle = document.title;
+    // 解码标题
+    var decodedTitle = decodeURIComponent(encodedTitle);
+    // 设置解码后的标题
+    document.title = decodedTitle;
   }, []);
 
   return (
@@ -101,8 +106,12 @@ export default (props) => {
             </Loading>
           </View>
         )} */}
+        {/* {!isLoginPage ? (
+          <Auth roles={roles}>{props.children}</Auth>
+        ) : (
+          props.children
+        )} */}
         <Auth roles={roles}>{props.children}</Auth>
-
         {!tabBar && <View className={laySty["pdm-space"]}></View>}
       </View>
       {tabBar && (

src/pages/home/index.jsx

@@ -127,11 +127,11 @@ export default (props) => {
           link: "/pages/org/issue/list/index?title=已逾期&bizStatus=expired",
         },
         { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
-        {
-          icon: "icon10",
-          text: "我的上报",
-          link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`,
-        },
+        // {
+        //   icon: "icon10",
+        //   text: "我的上报",
+        //   link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`,
+        // },
         {
           icon: "icon12",
           text: "交办历史",

src/pages/org/components/issue-info/index.jsx

@@ -1,13 +1,20 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
-import Uploader from '@/components/Uploader/index';
-import Map from '@/components/map';
-import { getDtStr } from '@/utils/date';
+import React, { useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Cell, CellGroup, Field, Button } from "@antmjs/vantui";
+import Uploader from "@/components/Uploader/index";
+import Map from "@/components/map";
+import { getDtStr } from "@/utils/date";
+import { APPLY_READY, getIssueStatus } from "@/utils/biz";
 
 export default (props) => {
   const { issue } = props;
+  const [bizStatus, setBizStatus] = React.useState({});
+  useEffect(()=>{
+    const data=getIssueStatus(issue)
+    setBizStatus(data);
+
+  },[issue])
   return (
     <>
       <Map location={issue?.location} readOnly />
@@ -17,25 +24,19 @@ export default (props) => {
         <Cell title="办结时间" value={issue?.expireDate} />
         <Cell title="交办次数" value={issue?.processNum || 1} />
       </CellGroup>
-      <CellGroup style={{marginTop: '20px'}}>
+      <CellGroup style={{ marginTop: "20px" }}>
         <Cell title="抽检位置" value={issue?.locName} />
         <Cell title="定 位 点" value={issue?.addr} />
-        <Cell title="问题详情" />        
+        <Cell title="问题详情" />
         <Field
           readonly
           type="textarea"
-          autosize={{ minHeight: '120px' }}
+          autosize={{ minHeight: "120px" }}
           value={issue?.content}
-        /> 
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled
-              value={issue?.attachList}
-            />
-          }
         />
+        <Cell renderTitle={<Uploader disabled value={issue?.attachList} />} />
+        <Cell title="状态" value={bizStatus?.label}></Cell>
       </CellGroup>
     </>
-  )
-}
+  );
+};

src/pages/org/issue/detail/index.jsx

@@ -111,13 +111,13 @@ export default (props) => {
                   <Apply block type="primary" applyType={PROCESS_APPLY_END} orgIssue={orgIssue}>申请办结</Apply>
               }
             </View>
-            {
+            {/* {
               showApplyVerify && (
                 <View style={{marginTop: '20px'}}>
                   <Apply block type="primary" applyType={PROCESS_APPLY_VERIFY} orgIssue={orgIssue}>申请审核</Apply>
                 </View>
               )
-            }
+            } */}
             <View style={{marginTop: '20px', display: 'flex' }}>
               <Apply
                 block

src/pages/org/issue/detail2/components/Order.jsx

@@ -34,33 +34,36 @@ export default (props) => {
       return 0;
     });
     return sortedSteps.map((it, index, array) => {
-      const { value: bizStatus = 0, label: statusText } = getIssueStatus({
-        ...(it || {}),
-        expireDate: it?.createDate,
-        processNode: it?.processNode || it?.applyType,
-        processStatus: it?.processStatus || it?.verifyStatus || APPLY_READY,
-      });
-      const [bg1, bg2] = colors[bizStatus];
+      // const { value: bizStatus = 0, label: statusText } = getIssueStatus({
+      //   ...(it || {}),
+      //   expireDate: it?.createDate,
+      //   processNode: it?.processNode || it?.applyType,
+      //   processStatus: it?.processStatus || it?.verifyStatus || APPLY_READY,
+      // });
+      // const [bg1, bg2] = colors[bizStatus];
 
       let nextOrgName = null;
       if (index == 0) {
-        nextOrgName = "平台管理员";
+        nextOrgName = "平台";
       } else if (index <= array.length - 1) {
         nextOrgName = array[index - 1].orgName;
       }
       return (
         <View key={it.orgIssueId} className={styles["page_order"]}>
           <Cell
-            value={dayjs(it.createDate).format("YYYY-MM-DD HH:mm:ss")}
-            renderTitle={
-              <View>
-                
-
-                <View className="title">
-                  {nextOrgName} {"---->"} {it.orgName}
-                  <Tag plain={true} style={{ color: bg2 }}>{statusText}</Tag>
+            title={
+              <>
+                <View>{nextOrgName}</View>
+                <View>
+                  {dayjs(it.createDate).format("YYYY-MM-DD HH:mm:ss")}
                 </View>
-              </View>
+              </>
+            }
+            renderRightIcon={
+              <>
+                <View>{it.orgName}</View>
+                <View>&ensp;&ensp;</View>
+              </>
             }
           />
           {/* <View className={styles["org_order"]}>

src/pages/org/issue/detail2/index.jsx

@@ -76,7 +76,6 @@ export default (props) => {
   return (
     <Page loading={loading}>
       <IssueInfo issue={issue} />
-
     <Order id={id}/>
 
       {/* <CellGroup style={{marginTop: '20px'}}>

src/store/user.js

@@ -31,35 +31,23 @@ export default function useUser() {
   };
 
   const updateDuty = (d = ROLE_CITIZEN) => {
-    try {
-      setDuty(d);
-      Taro.setStorageSync("duty", d);
-    } catch (e) {
-      console.log(e);
-    }
+    setDuty(d);
+    Taro.setStorageSync("duty", d);
   };
 
   const initDuty = (u) => {
     console.log(u);
-    let d;
-    try {
-      d = Taro.getStorageSync("duty");
-    } catch (error) {
-      console.error("读取存储中'duty'失败:", error);
-      // 根据业务需求考虑是否需要进行错误处理或通知用户
-    }
+    const d = Taro.getStorageSync("duty");
+    console.log(d);
     const dutyList = u?.dutyList || [];
-    const firstDuty = dutyList[0];
-
     if (d) {
       if (dutyList.indexOf(d) < 0) {
-        console.log(firstDuty);
-        updateDuty(firstDuty);
+        updateDuty(dutyList[0]);
       } else {
         updateDuty(d);
       }
     } else {
-      updateDuty(firstDuty);
+      updateDuty(dutyList[0]);
     }
   };
 
@@ -77,16 +65,14 @@ 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) => {
@@ -123,7 +109,7 @@ export default function useUser() {
   };
 
   const signOut = () => {
-    console.log(111111);
+    console.log(111111)
     setPerson(null);
     setUser(null);
     initDuty(null);
@@ -141,7 +127,8 @@ export default function useUser() {
 
     changePassword(data)
       .then((res) => {
-        signOut();
+        signOut()
+
       })
       .catch((e) => {
         console.error(e);

src/utils/biz.js

@@ -34,15 +34,15 @@ export const APPLY_REJECT = "reject";
 
 
 export function getIssueStatus (taIssue) {
+console.log(taIssue)
+  const isExpired = dayjs(taIssue?.expireDate).format('YYYY-MM-DD') < dayjs().format('YYYY-MM-DD');
 
-  const isExpired = dayjs(taIssue.expireDate).format('YYYY-MM-DD') < dayjs().format('YYYY-MM-DD');
-
-  if (taIssue.processStatus === APPLY_REJECT) {
+  if (taIssue?.processStatus === APPLY_REJECT) {
     return {
       value: 4,
       label: '已打回',
     };
-  } else if (taIssue.processNode === PROCESS_START) {
+  } else if (taIssue?.processNode === PROCESS_START) {
 
     if (isExpired) {
       return {
@@ -55,8 +55,8 @@ export function getIssueStatus (taIssue) {
       value: 0,
       label: '待交办',
     }
-  } else if (taIssue.processNode === PROCESS_END) {
-    if (dayjs(taIssue.expireDate).format('YYYY-MM-DD') < dayjs(taIssue.endDate).format('YYYY-MM-DD')) {
+  } else if (taIssue?.processNode === PROCESS_END) {
+    if (dayjs(taIssue?.expireDate).format('YYYY-MM-DD') < dayjs(taIssue?.endDate).format('YYYY-MM-DD')) {
       return {
         value: 5,
         label: '逾期办结',
@@ -67,24 +67,24 @@ export function getIssueStatus (taIssue) {
       value: 2,
       label: '已办结',
     };
-  } else if (taIssue.processNode.indexOf(PROCESS_ASSIGNED) === 0) {
-    if (taIssue.processStatus === APPLY_READY) {
-      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+  } else if (taIssue?.processNode.indexOf(PROCESS_ASSIGNED) === 0) {
+    if (taIssue?.processStatus === APPLY_READY) {
+      if (taIssue?.processNode === PROCESS_APPLY_REJECT) {
         return {
           value: 1,
           label: '驳回申请',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_DELAY) {
         return {
           value: 1,
           label: '延期申请',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_VERIFY) {
         return {
           value: 1,
           label: '审核申请',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
           label: '消单申请',
@@ -95,45 +95,45 @@ export function getIssueStatus (taIssue) {
         //   label: '待处理',
         // };
       }
-    } else if (taIssue.processStatus === APPLY_PASS) {
-      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+    } else if (taIssue?.processStatus === APPLY_PASS) {
+      if (taIssue?.processNode === PROCESS_APPLY_REJECT) {
         return {
           value: 1,
           label: '驳回申请通过',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_DELAY) {
         return {
           value: 1,
           label: '延期申请通过',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_VERIFY) {
         return {
           value: 1,
           label: '审核申请通过',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
           label: '消单申请通过',
         };
       }
     } else {
-      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+      if (taIssue?.processNode === PROCESS_APPLY_REJECT) {
         return {
           value: 1,
           label: '驳回申请驳回',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_DELAY) {
         return {
           value: 1,
           label: '延期申请驳回',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_VERIFY) {
         return {
           value: 1,
           label: '审核申请驳回',
         };
-      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+      } else if (taIssue?.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
           label: '消单申请驳回',