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

config/prod.js

@@ -6,7 +6,7 @@ module.exports = {
     HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
-    VERSION: '"1.1.20-20230404"',
+    VERSION: '"1.1.22-20230413"',
   },
   mini: {},
   h5: {

src/components/PowerList/index.jsx

@@ -10,7 +10,7 @@ export default React.forwardRef((props, ref) => {
   const { sid, request, params, renderItem, onLoadingChange, onDataChange } = props;
 
   const pageSize = 5;
-  const pageShowRef = React.useRef(false);
+  const pageShowRef = React.useRef(true);
   const [loading, setLoading] = React.useState(false);
   const [list, setList] = React.useState([]);
   const [finished, setFinished] = React.useState(true);
@@ -105,18 +105,18 @@ export default React.forwardRef((props, ref) => {
     if (pageShowRef.current) {
       refresh(params);
     }
-  }, [params]);
+  }, [params, sid]);
 
   React.useImperativeHandle(ref, () => ({
     refresh: () => refresh(params),
     updateData: (dt) => setList(dt),
-  }), [params]);
+  }), [params, sid]);
 
   React.useEffect(() => {
     return () => {
       Taro.removeStorageSync(`list-${sid}`);
     }
-  }, []);
+  }, [sid]);
  
   return (
     <PowerScrollView

src/components/map/index.jsx

@@ -36,14 +36,14 @@ export default (props) => {
       height: 20
     }] : [];
 
-    console.log('-----mks---', mks);
-
     return [
       mks,
       { longitude, latitude }
     ]
   }, [location, readOnly]);
 
+  console.log('------center-------', center, location)
+
   const moveTo = (ctx, point) => {
     ctx.moveToLocation({
       ...point,
@@ -109,7 +109,6 @@ export default (props) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [readOnly, getContext]);
 
-  console.log('-----方---》', center);
   return (
     <View className={style['map-wrapper']}>
       {

src/pages/check/edit/components/Footer/index.jsx

@@ -2,20 +2,21 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { Button } from '@antmjs/vantui';
+import { warn } from '@/utils/message';
 import QuSelect from '../QuSelect';
 import style from './style.module.less';
 
 export default (props) => {
   const { value, list, readonly, onChange, onSubmit } = props;
 
+  const total = list?.length || 0;
   const [isPrev, isFinished] = React.useMemo(() => {
-    const total = list?.length || 0;
 
     return [
       value > 0,
-      value >= total - 1,
+      (value >= total - 1) && (total > 0),
     ]
-  }, [value, list]);
+  }, [value, total]);
 
   const onPrev = () => {
     onChange(value - 1);
@@ -25,7 +26,10 @@ export default (props) => {
     if (isFinished) {
       onSubmit()
     } else {
-      onChange(value + 1);
+      try {
+        warn(total < 1, '找不到作答题目');
+        onChange(value + 1);
+      } finally {}
     }
   }
   

src/pages/check/edit/components/LocForm.jsx

@@ -13,6 +13,8 @@ export default (props) => {
   const { checkItemInfo, checkType, answer, readonly, onChange, onLoadingChange } = props;
 
   const [showAgePicker, setShowAgePicker] = React.useState(false);
+  const answerRef = React.useRef();
+  answerRef.current = answer;
 
   const setLoading = (v) => {
     if (onLoadingChange) {
@@ -21,22 +23,25 @@ export default (props) => {
   }
 
   const setFieldChange = (key, val) => {
-    onChange({
-      ...answer || {},
+    const newAnswer = {
+      ...answerRef.current || {},
       [key]: val,
-    })
+    }
+
+    answerRef.current = newAnswer;
+    onChange(newAnswer);
   }
 
   const onLocationChange = (loc) => {
     setFieldChange('location', loc);
-
+    
     if (checkType == 'loc' && 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 reLoc = [y, x].join(',');
+      geocoder(reLoc).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
     }
-  }
+  };
 
   return (
     <View>
@@ -60,6 +65,7 @@ export default (props) => {
         {
           checkType == 'survey' && (
             <Field
+              key="01"
               label="社区"
               placeholder="请填写社区名称"
               readonly={readonly}
@@ -69,6 +75,7 @@ export default (props) => {
           )
         }
         <Field
+          key="02"
           readonly={readonly}
           label={checkType == 'loc' ? '地址' : '小区'}
           placeholder={checkType == 'loc' ? '请输入地址' : '请填写小区名称'}

src/pages/check/edit/index.jsx

@@ -46,7 +46,7 @@ export default (props) => {
         try {
           warn(typ == 'survey' && !answer?.communityName, '请填写社区名称');
           warn(!answer?.addr, typ == 'loc' ? '请填写地址' : '请填写小区名称');
-          // warn(!answer?.location, '未能获取定位信息, 请重试');
+          warn(!answer?.location, '未能获取定位信息, 请重试');
           console.log('!answer?.location', !answer?.location);
           warn(typ == 'survey' && !answer?.sex, '请选择性别');
           warn(typ == 'survey' && !answer?.age, '请选择年龄段');

src/pages/check/loc/edit/components/Footer/index.jsx

@@ -2,20 +2,20 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { Button } from '@antmjs/vantui';
+import { warn } from '@/utils/message';
 import QuSelect from '../QuSelect';
 import style from './style.module.less';
 
 export default (props) => {
   const { value, list, readonly, onChange, onSubmit } = props;
 
+  const total = list?.length || 0;
   const [isPrev, isFinished] = React.useMemo(() => {
-    const total = list?.length || 0;
-
     return [
       value > 0,
-      value >= total - 1,
+      (value >= total - 1) && (total > 0),
     ]
-  }, [value, list]);
+  }, [value, total]);
 
   const onPrev = () => {
     onChange(value - 1);
@@ -25,7 +25,10 @@ export default (props) => {
     if (isFinished) {
       onSubmit()
     } else {
-      onChange(value + 1);
+      try {
+        warn(total < 1, '找不到作答题目');
+        onChange(value + 1);
+      } finally {}
     }
   }