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

src/components/map/index.jsx

@@ -26,7 +26,7 @@ export default (props) => {
     // eslint-disable-next-line no-undef
     const loc = location || DEFAULT_POS;
     const [longitude, latitude] = loc.split(',');
-    
+
     const mks = readOnly ? [{
       id: 1,
       longitude,
@@ -35,8 +35,8 @@ export default (props) => {
       width: 17,
       height: 20
     }] : [];
-    
-  console.log('-----mks---', mks);
+
+    console.log('-----mks---', mks);
 
     return [
       mks,
@@ -87,9 +87,12 @@ export default (props) => {
     if (mapCtxRef.current) {
       fixedLocation().then((res) => {
         const { longitude, latitude } = res;
+        // console.log('longitude', longitude);
+        // console.log('latitude', latitude);
         onChange([res.longitude, res.latitude].join(','));
         moveTo(mapCtxRef.current, { longitude, latitude });
       })
+
     }
   }
 
@@ -103,9 +106,10 @@ export default (props) => {
         onChange([longitude, latitude].join(','));
       })
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [readOnly, getContext]);
 
+  console.log('-----方---》', center);
   return (
     <View className={style['map-wrapper']}>
       {

src/pages/check/edit/index.jsx

@@ -46,7 +46,8 @@ 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, '请选择年龄段');
         } catch (error) {