civilized_city
/
miniapp
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

Yansen 9 months ago
parent
894461851d 45fb277255
commit
1d8518cdf8
5 changed files with 11 additions and 6 deletions
Unified View Show Diff Stats
  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 View File

12 
 export default (props) => {
 12 
 export default (props) => {
13 
   const { className, style, roles, tabBar = false, loading } = props;
 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 
   const containerClass = `${laySty["page-conatiner"]} ${
 17 
   const containerClass = `${laySty["page-conatiner"]} ${
18 
     tabBar ? laySty["with-tabbar"] : ""
 18 
     tabBar ? laySty["with-tabbar"] : ""
32 
           console.log("---当前人员--报错了--");
 32 
           console.log("---当前人员--报错了--");
33 
           console.error(err);
 33 
           console.error(err);
34 
           if (!isLoginPage) {
 34 
           if (!isLoginPage) {
35 
-            Taro.switchTab({
35 
+            Taro.reLaunch({
36 
               url: "/pages/login/index",
 36 
               url: "/pages/login/index",
37 
             });
 37 
             });
38 
           }
 38 
           }

+ 6
- 0
src/pages/home/index.jsx View File

54 
           request: () => getEdnApply(duty),
 54 
           request: () => getEdnApply(duty),
55 
           link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}`,
 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 View File

22 
 export default (props) => {
 22 
 export default (props) => {
23 
   const router = Taro.useRouter();
 23 
   const router = Taro.useRouter();
24 
   const { title, bizStatus = "", mine = "" } = router.params;
 24 
   const { title, bizStatus = "", mine = "" } = router.params;
25 
+  console.log(router)
25 
   const [issueId, setIssueId] = useState("");
 26 
   const [issueId, setIssueId] = useState("");
26 
   React.useMemo(() => {
 27 
   React.useMemo(() => {
27 
     if (title) {
 28 
     if (title) {

+ 2
- 2
src/pages/login/index.jsx View File

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

+ 0
- 2
src/store/user.js View File

150 
     changePwd,
 150 
     changePwd,
151 
     setPerson,
 151 
     setPerson,
152 
     signup: maSignup,
 152 
     signup: maSignup,
153 
-    setUser,
154 
-    initDuty,
155 
   };
 153 
   };
156 
 }
 154 
 }