diff --git a/addons/address/view/index/amap.html b/addons/address/view/index/amap.html index 7ec88cb..45b7f25 100644 --- a/addons/address/view/index/amap.html +++ b/addons/address/view/index/amap.html @@ -111,7 +111,7 @@ var center = [lng,lat] //加载PositionPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分 - console.log(center) + // console.log(center) map = new AMap.Map('container', { zoom: parseInt('{$zoom}'), center: center @@ -121,15 +121,15 @@ radius: 1000, //范围，默认：500, }); if (city_code){ - // console.log(111,city_code); + // // console.log(111,city_code); geocoder.getLocation(city_code, function(status, result) { if (status === 'complete' && result.info === 'OK') { lat = result.geocodes[0].location.lat; lng = result.geocodes[0].location.lng; map.setCenter(result.geocodes[0].location); - console.log(result.geocodes[0],2222); + // console.log(result.geocodes[0],2222,result); } else { - console.log(result) + // console.log(result) } }); } @@ -147,6 +147,7 @@ lat = lnglat.lat; map.panTo([lng, lat]); positionPicker.start(lnglat); + // console.log(lnglat,addr) if (addr) { // var label = '
地址:' + addr + '
经度:' + lng + '
纬度:' + lat + '
'; var label = '
地址:' + addr + '
'; @@ -159,11 +160,12 @@ var address = result.regeocode.formattedAddress; // var label = '
地址:' + address + '
经度:' + lng + '
纬度:' + lat + '
'; var label = '
地址:' + address + '
'; + city_code = result.regeocode.addressComponent.adcode positionPicker.marker.setLabel({ content: label //显示内容 }); } else { - console.log(JSON.stringify(result)); + // console.log(JSON.stringify(result)); } }); } @@ -211,7 +213,7 @@ }); positionPicker.on('success', function (positionResult) { - console.log(positionResult); + // console.log(positionResult); as = positionResult.position; address = positionResult.address; lat = as.lat; @@ -260,12 +262,13 @@ //点击搜索按钮 $(document).on('click', '.confirm', function () { var zoom = map.getZoom(); - var data = {lat: lat, lng: lng, zoom: zoom, address: address}; + console.log(map) + var data = {lat: lat, lng: lng, zoom: zoom, address: address,city_code:city_code}; if (fromtype !== totype) { var result = gcoord.transform([data.lng, data.lat], gcoord[fromtype], gcoord[totype]); data.lng = (result[0] || data.lng).toFixed(5); data.lat = (result[1] || data.lat).toFixed(5); - console.log(data, result, fromtype, totype); + // console.log(data, result, fromtype, totype); } close(data); }); diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 9b0c28a..789b320 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -343,7 +343,7 @@ class Order extends Backend } $area = new \app\admin\model\Area(); $area_name = $area->getNameByCode($order->area_id); - $order->area_name = str_replace(',', '/', $area_name); + $order->area_name = str_replace(',', '/', $area_name ?? ''); // dd($area_name); // 将订单数据传递到视图 $this->assign('row', $order); diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html index 23a4058..62e8198 100644 --- a/application/admin/view/order/add.html +++ b/application/admin/view/order/add.html @@ -36,7 +36,7 @@ -
+
-
+
-
+