From e3a91dd63623a2e2fa6c2d8ed58cd0df71f7bea5 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Tue, 30 Aug 2022 17:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=85=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E5=8F=8A=E5=A4=9A=E4=B8=AA=E7=94=B5=E8=AF=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E8=B0=83=E8=AF=952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/view/index/index.html        | 6 +-----
 extend/service/CarInfoHandle.php | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/view/index/index.html b/app/view/index/index.html
index 76c00d0..5561602 100644
--- a/app/view/index/index.html
+++ b/app/view/index/index.html
@@ -223,11 +223,7 @@
             title:'车辆信息',
             url: '{:url("/index/carInfo/")}', //数据接口
             where: getUrlParam('Object'),
-            defaultToolbar: ['filter', 'print', 'exports', {
-                title: '提示' //标题
-                ,layEvent: 'LAYTABLE_TIPS' //事件名，用于 toolbar 事件中使用
-                ,icon: 'layui-icon-tips' //图标类名
-            }],
+            toolbar: true,
             page: true, //开启分页
             limit: 20,
             loading: true,
diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 9107131..8587f18 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -359,9 +359,9 @@ class CarInfoHandle
                             $phones = [$source['car_phone']];
                             $phones_a = [$source_a['car_phone']];
                             foreach (['id_phone', 'insured_phone', 'link_phone_1', 'link_phone_2', 'link_phone_3'] as $key) {
-                                if (preg_match('/^1[3-9][0-9]{9}/', $source_a[$key]) && !in_array($phones_a, $source_a[$key]))
+                                if (preg_match('/^1[3-9][0-9]{9}/', $source_a[$key]) && !in_array($source_a[$key], $phones_a))
                                     $phones_a[] = $source_a[$key];
-                                if (preg_match('/^1[3-9][0-9]{9}/', $source[$key]) && !in_array($phones, $source[$key]))
+                                if (preg_match('/^1[3-9][0-9]{9}/', $source[$key]) && !in_array($source[$key], $phones))
                                     $phones[] = $source[$key];
                             }
                             $phones = array_unique(array_merge($phones_a, $phones));
@@ -369,7 +369,7 @@ class CarInfoHandle
                             if (count($phones) <= 6) {
                                 array_shift($phones);
                                 foreach (['id_phone', 'insured_phone', 'link_phone_1', 'link_phone_2', 'link_phone_3'] as $key) {
-                                    if (!in_array($phones, $source_a[$key]))
+                                    if (!in_array($source_a[$key], $phones))
                                         $source_a[$key] = array_shift($phones);
                                     if (empty($source_a[$key]))
                                         break;