hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #131: (feature/hant -> develop)

Browse Source 
Merge Request: 燕国地图修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/131?initial=true
This commit is contained in:
todayswind 2025-06-10 14:07:35 +08:00 committed by Coding
commit a1b7ff5b1f
6 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/address/view/index/amap.html
View File

@ -111,7 +111,7 @@
var center = [lng,lat] var center = [lng,lat]
//加载PositionPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分 //加载PositionPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分
console.log(center) // console.log(center)
map = new AMap.Map('container', { map = new AMap.Map('container', {
zoom: parseInt('{$zoom}'), zoom: parseInt('{$zoom}'),
center: center center: center
@ -121,15 +121,15 @@
radius: 1000, //范围，默认：500, radius: 1000, //范围，默认：500,
}); });
if (city_code){ if (city_code){
// console.log(111,city_code); // // console.log(111,city_code);
geocoder.getLocation(city_code, function(status, result) { geocoder.getLocation(city_code, function(status, result) {
if (status === 'complete' && result.info === 'OK') { if (status === 'complete' && result.info === 'OK') {
lat = result.geocodes[0].location.lat; lat = result.geocodes[0].location.lat;
lng = result.geocodes[0].location.lng; lng = result.geocodes[0].location.lng;
map.setCenter(result.geocodes[0].location); map.setCenter(result.geocodes[0].location);
console.log(result.geocodes[0],2222); // console.log(result.geocodes[0],2222,result);
} else { } else {
console.log(result) // console.log(result)
} }
}); });
} }
@ -147,6 +147,7 @@
lat = lnglat.lat; lat = lnglat.lat;
map.panTo([lng, lat]); map.panTo([lng, lat]);
positionPicker.start(lnglat); positionPicker.start(lnglat);
// console.log(lnglat,addr)
if (addr) { if (addr) {
// var label = '<div class="info">地址:' + addr + '<br>经度:' + lng + '<br>纬度:' + lat + '</div>'; // var label = '<div class="info">地址:' + addr + '<br>经度:' + lng + '<br>纬度:' + lat + '</div>';
var label = '<div class="info">地址:' + addr + '</div>'; var label = '<div class="info">地址:' + addr + '</div>';
@ -159,11 +160,12 @@
var address = result.regeocode.formattedAddress; var address = result.regeocode.formattedAddress;
// var label = '<div class="info">地址:' + address + '<br>经度:' + lng + '<br>纬度:' + lat + '</div>'; // var label = '<div class="info">地址:' + address + '<br>经度:' + lng + '<br>纬度:' + lat + '</div>';
var label = '<div class="info">地址:' + address + '</div>'; var label = '<div class="info">地址:' + address + '</div>';
city_code = result.regeocode.addressComponent.adcode
positionPicker.marker.setLabel({ positionPicker.marker.setLabel({
content: label //显示内容 content: label //显示内容
}); });
} else { } else {
console.log(JSON.stringify(result)); // console.log(JSON.stringify(result));
} }
}); });
} }
@ -211,7 +213,7 @@
}); });
positionPicker.on('success', function (positionResult) { positionPicker.on('success', function (positionResult) {
console.log(positionResult); // console.log(positionResult);
as = positionResult.position; as = positionResult.position;
address = positionResult.address; address = positionResult.address;
lat = as.lat; lat = as.lat;
@ -260,12 +262,13 @@
//点击搜索按钮 //点击搜索按钮
$(document).on('click', '.confirm', function () { $(document).on('click', '.confirm', function () {
var zoom = map.getZoom(); 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) { if (fromtype !== totype) {
var result = gcoord.transform([data.lng, data.lat], gcoord[fromtype], gcoord[totype]); var result = gcoord.transform([data.lng, data.lat], gcoord[fromtype], gcoord[totype]);
data.lng = (result[0] || data.lng).toFixed(5); data.lng = (result[0] || data.lng).toFixed(5);
data.lat = (result[1] || data.lat).toFixed(5); data.lat = (result[1] || data.lat).toFixed(5);
console.log(data, result, fromtype, totype); // console.log(data, result, fromtype, totype);
} }
close(data); close(data);
}); });

2
application/admin/controller/Order.php
View File

@ -343,7 +343,7 @@ class Order extends Backend
} }
$area = new \app\admin\model\Area(); $area = new \app\admin\model\Area();
$area_name = $area->getNameByCode($order->area_id); $area_name = $area->getNameByCode($order->area_id);
$order->area_name = str_replace(',', '/', $area_name); $order->area_name = str_replace(',', '/', $area_name ?? '');
// dd($area_name); // dd($area_name);
// 将订单数据传递到视图 // 将订单数据传递到视图
$this->assign('row', $order); $this->assign('row', $order);

2
application/admin/view/order/add.html
View File

@ -36,7 +36,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line flex-sb"> <div class="line flex-sb" style="display: none">
<div class="title flex-c"><span class="required">*</span>地区：</div> <div class="title flex-c"><span class="required">*</span>地区：</div>
<div class='value col-sm-12 flex-c'> <div class='value col-sm-12 flex-c'>
<input id="c-city" class="form-control" data-toggle="city-picker" type="text" value="" /> <input id="c-city" class="form-control" data-toggle="city-picker" type="text" value="" />

2
application/admin/view/order/copy.html
View File

@ -36,7 +36,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line flex-sb"> <div class="line flex-sb" style="display: none">
<div class="title flex-c"><span class="required">*</span>地区：</div> <div class="title flex-c"><span class="required">*</span>地区：</div>
<div class='value col-sm-12 flex-c'> <div class='value col-sm-12 flex-c'>
<input id="c-city" value="{$row.area_name}" class="form-control" data-toggle="city-picker" type="text" value="{$row.address}" /> <input id="c-city" value="{$row.area_name}" class="form-control" data-toggle="city-picker" type="text" value="{$row.address}" />

2
application/admin/view/order/edit.html
View File

@ -35,7 +35,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line flex-sb"> <div class="line flex-sb" style="display: none">
<div class="title flex-c"><span class="required">*</span>地区：</div> <div class="title flex-c"><span class="required">*</span>地区：</div>
<div class='value col-sm-12 flex-c'> <div class='value col-sm-12 flex-c'>
<input id="c-city" value="{$row.area_name}" class="form-control" data-toggle="city-picker" type="text" value="{$row.address}" /> <input id="c-city" value="{$row.area_name}" class="form-control" data-toggle="city-picker" type="text" value="{$row.address}" />

14
public/assets/js/backend/order.js
View File

@ -546,11 +546,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
// Form.api.target($('#c-address')); // Form.api.target($('#c-address'));
// }); // });
$(document).on('click', "#area_map", function (e) { $(document).on('click', "#area_map", function (e) {
const data = $("#c-city").val(); // const data = $("#c-city").val();
if (!data) { // if (!data) {
Toastr.error('请先选择区域'); // Toastr.error('请先选择区域');
return false; // return false;
} // }
var that = this; var that = this;
var callback = $(that).data('callback'); var callback = $(that).data('callback');
@ -572,12 +572,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
} }
// console.log(url); // console.log(url);
Fast.api.open(url, '位置选择', { Fast.api.open(url, '位置选择', {
callback: function (res) { callback: function (res,data) {
input_id && $("#" + input_id).val(res.address).trigger("change"); input_id && $("#" + input_id).val(res.address).trigger("change");
lat_id && $("#" + lat_id).val(res.lat).trigger("change"); lat_id && $("#" + lat_id).val(res.lat).trigger("change");
lng_id && $("#" + lng_id).val(res.lng).trigger("change"); lng_id && $("#" + lng_id).val(res.lng).trigger("change");
zoom_id && $("#" + zoom_id).val(res.zoom).trigger("change"); zoom_id && $("#" + zoom_id).val(res.zoom).trigger("change");
$('#area_id').val(res.city_code);
try { try {
//执行回调函数 //执行回调函数
if (typeof callback === 'function') { if (typeof callback === 'function') {