feats

src/components/map/index.jsx

@@ -5,28 +5,23 @@ import { getLocation } from '@/utils/authorize';
 import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
+// location 逻辑
+// 如果 props.location 有值, 那么放弃地图定位的点, 使用 props.location
+// 否则使用 地图定位的点
+// 如果地图定位失败 或者 props.location 为空, 那么不产生数据交互
+// 但是地图上默认使用 霍山县人民政府 的定位
 export default (props) => {
   const { location, onLocChange } = props;
 
   const [currentPos, setCurPos] = React.useState();
-  const [lngLat, setLngLat] = React.useState([,]);
+  const [
+    markers,
+    lngLat,
+  ] = React.useMemo(() => {
+    const loc = location || currentPos || '116.354259,31.415587';    
+    const [longitude, latitude] = loc.split(',');
 
-  const markers = React.useMemo(() => {
-    if (!location && !currentPos) return [];
-    
-    let longitude, latitude;
-    if (location) {
-      const [lng, lat] = location.split(',');
-      longitude = lng - 0;
-      latitude = lat - 0;
-    } else {
-      longitude = currentPos.longitude;
-      latitude = currentPos.latitude;
-    }
-
-    setLngLat([longitude, latitude]);
-
-    return [{
+    const mks = [{
       id: 1,
       longitude,
       latitude,
@@ -34,15 +29,16 @@ export default (props) => {
       width: 17,
       height: 20
     }];
+
+    return [
+      mks,
+      [longitude, latitude]
+    ]
   }, [location, currentPos]);
   
   React.useEffect(() => {
     getLocation().then((res) => {
-      setCurPos(res);
-
-      if (onLocChange) {
-        onLocChange([res.longitude, res.latitude].join(','));
-      }
+      setCurPos([res.longitude, res.latitude].join(','));
     }).catch((err) => {
       console.error(err);
       Taro.showToast({
@@ -51,6 +47,15 @@ export default (props) => {
       })
     });
   }, []);
+
+  React.useEffect(() => {
+    if (!location && !currentPos) return;
+
+    const loc = location || currentPos;
+    if (loc) {
+      onLocChange(loc);
+    }
+  }, [location, currentPos]);
   
   return (
     <View className={style['map-wrapper']}>

src/layouts/index.jsx

@@ -26,11 +26,6 @@ export default (props) => {
     }
   }, [person, user]);
 
-
-  Taro.useDidShow(() => {
-    console.log('--------useDidShow-----')
-  });
-
   return (
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />

src/pages/apply/detail/index.jsx

@@ -9,6 +9,11 @@ import { PROCESS_APPLY_DELAY } from '@/utils/biz';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 
+const getVerifyStatus = (st) => {
+  if (!st || st == 'ready') return '未审批';
+  return st == 'pass' ? '通过' : '驳回';
+}
+
 export default (props) => {
   const router = Taro.useRouter();
   const { id, applyType, issueId } = router.params;
@@ -55,7 +60,7 @@ export default (props) => {
       <CellGroup style={{marginTop: '20px'}}>
         <Cell
           title="审批结果"
-          value={applyInfo.verifyStatus == 'pass' ? '通过' : '驳回'}
+          value={getVerifyStatus(applyInfo.verifyStatus)}
         />
         <Cell title="审批说明" />
         <Field

src/pages/apply/list/index.jsx

@@ -6,7 +6,7 @@ import Page from '@/layouts/index';
 import PowerList from '@/components/PowerList';
 import Card from '@/components/IssueCard';
 import { getTaIssueApply } from '@/services/taissueapply';
-import { ROLE_MANAGER } from '@/utils/user';
+import { ROLE_MANAGER, ROLE_ORG_MANAGER } from '@/utils/user';
 import { useModel } from '@/store';
 
 export default (props) => {
@@ -14,6 +14,8 @@ export default (props) => {
   const router = Taro.useRouter();
   const { title, applyType = '' } = router.params;
 
+  const { duty } = useModel('user');
+
   React.useMemo(() => {
     if (title) {
       Taro.setNavigationBarTitle({ title });
@@ -27,8 +29,8 @@ export default (props) => {
   const onClick = (item) => {
     if (!user) return ;
 
-    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
-      if (item.verifyStatus) {
+    if (!item.verifyDate) {
+      if (duty != ROLE_MANAGER && duty != ROLE_ORG_MANAGER) {
         Taro.navigateTo({
           url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
         })

src/pages/apply/verify/index.jsx

@@ -36,7 +36,7 @@ export default (props) => {
   const onSubmit = () => {
     try {
       warn(!formData.verifyStatus, '请选择审批结果');
-      warn(!formData.verifyDesc, '请填写审批说明');
+      warn(!formData.verifyDesc && formData.verifyStatus == 'reject', '请填写审批说明');
     } catch (e) {
       return ;
     }