11

config/prod.js

@@ -3,6 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    // HOST: '"http://192.168.89.25:9087"',
     HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02

src/app.config.js

@@ -28,7 +28,6 @@ export default defineAppConfig({
     "pages/feedback/issuelist/index",
     "pages/user/list/index",
     "pages/user/add/index",
-    // "pages/reportList/index",
   ],
   subpackages: [
     {

src/app.js

@@ -7,6 +7,7 @@ const App = (props) => {
   Taro.useLaunch(() => {
     Taro.login({
       success: (res) => {
+        console.log(res)
         store.getState('user').login(res.code);
       }
     });

src/layouts/TabBar.jsx

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

src/pages/feedback/issue/index.jsx

@@ -1,18 +1,22 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import Page from '@/layouts/index';
-import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import Map from '@/components/map';
-import Uploader from '@/components/Uploader/index';
-import mapIcon from '@/assets/icons/marker.png';
-import { warn } from '@/utils/message';
-import { postTaFeedback } from '@/services/tafeedback';
-import { geocoder } from '@/utils/map';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import Page from "@/layouts/index";
+import { Button, Notify, Field, Cell, CellGroup } from "@antmjs/vantui";
+import Map from "@/components/map";
+import Uploader from "@/components/Uploader/index";
+import mapIcon from "@/assets/icons/marker.png";
+import { warn } from "@/utils/message";
+import { postTaFeedback } from "@/services/tafeedback";
+import { geocoder } from "@/utils/map";
+// import { authPhone } from "@/services/wxma";
+// import { useModel } from "@/store";
 
 export default (props) => {
+  // const { setPerson, person } = useModel("user");
+  // console.log(person);
   const readOnly = false;
-
+  // const [phone, setPhone] = React.useState();
   const [loading, setLoading] = React.useState(false);
   const fmRef = React.useRef({
     typeId: undefined,
@@ -34,47 +38,64 @@ export default (props) => {
 
     fmRef.current = data;
     setFormData(data);
-  }
+  };
 
   const onSubmit = () => {
-    console.log(formData)
     try {
-      warn(!formData.addr, '请填写地址')
-      warn(!formData.content, '请填写问题描述')
-      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+      warn(!formData.addr, "请填写地址");
+      warn(!formData.content, "请填写问题描述");
+      warn(
+        !formData.attachList || formData.attachList.length < 1,
+        "请上传照片"
+      );
     } catch (e) {
       return;
     }
 
-    setLoading(true)
-    postTaFeedback(formData).then(() => {
-      setLoading(false);
-      Taro.navigateBack({
-        delta: 1,
-        fail: () => {
-          Taro.reLaunch({
-            url: '/pages/home/index'
-          })
-        } 
+    setLoading(true);
+    postTaFeedback(formData)
+      .then(() => {
+        setLoading(false);
+        Taro.navigateBack({
+          delta: 1,
+          fail: () => {
+            Taro.reLaunch({
+              url: "/pages/home/index",
+            });
+          },
+        });
+      })
+      .catch(() => {
+        setLoading(false);
       });
-    }).catch(() => {
-      setLoading(false);
-    })
+  };
 
-  }
-    
   const onLocationChange = (loc) => {
-    setFieldChange('location', loc);
+    setFieldChange("location", loc);
 
     if (loc) {
       // 交换经纬度位置
-      const [x, y] = loc.split(',');
-      const location = [y, x].join(',');
-      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+      const [x, y] = loc.split(",");
+      const location = [y, x].join(",");
+      geocoder(location)
+        .then((e) =>
+          setFieldChange(
+            "addr",
+            e?.address_component?.street_number || e?.address
+          )
+        )
+        .catch(console.error);
     }
-  }
-
-
+  };
+
+  const onGetPhoneNumber = (e) => {
+    // const code = e?.detail?.code;
+    // authPhone(code).then((res) => {
+    //   setPerson(res.person)
+    //   // Taro.setStorage({ key: "phone", data: res.person.phone });
+    // });
+    // onSubmit();
+  };
   return (
     <Page tabBar="feedback">
       <Map
@@ -89,25 +110,24 @@ export default (props) => {
           value={formData.addr}
           leftIcon={mapIcon}
           readonly={readOnly}
-          onChange={e => setFieldChange('addr', e.detail)}
+          onChange={(e) => setFieldChange("addr", e.detail)}
         />
       </CellGroup>
 
-      <CellGroup style={{ marginTop: '20px' }}>
-
+      <CellGroup style={{ marginTop: "20px" }}>
         <Cell title="问题描述" size="large" border={false} />
 
         <Field
           type="textarea"
           placeholder="请输入问题描述"
           readonly={readOnly}
-          autosize={{ minHeight: '120px' }}
+          autosize={{ minHeight: "120px" }}
           value={formData.content}
-          onChange={e => setFieldChange('content', e.detail)}
+          onChange={(e) => setFieldChange("content", e.detail)}
         />
       </CellGroup>
 
-      <CellGroup style={{ marginTop: '20px' }}>
+      <CellGroup style={{ marginTop: "20px" }}>
         <Cell title="拍照" size="large" border={false} />
 
         <Cell
@@ -115,15 +135,34 @@ export default (props) => {
             <Uploader
               value={formData.attachList}
               disabled={readOnly}
-              onChange={e => setFieldChange('attachList', e)}
+              onChange={(e) => setFieldChange("attachList", e)}
             />
           }
         />
       </CellGroup>
 
-      <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
-        <Button block type="primary" onClick={onSubmit}>提交</Button>
+      <View style={{ padding: "var(--main-space)", background: "#fff" }}>
+        {
+      //   person?.phone ?
+        
+      //  : (
+      //     <Button
+      //       block
+      //       type="primary"
+      //       openType="getPhoneNumber"
+      //       onGetPhoneNumber={onGetPhoneNumber}
+      //       // onClick={onSubmit}
+      //     >
+      //       提交
+      //     </Button>
+      //   )
+        (
+          <Button block type="primary" onClick={onSubmit}>
+            提交
+          </Button>
+        )
+        }
       </View>
     </Page>
-  )
-}
+  );
+};

src/pages/feedback/issuelist/index.jsx

@@ -27,6 +27,7 @@ export default (props) => {
   }, [title]);
 
   const onClick = (item) => {
+    console.log(item)
     Taro.navigateTo({
       url: `/pages/issue/edit/index?id=${item.issueId}`
     })

src/pages/home/components/Head.jsx

@@ -32,6 +32,7 @@ export default (props) => {
   }
 
   const onSelect = (e) => {
+    console.log(e)
     updateDuty(e.detail.value)
   }
 

src/pages/home/index.jsx

@@ -4,7 +4,7 @@ import Page from '@/layouts/index';
 import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
 import { ROLE_CITIZEN, ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
-import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_APPLY_VERIFY, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
+import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_APPLY_VERIFY, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START ,APPLY_REJECT} from '@/utils/biz';
 import { getApplyNum } from '@/services/taissueapply';
 import Head from './components/Head';
 import Banner from './components/Banner';
@@ -44,7 +44,8 @@ const menus = {
     { icon: 'icon3', text: '已 办 结', link: `/pages/org/issue/list/index?title=已办结&bizStatus=${PROCESS_END}` },
     { icon: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已逾期&bizStatus=expired' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index'},
-    // { icon: 'icon10', text: '我的上报', link: '/pages/reportList/index?title=我的上报'},
+    { icon: 'icon10', text: '我的上报', link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`},
+
   ],
 
   // 责任交办单位管理员
@@ -70,7 +71,7 @@ const menus = {
   [ROLE_CITIZEN]: [
     { icon: 'icon1', text: '未处理', link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}` },
     { icon: 'icon2', text: '已处理', link: `/pages/feedback/issuelist/index?title=已处理&bizStatus=${PROCESS_ASSIGNED}` },
-    { icon: 'icon12', text: '已打回', link: `/pages/feedback/issuelist/index?title=已打回&bizStatus=reject` },
+    { icon: 'icon12', text: '已打回', link: `/pages/feedback/issuelist/index?title=已打回&bizStatus=${APPLY_REJECT}` },
   ],
 }
 

src/pages/issue/edit/index.jsx

@@ -1,26 +1,31 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { CellGroup, Cell } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import { useModel } from '@/store';
-import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN, ROLE_QUERY_PERSON } from '@/utils/user';
-import { getTaIssueById } from '@/services/taissue';
-import { getSysOrgById } from '@/services/sysorg';
-import IssueForm from '../components/Issue';
-import Save from './components/Save';
-import Edit from './components/Edit';
-import Assigned from './components/Assigned';
-import Cancel from './components/Cancel';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { CellGroup, Cell } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import { useModel } from "@/store";
+import {
+  ROLE_INSPECTOR,
+  ROLE_MANAGER,
+  ROLE_CITIZEN,
+  ROLE_QUERY_PERSON,
+  ROLE_ORG_USER,
+} from "@/utils/user";
+import { getTaIssueById } from "@/services/taissue";
+import { getSysOrgById } from "@/services/sysorg";
+import IssueForm from "../components/Issue";
+import Save from "./components/Save";
+import Edit from "./components/Edit";
+import Assigned from "./components/Assigned";
+import Cancel from "./components/Cancel";
 // eslint-disable-next-line import/first
-import { PROCESS_END, PROCESS_START } from '@/utils/biz';
+import { PROCESS_END, PROCESS_START } from "@/utils/biz";
 
 export default (props) => {
-
   const router = Taro.useRouter();
   const { id } = router.params;
 
-  const { user, duty } = useModel('user');
+  const { user, duty } = useModel("user");
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -28,65 +33,53 @@ export default (props) => {
   React.useMemo(() => {
     if (id) {
       Taro.setNavigationBarTitle({
-        title: '问题单详情'
-      })
+        title: "问题单详情",
+      });
     } else {
       Taro.setNavigationBarTitle({
-        title: '我要上报'
-      })
+        title: "我要上报",
+      });
     }
   }, [id]);
 
   // 各按钮状态
-  const [
-    readOnly,
-    showOrg,
-    canEdit,
-    canAssigned,
-    canCancel,
-  ] = React.useMemo(() => {
-    // 如果是督查员
-    if (duty == ROLE_INSPECTOR) {
-      return [
-        issue && issue.processNode != PROCESS_START,
-        issue?.processNode && issue?.processNode != PROCESS_START, // true,
-        issue && issue.processNode == PROCESS_START,
-        false,
-        false,
-      ]
-    }
+  const [readOnly, showOrg, canEdit, canAssigned, canCancel] =
+    React.useMemo(() => {
+      // 如果是督查员
+      if (duty == ROLE_INSPECTOR) {
+        return [
+          issue && issue.processNode != PROCESS_START,
+          issue?.processNode && issue?.processNode != PROCESS_START, // true,
+          issue && issue.processNode == PROCESS_START,
+          false,
+          false,
+        ];
+      }
 
-    // 如果是管理员
-    if (duty == ROLE_MANAGER) {
-      return [
-        issue && issue.processNode != PROCESS_START,
-        true,
-        false,
-        issue && issue.processNode == PROCESS_START,
-        issue && issue.processNode == PROCESS_START,
-      ]
-    }
+      // 如果是管理员
+      if (duty == ROLE_MANAGER) {
+        return [
+          issue && issue.processNode != PROCESS_START,
+          true,
+          false,
+          issue && issue.processNode == PROCESS_START,
+          issue && issue.processNode == PROCESS_START,
+        ];
+      }
 
-    // 如果是查询员
-    if (duty == ROLE_QUERY_PERSON) {
-      return [
-        true,
-        true,
-        false,
-        false,
-        false,
-      ]
-    }
+      // 如果是查询员
+      if (duty == ROLE_QUERY_PERSON) {
+        return [true, true, false, false, false];
+      }
 
-    // 其他人员
-    return [
-      true,
-      false,
-      false,
-      false,
-      false,
-    ]
-  }, [issue, duty]);
+      // 如果是交办单位人员
+      if (duty == ROLE_ORG_USER) {
+        return [true, true, false, false, false];
+      }
+
+      // 其他人员
+      return [true, false, false, false, false];
+    }, [issue, duty]);
 
   // const onIssueChange = (val = {}) => {
   //   setIssue({
@@ -97,29 +90,42 @@ export default (props) => {
 
   React.useEffect(() => {
     if (id) {
-      setLoading(true)
-      getTaIssueById(id).then(res => {
-        setLoading(false);
-        if (res.orgId) {
-          getSysOrgById(res.orgId).then(r => {
-            setIssue({
-              ...res,
-              orgName: r?.name
-            });
-          }).catch(() => {
+      setLoading(true);
+      getTaIssueById(id)
+        .then((res) => {
+          setLoading(false);
+          if (res.orgId) {
+            getSysOrgById(res.orgId)
+              .then((r) => {
+                setIssue({
+                  ...res,
+                  orgName: r?.name,
+                });
+              })
+              .catch(() => {
+                setIssue(res);
+              });
+          } else {
             setIssue(res);
-          })
-        } else {
-          setIssue(res);
-        }
-      }).catch(() => {
-        setLoading(false);
-      });
+          }
+        })
+        .catch(() => {
+          setLoading(false);
+        });
     }
   }, [id]);
 
   return (
-    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN, ROLE_QUERY_PERSON]} loading={loading}>
+    <Page
+      roles={[
+        ROLE_INSPECTOR,
+        ROLE_MANAGER,
+        ROLE_CITIZEN,
+        ROLE_ORG_USER,
+        ROLE_QUERY_PERSON,
+      ]}
+      loading={loading}
+    >
       <IssueForm
         issueId={id}
         issue={issue}
@@ -127,7 +133,7 @@ export default (props) => {
         showOrg={showOrg}
         showExpireDate={showOrg}
         renderAction={(formData) => (
-          <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
+          <View style={{ padding: "var(--main-space)", background: "#fff" }}>
             {!id && <Save formData={formData} />}
             {canEdit && <Edit issue={issue} formData={formData} />}
             {canAssigned && <Assigned issue={issue} formData={formData} />}
@@ -136,5 +142,5 @@ export default (props) => {
         )}
       />
     </Page>
-  )
-}
+  );
+};

