定位组件修改.

one_stop_public/libs/LocationCom.js

@@ -31,6 +31,7 @@ export default class LocationCom extends React.Component {
 		}
 	}
 	changePos = (obj) => {
+	  console.log(obj);
 		if (!('value' in this.props)) {
 			this.setState({ ...obj });
 		}

one_stop_public/location/components.jsx

+//@ts-nocheck
 import React, { Component } from 'react';
 import styles from './styles.less';
-import UUID from 'react-native-uuid';
-const AMap = window.AMap;
-const AMapUI = window.AMapUI;
+import { message } from 'antd';
+import AMapJS from 'amap-js';
 //思路进入页面时先定位
 //可以通过搜索选址
 //可以通过拖拽微调选址
 class GetLocation extends Component {
   constructor(props) {
     super(props);
-		this.mapId = UUID.v4();
     this.state = {
       selectionCenter: [],
     };
+
   }
-	map;
-	valueString;
-	componentWillReceiveProps(nextProps) {
-		const { lng, lat, params } = nextProps;
-		const vs = JSON.stringify({ lng, lat, params });
-		if (vs != this.valueString) {
-			this.valueString = vs;
-			if (params.setMap) {
-				params.setMap(this.map, AMap);
-			}
-		}
+
+  componentWillMount() {
+
   }
 
-	componentWillMount() {}
   componentDidMount = () => {
+    console.log(123);
+    this.loader = new AMapJS.AMapLoader({
+      key: 'a8d312e3cc24b4fd12bad99780c2182a', // 公司账号配置的应用的key
+      // https://console.amap.com/dev/key/app
+      version: '1.4.8',
+      plugins: ['AMap.Geolocation'],
+      security: {
+        securityJsCode: 'f4a5344f0117dc8b32ee216d2311fc1a' // 公司账号配置的应用的 安全key
+      },
+    });
+    console.log(window.AMap);
+    if(!window.AMap){
+      this.loader.load().then(() => {
+          // 加载完成
+          console.log('Amap地图加载完成');
           this.getLocation();
+          if(this.props.showMap){
             this.searchSiteSelection();
-		const { lng, lat, params } = this.props;
-		if (params.setMap) {
-			params.setMap(this.map, AMap);
           }
+        })
+        .catch(e => {
+          console.log('-------88--99--11--12');
+          console.log(e);
+          message.error('未配置地图厂家');
+          return;
+        });
+    }
+
   };
   // 12,[116.171731,40.06682]
   //获取当前定位
@@ -42,22 +55,13 @@ class GetLocation extends Component {
     /***************************************
      由于Chrome、IOS10等已不再支持非安全域的浏览器定位请求，为保证定位成功率和精度，请尽快升级您的站点到HTTPS。
      ***************************************/
-		let geolocation;
-		const { lng, lat, params, json } = this.props;
-
+    const AMap = window.AMap;
+    let map, geolocation;
     //加载地图，调用浏览器定位服务
-		this.map = new AMap.Map(this.mapId, {
+    map = new AMap.Map('container', {
       resizeEnable: true,
-			zoom: json.zoom || 14, //级别
-			center: [lng ? lng : 116.397428, lat ? lat : 39.90923], //中心点坐标
-			viewMode: '3D', //使用3D视图
     });
-
-		var layer1 = new AMap.TileLayer.Satellite();
-		var layer2 = new AMap.TileLayer.RoadNet();
-		var layers = [layer1, layer2];
-		this.map.setLayers(layers);
-		this.map.plugin('AMap.Geolocation', () => {
+    map.plugin('AMap.Geolocation', () => {
       geolocation = new AMap.Geolocation({
         enableHighAccuracy: true, //是否使用高精度定位，默认:true
         timeout: 1000000, //超过10秒后停止定位，默认：无穷大
@@ -67,25 +71,42 @@ class GetLocation extends Component {
         GeoLocationFirst: true,
       });
 
-			this.map.addControl(geolocation);
+      map.addControl(geolocation);
       geolocation.getCurrentPosition();
       // /**
       //  * 只查询到城市
       //  */
       // geolocation.getCityInfo((status, result) => {
-			//   console.log(result)
       //       })
       AMap.event.addListener(geolocation, 'complete', onComplete.bind(this)); //返回定位信息
       AMap.event.addListener(geolocation, 'error', onError); //返回定位出错信息
     });
+
     //解析定位结果
     function onComplete(data) {
+      console.log(data);
+      if(!this.props.showMap){
+        let locationMsg = {
+          lng: data.position.lng, // 经度
+          lat: data.position.lat, // 维度
+          address: data.formattedAddress, // 详细地址
+          addressComponent: data.addressComponent,
+          // nearestJunction: positionResult.nearestJunction, // 最近的路口
+          // nearestRoad: positionResult.nearestRoad, // 最近的路
+          // nearestPOI: positionResult.nearestPOI, // 最近的POI
+        };
+        this.props.getLocationMsg(locationMsg);
+      }else{
         let poi = data.position.toString().split(',');
         // 需要通过改变this指向
         this.dragSiteSelection(15, poi);
       }
+
+    }
+
     //解析定位错误信息
     function onError(data) {
+      console.log('error', data);
       var str = '定位失败,';
       str += '错误信息：';
       switch (data.info) {
@@ -102,28 +123,17 @@ class GetLocation extends Component {
           str += '未知错误';
           break;
       }
-			console.log(str);
-		}
-
-		AMapUI.loadUI(['control/BasicControl'], (BasicControl) => {
-			//缩放控件
-			this.map.addControl(
-				new BasicControl.Zoom({
-					position: 'lt', //left top，左上角
-					showZoomNum: true, //显示zoom值
-				}),
-			);
-
-			//图层切换控件
-			this.map.addControl(
-				new BasicControl.LayerSwitcher({
-					position: 'rt', //right top，右上角
-				}),
+      alert(
+        '定位失败,请在设置==》应用==》权限管理==》位置信息权限==>打开应用定位权限',
       );
-		});
+    }
   };
   //通过搜索来获取定位信息
   searchSiteSelection = () => {
+    const AMapUI = window.AMapUI;
+    if (!AMapUI) {
+      return false;
+    }
     AMapUI.loadUI(['misc/PoiPicker'], (PoiPicker) => {
       let poiPicker = new PoiPicker({
         input: 'pickerInput',
@@ -140,6 +150,10 @@ class GetLocation extends Component {
 
   //拖拽位置选择
   dragSiteSelection = (zoom, center) => {
+    const AMapUI = window.AMapUI;
+    if (!AMapUI) {
+      return false;
+    }
     AMapUI.loadUI(['misc/PositionPicker'], (PositionPicker) => {
       let map = new AMap.Map('map', {
         zoom: zoom,
@@ -174,21 +188,18 @@ class GetLocation extends Component {
       positionPicker.start();
     });
   };
+
   render() {
-		const { json } = this.props;
     return (
-			<div id="GetLocation" style={{ display: this.props.showMap ? 'block' : 'none' }}>
+      <div
+        id='GetLocation'
+        style={{ display: this.props.showMap ? 'block' : 'none' }}>
         <input
-					id="pickerInput"
+          id='pickerInput'
           className={styles.top}
-					style={{ width: 200 }}
-					placeholder="输入关键字选取地点"
-				/>
-				<div
-					id={this.mapId}
-					className={styles.map}
-					style={{ width: json.width, height: json.height }}
+          placeholder='输入关键字选取地点'
         />
+        <div id='map' className={styles.map}></div>
       </div>
     );
   }

one_stop_public/location/index.jsx

@@ -28,10 +28,10 @@ export default class location extends Component {
   //在组件从 DOM 中移除的时候立刻被调用。
   componentWillUnmount = () => {};
   getLocationMsg = locationMsg => {
-    console.log(locationMsg);
     //如果不为空的话显示提示
     this.setState({ loading: true }, () => {
       if (Object.keys(locationMsg).length !== 0) {
+        this.props.onChange(locationMsg);
         this.setState({
           locationMsg: locationMsg,
           loading: false,
@@ -101,9 +101,9 @@ export default class location extends Component {
           showMap={this.props.showMap}
           params={params}
         />
-        <div style={{ display: showLocation ? 'block' : 'none' }}>
-          {' '}
-          <Popconfirm
+        <div style={{ display: 'block'}}>
+          {locationMsg?.address || ''}
+         {/* <Popconfirm
             title={btn ? '正在定位中' : locationMsg.address}
             onConfirm={this.confirm}
             okText="提交"
@@ -118,7 +118,7 @@ export default class location extends Component {
             >
               {this.props.btnName}
             </Button>
-          </Popconfirm>
+          </Popconfirm>*/}
         </div>
       </div>
     );

one_stop_public/tableCompon/index.jsx

@@ -2511,8 +2511,8 @@ export default class tableCom extends Component {
             <span>
               <LocationCom
                 get={get}
-                btnName={json.btnName}
-                btnSucName={json.btnSucName}
+                btnName={json.btnName || '定位'}
+                btnSucName={json.btnSucName || '定位成功'}
                 width={json.width}
                 json={json}
                 showMap={json.showMap}