civilized_city
/
miniapp
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Merge branch 'h5' of http://git.ycjcjy.com/civilized_city/miniapp into h5

Yansen 9 miesięcy temu
rodzic
894461851d 45fb277255
commit
1d8518cdf8
5 zmienionych plików z 11 dodań i 6 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2
    2
      src/layouts/index.jsx
  2. 6
    0
      src/pages/home/index.jsx
  3. 1
    0
      src/pages/issue/list2/index.jsx
  4. 2
    2
      src/pages/login/index.jsx
  5. 0
    2
      src/store/user.js

+ 2
- 2
src/layouts/index.jsx Wyświetl plik 

@@ -12,7 +12,7 @@ import { useEffect } from "react";
12 12 
 export default (props) => {
13 13 
   const { className, style, roles, tabBar = false, loading } = props;
14 14
15 
-  const { person, user, duty, current, setUser, initDuty } = useModel("user");
15 
+  const { person, user, duty, current} = useModel("user");
16 16
17 17 
   const containerClass = `${laySty["page-conatiner"]} ${
18 18 
     tabBar ? laySty["with-tabbar"] : ""
 
@@ -32,7 +32,7 @@ console.log(isLoginPage)
32 32 
           console.log("---当前人员--报错了--");
33 33 
           console.error(err);
34 34 
           if (!isLoginPage) {
35 
-            Taro.switchTab({
35 
+            Taro.reLaunch({
36 36 
               url: "/pages/login/index",
37 37 
             });
38 38 
           }

+ 6
- 0
src/pages/home/index.jsx Wyświetl plik 

@@ -54,6 +54,12 @@ export default (props) => {
54 54 
           request: () => getEdnApply(duty),
55 55 
           link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}`,
56 56 
         },
57 
+        {
58 
+          icon: "icon2",
59 
+          text: "已 交 办",
60 
+          link: `/pages/issue/list2/index?title=已交办&mine=true&bizStatus=${PROCESS_ASSIGNED}`,
61 
+        },
62 
+
57 63 
       ],
58 64
59 65 
       // 平台管理员

+ 1
- 0
src/pages/issue/list2/index.jsx Wyświetl plik 

@@ -22,6 +22,7 @@ const sid2 = Math.random().toString(36).substring(2, 8);
22 22 
 export default (props) => {
23 23 
   const router = Taro.useRouter();
24 24 
   const { title, bizStatus = "", mine = "" } = router.params;
25 
+  console.log(router)
25 26 
   const [issueId, setIssueId] = useState("");
26 27 
   React.useMemo(() => {
27 28 
     if (title) {

+ 2
- 2
src/pages/login/index.jsx Wyświetl plik 

@@ -20,13 +20,13 @@ export default (props) => {
20 20 
   }
21 21
22 22 
   return (
23 
-    <Page>
23 
+    <View>
24 24 
       <View className="login-box">
25 25 
         <Head />
26 26 
         <Form1 onSuccess={onSuccess} />
27 27 
         {/* H5此无功能 */}
28 28 
         {isApp && <Bottom onSuccess={onSuccess} />}
29 29 
       </View>
30 
-    </Page>
30 
+    </View>
31 31 
   )
32 32 
 }

+ 0
- 2
src/store/user.js Wyświetl plik 

@@ -150,7 +150,5 @@ export default function useUser() {
150 150 
     changePwd,
151 151 
     setPerson,
152 152 
     signup: maSignup,
153 
-    setUser,
154 
-    initDuty,
155 153 
   };
156 154 
 }