src/pages/login/components/Bottom.jsx

@@ -9,6 +9,7 @@ export default (props) => {
   const { signinByPhone } = useModel('user');
 
   const onGetPhoneNumber = (e) => {
+    console.log(e)
     const code = e.detail.code;
     signinByPhone(code).then(props.onSuccess);
   }

src/pages/reportList/index.jsx

@@ -1,12 +0,0 @@
-// import React from "react";
-// import Taro from "@tarojs/taro";
-// import Page from "@/layouts/index";
-// import PowerList from "@/components/PowerList";
-
-// export default (props) => {
-//   return (
-//     <Page>
-//       <PowerList request={}/>
-//     </Page>
-//   )
-// };

src/store/user.js

@@ -1,9 +1,15 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import md5 from 'md5';
-import { login, signin, currentUser, authPhone, authUser } from '@/services/wxma';
-import { changePassword } from '@/services/sysuser';
-import { ROLE_CITIZEN } from '@/utils/user';
+import React from "react";
+import Taro from "@tarojs/taro";
+import md5 from "md5";
+import {
+  login,
+  signin,
+  currentUser,
+  authPhone,
+  authUser,
+} from "@/services/wxma";
+import { changePassword } from "@/services/sysuser";
+import { ROLE_CITIZEN } from "@/utils/user";
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -11,20 +17,23 @@ export default function useUser() {
   const [duty, setDuty] = React.useState();
 
   const maLogin = (code) => {
-    login(code).then(res => {
+    console.log(code);
+    login(code).then((res) => {
       setPerson(res.person);
-      Taro.setStorage({ key: 'personId', data: res.person.personId })
-      Taro.setStorage({ key: 'sessionKey', data: res.sessionKey })
+      Taro.setStorage({ key: "personId", data: res.person.personId });
+      Taro.setStorage({ key: "sessionKey", data: res.sessionKey });
     });
-  }
+  };
 
   const updateDuty = (d = ROLE_CITIZEN) => {
     setDuty(d);
-    Taro.setStorageSync('duty', d);
-  }
+    Taro.setStorageSync("duty", d);
+  };
 
   const initDuty = (u) => {
-    const d = Taro.getStorageSync('duty');
+    console.log(u)
+    const d = Taro.getStorageSync("duty");
+    console.log(d)
     const dutyList = u?.dutyList || [];
     if (d) {
       if (dutyList.indexOf(d) < 0) {
@@ -35,55 +44,55 @@ export default function useUser() {
     } else {
       updateDuty(dutyList[0]);
     }
-  }
+  };
 
   const maSignIn = (params) => {
     const data = {
       ...params,
-      password: md5(params.password)
+      password: md5(params.password),
     };
 
-    return signin(data).then(res => {
+    return signin(data).then((res) => {
       setUser(res.user);
       initDuty(res.user);
-    })
-  }
+    });
+  };
 
   const current = () => {
-    currentUser().then(res => {
+    currentUser().then((res) => {
       setUser(res.user);
       initDuty(res.user);
-    })
-  }
+    });
+  };
 
   const signinByPhone = (code) => {
-    return authPhone(code).then(res => {
+    return authPhone(code).then((res) => {
       setUser(res.user);
       initDuty(res.user);
       setPerson(res.person);
-    })
-  }
+    });
+  };
 
   const authProfile = (data) => {
-    const sessionKey = Taro.getStorageSync('sessionKey');
-    authUser({ ...data, sessionKey }).then(res => {
+    const sessionKey = Taro.getStorageSync("sessionKey");
+    authUser({ ...data, sessionKey }).then((res) => {
       setPerson(res);
-    })
-  }
+    });
+  };
 
   const signOut = () => {
     setUser(null);
     initDuty([]);
-  }
+  };
 
   const changePwd = (params) => {
     const data = {
       originPassword: md5(params.originPassword),
       newPassword: md5(params.newPassword),
-    }
+    };
 
     changePassword(data);
-  }
+  };
 
   return {
     user,
@@ -97,5 +106,6 @@ export default function useUser() {
     authProfile,
     signOut,
     changePwd,
-  }
+    // setPerson,
+  };
 }