From 3a7140812e2031e097a565b324fd6028f15d3df8 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 7 Jul 2025 14:17:34 +0800
Subject: [PATCH] update

---
 .../Admin/EmailTemplateController.php           |  2 +-
 app/Http/functions.php                          | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/EmailTemplateController.php b/app/Http/Controllers/Admin/EmailTemplateController.php
index 9c12cd9..e48dbc8 100644
--- a/app/Http/Controllers/Admin/EmailTemplateController.php
+++ b/app/Http/Controllers/Admin/EmailTemplateController.php
@@ -185,7 +185,7 @@ class EmailTemplateController extends BaseController
                 $all['department_id'] = $this->getUser()->department_id;
             }
             $original = $model->getOriginal();
-            dd($all);
+            dd(getVar($all['content']));
             $model->fill($all);
             $model->save();
             DB::commit();
diff --git a/app/Http/functions.php b/app/Http/functions.php
index 1bdc307..9d6fdec 100755
--- a/app/Http/functions.php
+++ b/app/Http/functions.php
@@ -676,7 +676,8 @@ function isMultiDimensionalArray($array)
  * @param lng1,lng2 经度
  * @return float 距离，单位为km
  **/
-function getDistance($lat1,$lng1,$lat2,$lng2){
+function getDistance($lat1, $lng1, $lat2, $lng2)
+{
 //将角度转为狐度
     $radLat1 = deg2rad($lat1);//deg2rad()函数将角度转换为弧度
     $radLat2 = deg2rad($lat2);
@@ -684,6 +685,16 @@ function getDistance($lat1,$lng1,$lat2,$lng2){
     $radLng2 = deg2rad($lng2);
     $a = $radLat1 - $radLat2;
     $b = $radLng1 - $radLng2;
-    $s =2*asin(sqrt(pow(sin($a/2),2)+cos($radLat1)*cos($radLat2)*pow(sin($b/2),2)))*6371;
-    return round($s,1);
+    $s = 2 * asin(sqrt(pow(sin($a / 2), 2) + cos($radLat1) * cos($radLat2) * pow(sin($b / 2), 2))) * 6371;
+    return round($s, 1);
+}
+
+/**
+ * 提取中括号里的数据
+ */
+function getVar($text)
+{
+    $pattern = '/\{.*?\}/';
+    preg_match_all($pattern, $text, $matches);
+    return $matches[0] ?? '';
 }