master
cody 5 months ago
parent 779342c430
commit 3a7140812e

@ -185,7 +185,7 @@ class EmailTemplateController extends BaseController
$all['department_id'] = $this->getUser()->department_id; $all['department_id'] = $this->getUser()->department_id;
} }
$original = $model->getOriginal(); $original = $model->getOriginal();
dd($all); dd(getVar($all['content']));
$model->fill($all); $model->fill($all);
$model->save(); $model->save();
DB::commit(); DB::commit();

@ -676,7 +676,8 @@ function isMultiDimensionalArray($array)
* @param lng1,lng2 经度 * @param lng1,lng2 经度
* @return float 距离单位为km * @return float 距离单位为km
**/ **/
function getDistance($lat1,$lng1,$lat2,$lng2){ function getDistance($lat1, $lng1, $lat2, $lng2)
{
//将角度转为狐度 //将角度转为狐度
$radLat1 = deg2rad($lat1);//deg2rad()函数将角度转换为弧度 $radLat1 = deg2rad($lat1);//deg2rad()函数将角度转换为弧度
$radLat2 = deg2rad($lat2); $radLat2 = deg2rad($lat2);
@ -684,6 +685,16 @@ function getDistance($lat1,$lng1,$lat2,$lng2){
$radLng2 = deg2rad($lng2); $radLng2 = deg2rad($lng2);
$a = $radLat1 - $radLat2; $a = $radLat1 - $radLat2;
$b = $radLng1 - $radLng2; $b = $radLng1 - $radLng2;
$s =2*asin(sqrt(pow(sin($a/2),2)+cos($radLat1)*cos($radLat2)*pow(sin($b/2),2)))*6371; $s = 2 * asin(sqrt(pow(sin($a / 2), 2) + cos($radLat1) * cos($radLat2) * pow(sin($b / 2), 2))) * 6371;
return round($s,1); return round($s, 1);
}
/**
* 提取中括号里的数据
*/
function getVar($text)
{
$pattern = '/\{.*?\}/';
preg_match_all($pattern, $text, $matches);
return $matches[0] ?? '';
} }

Loading…
Cancel
Save