Browse Source

fleat: update <!DOCTYPE html> and Customer search

igb 3 days ago
parent
commit
ec0a3899f8
31 changed files with 440 additions and 473 deletions
  1. 62 88
      abnormal.php
  2. 1 1
      claimRecord.php
  3. 1 1
      customerAdd.php
  4. 1 1
      customerEdit.php
  5. 1 1
      customerSave.php
  6. 1 1
      customerView.php
  7. 1 1
      customer_detail.php
  8. 2 1
      customers.php
  9. 82 86
      customersFollow.php
  10. 63 47
      customersNew.php
  11. 1 1
      dashboard.php
  12. 1 1
      export_statistics.php
  13. 85 109
      highSeas.php
  14. 1 1
      home.php
  15. 3 3
      js/js.js
  16. 1 1
      nullTag.php
  17. 1 1
      price.php
  18. 1 1
      pwdEdit.php
  19. 1 1
      relationshipAdd.php
  20. 1 1
      relationships.php
  21. 1 1
      searchResult.php
  22. 119 115
      silentCustomer.php
  23. 1 1
      statistics.php
  24. 1 1
      statistics_header.php
  25. 1 1
      subCustomers.php
  26. 1 1
      subTag.php
  27. 1 1
      subTagClound.php
  28. 1 1
      tag.php
  29. 1 1
      tagClound.php
  30. 1 1
      team.php
  31. 1 1
      teamSeas.php

+ 62 - 88
abnormal.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -55,41 +55,9 @@ $employee_id = intval($_SESSION['employee_id']);
 
 <?php
 // 适配新的customer_contact表结构并使用SQL拼接方式
-$sqlStr = "SELECT c.id, 
-          MAX(c.cs_code) as cs_code, 
-          MAX(c.cs_from) as cs_from, 
-          MAX(c.cs_country) as cs_country, 
-          MAX(c.cs_type) as cs_type, 
-          MAX(c.cs_deal) as cs_deal, 
-          MAX(c.cs_addtime) as cs_addtime, 
-          MAX(c.colortag) as colortag, 
-          MAX(c.cs_note) as cs_note, 
-          MAX(c.cs_claimFrom) as cs_claimFrom,
-          GROUP_CONCAT(DISTINCT cc.id) as contact_ids,
-          GROUP_CONCAT(DISTINCT cc.contact_name) as contact_names,
-          GROUP_CONCAT(DISTINCT cc.tel_1) as tel_1_list,
-          GROUP_CONCAT(DISTINCT cc.tel_2) as tel_2_list,
-          GROUP_CONCAT(DISTINCT cc.tel_3) as tel_3_list,
-          GROUP_CONCAT(DISTINCT cc.email_1) as email_1_list,
-          GROUP_CONCAT(DISTINCT cc.email_2) as email_2_list,
-          GROUP_CONCAT(DISTINCT cc.email_3) as email_3_list,
-          GROUP_CONCAT(DISTINCT cc.whatsapp_1) as whatsapp_1_list,
-          GROUP_CONCAT(DISTINCT cc.whatsapp_2) as whatsapp_2_list,
-          GROUP_CONCAT(DISTINCT cc.whatsapp_3) as whatsapp_3_list,
-          GROUP_CONCAT(DISTINCT cc.wechat_1) as wechat_1_list,
-          GROUP_CONCAT(DISTINCT cc.wechat_2) as wechat_2_list,
-          GROUP_CONCAT(DISTINCT cc.wechat_3) as wechat_3_list,
-          GROUP_CONCAT(DISTINCT cc.linkedin_1) as linkedin_1_list,
-          GROUP_CONCAT(DISTINCT cc.linkedin_2) as linkedin_2_list,
-          GROUP_CONCAT(DISTINCT cc.linkedin_3) as linkedin_3_list,
-          GROUP_CONCAT(DISTINCT cc.facebook_1) as facebook_1_list,
-          GROUP_CONCAT(DISTINCT cc.facebook_2) as facebook_2_list,
-          GROUP_CONCAT(DISTINCT cc.facebook_3) as facebook_3_list,
-          GROUP_CONCAT(DISTINCT cc.alibaba_1) as alibaba_1_list,
-          GROUP_CONCAT(DISTINCT cc.alibaba_2) as alibaba_2_list,
-          GROUP_CONCAT(DISTINCT cc.alibaba_3) as alibaba_3_list
+$sqlStr = "SELECT c.id, c.cs_code, c.cs_from, c.cs_country, c.cs_type, 
+          c.cs_deal, c.cs_addtime, c.colortag, c.cs_note, c.cs_claimFrom
           FROM customer c 
-          LEFT JOIN customer_contact cc ON c.id = cc.customer_id
           WHERE (
               (NOT EXISTS (SELECT 1 FROM customer_contact WHERE customer_id = c.id AND alibaba_1 <> '') 
                AND (c.cs_code LIKE '%阿里%' OR c.cs_code LIKE '%1688%') 
@@ -99,8 +67,7 @@ $sqlStr = "SELECT c.id,
                AND NOT EXISTS (SELECT 1 FROM customer_contact WHERE customer_id = c.id AND wechat_1 <> '') 
                AND c.cs_belong = " . $employee_id . ")
           ) 
-          GROUP BY c.id
-          ORDER BY MAX(c.colortag) DESC, c.id DESC";
+          ORDER BY c.colortag DESC, c.id DESC";
 
 $result = $conn->query($sqlStr);
 
@@ -199,58 +166,65 @@ if ($result && $result->num_rows > 0) {
             <div class="noteItem">联系方式</div>
             <div class="lx">
                 <?php
-                // 显示联系人和联系方式
-                $contacts = explode(',', $row['contact_names']);
-                $contactIds = explode(',', $row['contact_ids']);
+                // Fetch all contacts for this customer
+                $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                $contact_result = mysqli_query($conn, $contact_sql);
                 
-                // 处理电话
-                echo '<div class="tel">';
-                if (!empty($row['tel_1_list'])) echo htmlspecialcharsFix($row['tel_1_list']) . '<br>';
-                if (!empty($row['tel_2_list'])) echo htmlspecialcharsFix($row['tel_2_list']) . '<br>';
-                if (!empty($row['tel_3_list'])) echo htmlspecialcharsFix($row['tel_3_list']);
-                echo '</div>';
-                
-                // 处理邮箱
-                echo '<div class="mail">';
-                if (!empty($row['email_1_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_1_list']) . '">' . htmlspecialcharsFix($row['email_1_list']) . '</a><br>';
-                if (!empty($row['email_2_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_2_list']) . '">' . htmlspecialcharsFix($row['email_2_list']) . '</a><br>';
-                if (!empty($row['email_3_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_3_list']) . '">' . htmlspecialcharsFix($row['email_3_list']) . '</a>';
-                echo '</div>';
-                
-                // 处理WhatsApp
-                echo '<div class="whatsapp">';
-                if (!empty($row['whatsapp_1_list'])) echo htmlspecialcharsFix($row['whatsapp_1_list']) . '<br>';
-                if (!empty($row['whatsapp_2_list'])) echo htmlspecialcharsFix($row['whatsapp_2_list']) . '<br>';
-                if (!empty($row['whatsapp_3_list'])) echo htmlspecialcharsFix($row['whatsapp_3_list']);
-                echo '</div>';
-                
-                // 处理微信
-                echo '<div class="wechat">';
-                if (!empty($row['wechat_1_list'])) echo htmlspecialcharsFix($row['wechat_1_list']) . '<br>';
-                if (!empty($row['wechat_2_list'])) echo htmlspecialcharsFix($row['wechat_2_list']) . '<br>';
-                if (!empty($row['wechat_3_list'])) echo htmlspecialcharsFix($row['wechat_3_list']);
-                echo '</div>';
-                
-                // 处理LinkedIn
-                echo '<div class="linkedin">';
-                if (!empty($row['linkedin_1_list'])) echo htmlspecialcharsFix($row['linkedin_1_list']) . '<br>';
-                if (!empty($row['linkedin_2_list'])) echo htmlspecialcharsFix($row['linkedin_2_list']) . '<br>';
-                if (!empty($row['linkedin_3_list'])) echo htmlspecialcharsFix($row['linkedin_3_list']);
-                echo '</div>';
-                
-                // 处理Facebook
-                echo '<div class="facebook">';
-                if (!empty($row['facebook_1_list'])) echo htmlspecialcharsFix($row['facebook_1_list']) . '<br>';
-                if (!empty($row['facebook_2_list'])) echo htmlspecialcharsFix($row['facebook_2_list']) . '<br>';
-                if (!empty($row['facebook_3_list'])) echo htmlspecialcharsFix($row['facebook_3_list']);
-                echo '</div>';
-                
-                // 处理阿里巴巴
-                echo '<div class="alibaba">';
-                if (!empty($row['alibaba_1_list'])) echo htmlspecialcharsFix($row['alibaba_1_list']) . '<br>';
-                if (!empty($row['alibaba_2_list'])) echo htmlspecialcharsFix($row['alibaba_2_list']) . '<br>';
-                if (!empty($row['alibaba_3_list'])) echo htmlspecialcharsFix($row['alibaba_3_list']);
-                echo '</div>';
+                if ($contact_result && mysqli_num_rows($contact_result) > 0) {
+                    while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        echo '<div class="contact-block" style="margin-bottom: 10px; border-bottom: 1px dashed #ccc; padding-bottom: 5px;">';
+                        
+                        if (!empty($contact['contact_name'])) {
+                            echo '<div class="contact-name"><strong>' . htmlspecialcharsFix($contact['contact_name']) . '</strong></div>';
+                        }
+                        
+                        echo '<div class="tel">';
+                        if (!empty($contact['tel_1'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_1']) . '<br>';
+                        if (!empty($contact['tel_2'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_2']) . '<br>';
+                        if (!empty($contact['tel_3'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="mail">';
+                        if (!empty($contact['email_1'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_1']) . '">' . htmlspecialcharsFix($contact['email_1']) . '</a><br>';
+                        if (!empty($contact['email_2'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_2']) . '">' . htmlspecialcharsFix($contact['email_2']) . '</a><br>';
+                        if (!empty($contact['email_3'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_3']) . '">' . htmlspecialcharsFix($contact['email_3']) . '</a><br>';
+                        echo '</div>';
+                        
+                        echo '<div class="whatsapp">';
+                        if (!empty($contact['whatsapp_1'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_1']) . '<br>';
+                        if (!empty($contact['whatsapp_2'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_2']) . '<br>';
+                        if (!empty($contact['whatsapp_3'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="wechat">';
+                        if (!empty($contact['wechat_1'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_1']) . '<br>';
+                        if (!empty($contact['wechat_2'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_2']) . '<br>';
+                        if (!empty($contact['wechat_3'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="linkedin">';
+                        if (!empty($contact['linkedin_1'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_1']) . '<br>';
+                        if (!empty($contact['linkedin_2'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_2']) . '<br>';
+                        if (!empty($contact['linkedin_3'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="facebook">';
+                        if (!empty($contact['facebook_1'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_1']) . '<br>';
+                        if (!empty($contact['facebook_2'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_2']) . '<br>';
+                        if (!empty($contact['facebook_3'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="alibaba">';
+                        if (!empty($contact['alibaba_1'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_1']) . '<br>';
+                        if (!empty($contact['alibaba_2'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_2']) . '<br>';
+                        if (!empty($contact['alibaba_3'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '</div>';
+                    }
+                } else {
+                    echo '<div>无联系人信息</div>';
+                }
                 ?>
             </div>
             <div class="noteItem2">备注</div>

+ 1 - 1
claimRecord.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
customerAdd.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
customerEdit.php

@@ -77,7 +77,7 @@ if (!empty($id) && is_numeric($id)) {
     exit;
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
customerSave.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
customerView.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
customer_detail.php

@@ -169,7 +169,7 @@ function getPaymentStatusText($status) {
     return $statuses[$status] ?? '未知';
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 2 - 1
customers.php

@@ -411,7 +411,8 @@ if ($act == "postchk") {
         switch($chkact) {
             case "0":
             case "1":
-                $sql = "UPDATE customer SET cs_state = $chkact WHERE id IN ($ids)";
+            case "2":                             
+                $sql = "UPDATE customer SET cs_deal = $chkact WHERE id IN ($ids)";
                 break;
             case "-1":
                 // 删除客户记录和联系人记录(依靠外键级联删除)

+ 82 - 86
customersFollow.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -198,49 +198,30 @@ $hrefstr = "?keys=" . $keys;
 $employee_id = intval($_SESSION['employee_id']);
 $escapedKeyscode = $conn->real_escape_string($keyscode);
 
-$sql = "SELECT c.id, 
-        MAX(c.cs_code) as cs_code, 
-        MAX(c.cs_from) as cs_from, 
-        MAX(c.cs_country) as cs_country, 
-        MAX(c.cs_type) as cs_type, 
-        MAX(c.cs_deal) as cs_deal, 
-        MAX(c.cs_addtime) as cs_addtime, 
-        MAX(c.colortag) as colortag, 
-        MAX(c.cs_note) as cs_note,
-        MAX(c.cs_state) as cs_state,
-        GROUP_CONCAT(DISTINCT cc.id) as contact_ids,
-        GROUP_CONCAT(DISTINCT cc.contact_name) as contact_names,
-        GROUP_CONCAT(DISTINCT cc.tel_1) as tel_1_list,
-        GROUP_CONCAT(DISTINCT cc.tel_2) as tel_2_list,
-        GROUP_CONCAT(DISTINCT cc.tel_3) as tel_3_list,
-        GROUP_CONCAT(DISTINCT cc.email_1) as email_1_list,
-        GROUP_CONCAT(DISTINCT cc.email_2) as email_2_list,
-        GROUP_CONCAT(DISTINCT cc.email_3) as email_3_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_1) as whatsapp_1_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_2) as whatsapp_2_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_3) as whatsapp_3_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_1) as wechat_1_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_2) as wechat_2_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_3) as wechat_3_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_1) as linkedin_1_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_2) as linkedin_2_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_3) as linkedin_3_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_1) as facebook_1_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_2) as facebook_2_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_3) as facebook_3_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_1) as alibaba_1_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_2) as alibaba_2_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_3) as alibaba_3_list
+$sql = "SELECT c.id, c.colortag, c.cs_code, c.cs_from, c.cs_country, c.cs_type, 
+        c.cs_deal, c.cs_addtime, c.cs_note, c.cs_state
         FROM customer c 
-        LEFT JOIN customer_contact cc ON c.id = cc.customer_id 
-        WHERE c.cs_deal<>3 AND DATEDIFF(NOW(), c.cs_updatetime) > 55 AND c.cs_belong=" . $employee_id . "
-        AND (c.cs_code LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.contact_name LIKE '%" . $escapedKeyscode . "%'
-        OR cc.email_1 LIKE '%" . $escapedKeyscode . "%' OR cc.email_2 LIKE '%" . $escapedKeyscode . "%' OR cc.email_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.wechat_1 LIKE '%" . $escapedKeyscode . "%' OR cc.wechat_2 LIKE '%" . $escapedKeyscode . "%' OR cc.wechat_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.tel_1 LIKE '%" . $escapedKeyscode . "%' OR cc.tel_2 LIKE '%" . $escapedKeyscode . "%' OR cc.tel_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.whatsapp_1 LIKE '%" . $escapedKeyscode . "%' OR cc.whatsapp_2 LIKE '%" . $escapedKeyscode . "%' OR cc.whatsapp_3 LIKE '%" . $escapedKeyscode . "%')" . 
-        $filterStr . " GROUP BY c.id ORDER BY cs_state DESC, c.id DESC";
+        WHERE c.cs_deal<>3 AND DATEDIFF(NOW(), c.cs_updatetime) > 55 AND c.cs_belong=" . $employee_id;
+
+if (!empty($escapedKeyscode)) {
+    $sql .= " AND (c.cs_code LIKE '%" . $escapedKeyscode . "%' 
+            OR c.id IN (SELECT customer_id FROM customer_contact WHERE
+                contact_name LIKE '%" . $escapedKeyscode . "%' OR
+                email_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                email_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                email_3 LIKE '%" . $escapedKeyscode . "%' OR
+                wechat_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                wechat_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                wechat_3 LIKE '%" . $escapedKeyscode . "%' OR
+                tel_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                tel_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                tel_3 LIKE '%" . $escapedKeyscode . "%' OR
+                whatsapp_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                whatsapp_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                whatsapp_3 LIKE '%" . $escapedKeyscode . "%'))";
+}
+
+$sql .= $filterStr . " ORDER BY c.colortag DESC, c.id DESC";
 
 $result = $conn->query($sql);
 
@@ -321,50 +302,65 @@ if ($result && $result->num_rows > 0) {
             <div class="noteItem">联系方式</div>
             <div class="lx">
                 <?php
-                $contacts = explode(',', $row['contact_names']);
-                $contactIds = explode(',', $row['contact_ids']);
-                
-                echo '<div class="tel">';
-                if (!empty($row['tel_1_list'])) echo htmlspecialcharsFix($row['tel_1_list']) . '<br>';
-                if (!empty($row['tel_2_list'])) echo htmlspecialcharsFix($row['tel_2_list']) . '<br>';
-                if (!empty($row['tel_3_list'])) echo htmlspecialcharsFix($row['tel_3_list']);
-                echo '</div>';
-                
-                echo '<div class="mail">';
-                if (!empty($row['email_1_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_1_list']) . '">' . htmlspecialcharsFix($row['email_1_list']) . '</a><br>';
-                if (!empty($row['email_2_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_2_list']) . '">' . htmlspecialcharsFix($row['email_2_list']) . '</a><br>';
-                if (!empty($row['email_3_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_3_list']) . '">' . htmlspecialcharsFix($row['email_3_list']) . '</a>';
-                echo '</div>';
-                
-                echo '<div class="whatapp">';
-                if (!empty($row['whatsapp_1_list'])) echo htmlspecialcharsFix($row['whatsapp_1_list']) . '<br>';
-                if (!empty($row['whatsapp_2_list'])) echo htmlspecialcharsFix($row['whatsapp_2_list']) . '<br>';
-                if (!empty($row['whatsapp_3_list'])) echo htmlspecialcharsFix($row['whatsapp_3_list']);
-                echo '</div>';
+                // Fetch all contacts for this customer
+                $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                $contact_result = mysqli_query($conn, $contact_sql);
                 
-                echo '<div class="wechat">';
-                if (!empty($row['wechat_1_list'])) echo htmlspecialcharsFix($row['wechat_1_list']) . '<br>';
-                if (!empty($row['wechat_2_list'])) echo htmlspecialcharsFix($row['wechat_2_list']) . '<br>';
-                if (!empty($row['wechat_3_list'])) echo htmlspecialcharsFix($row['wechat_3_list']);
-                echo '</div>';
-                
-                echo '<div class="linkedin">';
-                if (!empty($row['linkedin_1_list'])) echo htmlspecialcharsFix($row['linkedin_1_list']) . '<br>';
-                if (!empty($row['linkedin_2_list'])) echo htmlspecialcharsFix($row['linkedin_2_list']) . '<br>';
-                if (!empty($row['linkedin_3_list'])) echo htmlspecialcharsFix($row['linkedin_3_list']);
-                echo '</div>';
-                
-                echo '<div class="facebook">';
-                if (!empty($row['facebook_1_list'])) echo htmlspecialcharsFix($row['facebook_1_list']) . '<br>';
-                if (!empty($row['facebook_2_list'])) echo htmlspecialcharsFix($row['facebook_2_list']) . '<br>';
-                if (!empty($row['facebook_3_list'])) echo htmlspecialcharsFix($row['facebook_3_list']);
-                echo '</div>';
-                
-                echo '<div class="alibaba">';
-                if (!empty($row['alibaba_1_list'])) echo htmlspecialcharsFix($row['alibaba_1_list']) . '<br>';
-                if (!empty($row['alibaba_2_list'])) echo htmlspecialcharsFix($row['alibaba_2_list']) . '<br>';
-                if (!empty($row['alibaba_3_list'])) echo htmlspecialcharsFix($row['alibaba_3_list']);
-                echo '</div>';
+                if ($contact_result && mysqli_num_rows($contact_result) > 0) {
+                    while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        echo '<div class="contact-block" style="margin-bottom: 10px; border-bottom: 1px dashed #ccc; padding-bottom: 5px;">';
+                        
+                        if (!empty($contact['contact_name'])) {
+                            echo '<div class="contact-name"><strong>' . htmlspecialcharsFix($contact['contact_name']) . '</strong></div>';
+                        }
+                        
+                        echo '<div class="tel">';
+                        if (!empty($contact['tel_1'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_1']) . '<br>';
+                        if (!empty($contact['tel_2'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_2']) . '<br>';
+                        if (!empty($contact['tel_3'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="mail">';
+                        if (!empty($contact['email_1'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_1']) . '">' . htmlspecialcharsFix($contact['email_1']) . '</a><br>';
+                        if (!empty($contact['email_2'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_2']) . '">' . htmlspecialcharsFix($contact['email_2']) . '</a><br>';
+                        if (!empty($contact['email_3'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_3']) . '">' . htmlspecialcharsFix($contact['email_3']) . '</a><br>';
+                        echo '</div>';
+                        
+                        echo '<div class="whatsapp">';
+                        if (!empty($contact['whatsapp_1'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_1']) . '<br>';
+                        if (!empty($contact['whatsapp_2'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_2']) . '<br>';
+                        if (!empty($contact['whatsapp_3'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="wechat">';
+                        if (!empty($contact['wechat_1'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_1']) . '<br>';
+                        if (!empty($contact['wechat_2'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_2']) . '<br>';
+                        if (!empty($contact['wechat_3'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="linkedin">';
+                        if (!empty($contact['linkedin_1'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_1']) . '<br>';
+                        if (!empty($contact['linkedin_2'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_2']) . '<br>';
+                        if (!empty($contact['linkedin_3'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="facebook">';
+                        if (!empty($contact['facebook_1'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_1']) . '<br>';
+                        if (!empty($contact['facebook_2'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_2']) . '<br>';
+                        if (!empty($contact['facebook_3'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="alibaba">';
+                        if (!empty($contact['alibaba_1'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_1']) . '<br>';
+                        if (!empty($contact['alibaba_2'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_2']) . '<br>';
+                        if (!empty($contact['alibaba_3'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '</div>';
+                    }
+                } else {
+                    echo '<div>无联系人信息</div>';
+                }
                 ?>
             </div>
             <div class="noteItem2">备注</div>

+ 63 - 47
customersNew.php

@@ -2,14 +2,14 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>管理区域</title>
     <link rel="stylesheet" href="css/common.css" type="text/css" />
     <link rel="stylesheet" href="css/alert.css" type="text/css" />
-    <script src="system/js/jquery-1.7.2.min.js"></script>
+    <script src="js/jquery-1.7.2.min.js"></script>
     <script src="js/js.js"></script>
     <style>
         body {
@@ -19,10 +19,11 @@ checkLogin();
         }
         #man_zone {
             margin-left: 0;
+
         }
     </style>
 </head>
-<body class="clear">
+<body >
 <?php // require_once 'panel.php'; ?>
 <div id="man_zone">
 <?php
@@ -180,7 +181,7 @@ $hrefstr = "?keys=" . $keys;
         </div>
     </div>
 
-    <div width="100%" border="0" cellpadding="3" cellspacing="1" class="table2 em<?= $_SESSION['employee_id'] ?>">
+    <div  class="table2 em<?= $_SESSION['employee_id'] ?>">
         <div class="theader">
             <div class="col1"><input type="checkbox" name="chkall" id="chkall" onClick="chkboxall(this,'chkbox')" /></div>
             <div class="col2">序号</div>
@@ -324,50 +325,65 @@ if ($result && $result->num_rows > 0) {
             <div class="noteItem">联系方式</div>
             <div class="lx">
                 <?php
-                $contacts = explode(',', $row['contact_names']);
-                $contactIds = explode(',', $row['contact_ids']);
-                
-                echo '<div class="tel">';
-                if (!empty($row['tel_1_list'])) echo htmlspecialcharsFix($row['tel_1_list']) . '<br>';
-                if (!empty($row['tel_2_list'])) echo htmlspecialcharsFix($row['tel_2_list']) . '<br>';
-                if (!empty($row['tel_3_list'])) echo htmlspecialcharsFix($row['tel_3_list']);
-                echo '</div>';
-                
-                echo '<div class="mail">';
-                if (!empty($row['email_1_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_1_list']) . '">' . htmlspecialcharsFix($row['email_1_list']) . '</a><br>';
-                if (!empty($row['email_2_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_2_list']) . '">' . htmlspecialcharsFix($row['email_2_list']) . '</a><br>';
-                if (!empty($row['email_3_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_3_list']) . '">' . htmlspecialcharsFix($row['email_3_list']) . '</a>';
-                echo '</div>';
-                
-                echo '<div class="whatsapp">';
-                if (!empty($row['whatsapp_1_list'])) echo htmlspecialcharsFix($row['whatsapp_1_list']) . '<br>';
-                if (!empty($row['whatsapp_2_list'])) echo htmlspecialcharsFix($row['whatsapp_2_list']) . '<br>';
-                if (!empty($row['whatsapp_3_list'])) echo htmlspecialcharsFix($row['whatsapp_3_list']);
-                echo '</div>';
-                
-                echo '<div class="wechat">';
-                if (!empty($row['wechat_1_list'])) echo htmlspecialcharsFix($row['wechat_1_list']) . '<br>';
-                if (!empty($row['wechat_2_list'])) echo htmlspecialcharsFix($row['wechat_2_list']) . '<br>';
-                if (!empty($row['wechat_3_list'])) echo htmlspecialcharsFix($row['wechat_3_list']);
-                echo '</div>';
+                // Fetch all contacts for this customer
+                $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                $contact_result = mysqli_query($conn, $contact_sql);
                 
-                echo '<div class="linkedin">';
-                if (!empty($row['linkedin_1_list'])) echo htmlspecialcharsFix($row['linkedin_1_list']) . '<br>';
-                if (!empty($row['linkedin_2_list'])) echo htmlspecialcharsFix($row['linkedin_2_list']) . '<br>';
-                if (!empty($row['linkedin_3_list'])) echo htmlspecialcharsFix($row['linkedin_3_list']);
-                echo '</div>';
-                
-                echo '<div class="facebook">';
-                if (!empty($row['facebook_1_list'])) echo htmlspecialcharsFix($row['facebook_1_list']) . '<br>';
-                if (!empty($row['facebook_2_list'])) echo htmlspecialcharsFix($row['facebook_2_list']) . '<br>';
-                if (!empty($row['facebook_3_list'])) echo htmlspecialcharsFix($row['facebook_3_list']);
-                echo '</div>';
-                
-                echo '<div class="alibaba">';
-                if (!empty($row['alibaba_1_list'])) echo htmlspecialcharsFix($row['alibaba_1_list']) . '<br>';
-                if (!empty($row['alibaba_2_list'])) echo htmlspecialcharsFix($row['alibaba_2_list']) . '<br>';
-                if (!empty($row['alibaba_3_list'])) echo htmlspecialcharsFix($row['alibaba_3_list']);
-                echo '</div>';
+                if ($contact_result && mysqli_num_rows($contact_result) > 0) {
+                    while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        echo '<div class="contact-block" style="margin-bottom: 10px; border-bottom: 1px dashed #ccc; padding-bottom: 5px;">';
+                        
+                        if (!empty($contact['contact_name'])) {
+                            echo '<div class="contact-name"><strong>' . htmlspecialcharsFix($contact['contact_name']) . '</strong></div>';
+                        }
+                        
+                        echo '<div class="tel">';
+                        if (!empty($contact['tel_1'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_1']) . '<br>';
+                        if (!empty($contact['tel_2'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_2']) . '<br>';
+                        if (!empty($contact['tel_3'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="mail">';
+                        if (!empty($contact['email_1'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_1']) . '">' . htmlspecialcharsFix($contact['email_1']) . '</a><br>';
+                        if (!empty($contact['email_2'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_2']) . '">' . htmlspecialcharsFix($contact['email_2']) . '</a><br>';
+                        if (!empty($contact['email_3'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_3']) . '">' . htmlspecialcharsFix($contact['email_3']) . '</a><br>';
+                        echo '</div>';
+                        
+                        echo '<div class="whatsapp">';
+                        if (!empty($contact['whatsapp_1'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_1']) . '<br>';
+                        if (!empty($contact['whatsapp_2'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_2']) . '<br>';
+                        if (!empty($contact['whatsapp_3'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="wechat">';
+                        if (!empty($contact['wechat_1'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_1']) . '<br>';
+                        if (!empty($contact['wechat_2'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_2']) . '<br>';
+                        if (!empty($contact['wechat_3'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="linkedin">';
+                        if (!empty($contact['linkedin_1'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_1']) . '<br>';
+                        if (!empty($contact['linkedin_2'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_2']) . '<br>';
+                        if (!empty($contact['linkedin_3'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="facebook">';
+                        if (!empty($contact['facebook_1'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_1']) . '<br>';
+                        if (!empty($contact['facebook_2'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_2']) . '<br>';
+                        if (!empty($contact['facebook_3'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="alibaba">';
+                        if (!empty($contact['alibaba_1'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_1']) . '<br>';
+                        if (!empty($contact['alibaba_2'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_2']) . '<br>';
+                        if (!empty($contact['alibaba_3'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '</div>';
+                    }
+                } else {
+                    echo '<div>无联系人信息</div>';
+                }
                 ?>
             </div>
             <div class="noteItem2">备注</div>

+ 1 - 1
dashboard.php

@@ -2,7 +2,7 @@
 require_once("conn.php");
 checkLogin("信息管理");
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
export_statistics.php

@@ -200,7 +200,7 @@ header('Content-Type: application/vnd.ms-excel');
 header('Content-Disposition: attachment;filename="CRM统计分析_' . date('Y-m-d') . '.xls"');
 header('Cache-Control: max-age=0');
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
     <meta charset="UTF-8">

+ 85 - 109
highSeas.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -20,6 +20,9 @@ checkLogin();
         #man_zone {
             margin-left: 0;
         }
+        .claim {
+            cursor: pointer;
+        }
     </style>
 </head>
 <body class="clear">
@@ -153,42 +156,9 @@ $employee_id = intval($_SESSION['employee_id']);
 // 使用SQL拼接方式,同时适配新的customer_contact表结构
 $escapedKeyscode = $conn->real_escape_string($keyscode);
 
-$sql = "SELECT c.id, 
-        MAX(c.cs_code) as cs_code, 
-        MAX(c.cs_from) as cs_from, 
-        MAX(c.cs_country) as cs_country, 
-        MAX(c.cs_type) as cs_type, 
-        MAX(c.cs_deal) as cs_deal, 
-        MAX(c.cs_addtime) as cs_addtime, 
-        MAX(c.cs_updatetime) as cs_updatetime, 
-        MAX(c.cs_note) as cs_note,
-        MAX(c.cs_claimFrom) as cs_claimFrom,
-        MAX(c.cs_state) as cs_state,
-        GROUP_CONCAT(DISTINCT cc.id) as contact_ids,
-        GROUP_CONCAT(DISTINCT cc.contact_name) as contact_names,
-        GROUP_CONCAT(DISTINCT cc.tel_1) as tel_1_list,
-        GROUP_CONCAT(DISTINCT cc.tel_2) as tel_2_list,
-        GROUP_CONCAT(DISTINCT cc.tel_3) as tel_3_list,
-        GROUP_CONCAT(DISTINCT cc.email_1) as email_1_list,
-        GROUP_CONCAT(DISTINCT cc.email_2) as email_2_list,
-        GROUP_CONCAT(DISTINCT cc.email_3) as email_3_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_1) as whatsapp_1_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_2) as whatsapp_2_list,
-        GROUP_CONCAT(DISTINCT cc.whatsapp_3) as whatsapp_3_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_1) as wechat_1_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_2) as wechat_2_list,
-        GROUP_CONCAT(DISTINCT cc.wechat_3) as wechat_3_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_1) as linkedin_1_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_2) as linkedin_2_list,
-        GROUP_CONCAT(DISTINCT cc.linkedin_3) as linkedin_3_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_1) as facebook_1_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_2) as facebook_2_list,
-        GROUP_CONCAT(DISTINCT cc.facebook_3) as facebook_3_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_1) as alibaba_1_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_2) as alibaba_2_list,
-        GROUP_CONCAT(DISTINCT cc.alibaba_3) as alibaba_3_list
+$sql = "SELECT c.id, c.cs_code, c.cs_from, c.cs_country, c.cs_type, 
+        c.cs_deal, c.cs_addtime, c.cs_updatetime, c.cs_note, c.cs_claimFrom, c.cs_state
         FROM customer c
-        LEFT JOIN customer_contact cc ON c.id = cc.customer_id
         WHERE c.cs_deal<>3 AND c.cs_deal<>0 AND c.cs_type<>2 AND c.cs_belong<>13 
         AND c.cs_belong<>" . $employee_id . " 
         AND DATEDIFF(NOW(), c.cs_updatetime) > 60
@@ -198,22 +168,27 @@ $sql = "SELECT c.id,
             SELECT 1 FROM customer_contact 
             WHERE customer_id = c.id 
             AND wechat_1 LIKE 'wxid%'
-        )
-        AND (c.cs_code LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.contact_name LIKE '%" . $escapedKeyscode . "%'
-        OR cc.email_1 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.email_2 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.email_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.wechat_1 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.wechat_2 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.wechat_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.tel_1 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.tel_2 LIKE '%" . $escapedKeyscode . "%' 
-        OR cc.tel_3 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.whatsapp_1 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.whatsapp_2 LIKE '%" . $escapedKeyscode . "%'
-        OR cc.whatsapp_3 LIKE '%" . $escapedKeyscode . "%')" . 
-        $filterStr . " GROUP BY c.id ORDER BY cs_state DESC, c.id DESC";
+        )";
+
+if (!empty($escapedKeyscode)) {
+    $sql .= " AND (c.cs_code LIKE '%" . $escapedKeyscode . "%' 
+            OR c.id IN (SELECT customer_id FROM customer_contact WHERE
+                contact_name LIKE '%" . $escapedKeyscode . "%' OR
+                email_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                email_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                email_3 LIKE '%" . $escapedKeyscode . "%' OR
+                wechat_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                wechat_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                wechat_3 LIKE '%" . $escapedKeyscode . "%' OR
+                tel_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                tel_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                tel_3 LIKE '%" . $escapedKeyscode . "%' OR
+                whatsapp_1 LIKE '%" . $escapedKeyscode . "%' OR 
+                whatsapp_2 LIKE '%" . $escapedKeyscode . "%' OR 
+                whatsapp_3 LIKE '%" . $escapedKeyscode . "%'))";
+}
+
+$sql .= $filterStr . " ORDER BY c.cs_state DESC, c.id DESC";
 
 $result = $conn->query($sql);
 
@@ -282,58 +257,65 @@ if ($result && $result->num_rows > 0) {
             <div class="noteItem">联系方式</div>
             <div class="lx">
                 <?php
-                // 显示联系人和联系方式
-                $contacts = explode(',', $row['contact_names']);
-                $contactIds = explode(',', $row['contact_ids']);
-                
-                // 处理电话
-                echo '<div class="tel">';
-                if (!empty($row['tel_1_list'])) echo htmlspecialcharsFix($row['tel_1_list']) . '<br>';
-                if (!empty($row['tel_2_list'])) echo htmlspecialcharsFix($row['tel_2_list']) . '<br>';
-                if (!empty($row['tel_3_list'])) echo htmlspecialcharsFix($row['tel_3_list']);
-                echo '</div>';
-                
-                // 处理邮箱
-                echo '<div class="mail">';
-                if (!empty($row['email_1_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_1_list']) . '">' . htmlspecialcharsFix($row['email_1_list']) . '</a><br>';
-                if (!empty($row['email_2_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_2_list']) . '">' . htmlspecialcharsFix($row['email_2_list']) . '</a><br>';
-                if (!empty($row['email_3_list'])) echo '<a href="mailto:' . htmlspecialcharsFix($row['email_3_list']) . '">' . htmlspecialcharsFix($row['email_3_list']) . '</a>';
-                echo '</div>';
+                // Fetch all contacts for this customer
+                $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                $contact_result = mysqli_query($conn, $contact_sql);
                 
-                // 处理WhatsApp
-                echo '<div class="whatsapp">';
-                if (!empty($row['whatsapp_1_list'])) echo htmlspecialcharsFix($row['whatsapp_1_list']) . '<br>';
-                if (!empty($row['whatsapp_2_list'])) echo htmlspecialcharsFix($row['whatsapp_2_list']) . '<br>';
-                if (!empty($row['whatsapp_3_list'])) echo htmlspecialcharsFix($row['whatsapp_3_list']);
-                echo '</div>';
-                
-                // 处理微信
-                echo '<div class="wechat">';
-                if (!empty($row['wechat_1_list'])) echo htmlspecialcharsFix($row['wechat_1_list']) . '<br>';
-                if (!empty($row['wechat_2_list'])) echo htmlspecialcharsFix($row['wechat_2_list']) . '<br>';
-                if (!empty($row['wechat_3_list'])) echo htmlspecialcharsFix($row['wechat_3_list']);
-                echo '</div>';
-                
-                // 处理LinkedIn
-                echo '<div class="linkedin">';
-                if (!empty($row['linkedin_1_list'])) echo htmlspecialcharsFix($row['linkedin_1_list']) . '<br>';
-                if (!empty($row['linkedin_2_list'])) echo htmlspecialcharsFix($row['linkedin_2_list']) . '<br>';
-                if (!empty($row['linkedin_3_list'])) echo htmlspecialcharsFix($row['linkedin_3_list']);
-                echo '</div>';
-                
-                // 处理Facebook
-                echo '<div class="facebook">';
-                if (!empty($row['facebook_1_list'])) echo htmlspecialcharsFix($row['facebook_1_list']) . '<br>';
-                if (!empty($row['facebook_2_list'])) echo htmlspecialcharsFix($row['facebook_2_list']) . '<br>';
-                if (!empty($row['facebook_3_list'])) echo htmlspecialcharsFix($row['facebook_3_list']);
-                echo '</div>';
-                
-                // 处理阿里巴巴
-                echo '<div class="alibaba">';
-                if (!empty($row['alibaba_1_list'])) echo htmlspecialcharsFix($row['alibaba_1_list']) . '<br>';
-                if (!empty($row['alibaba_2_list'])) echo htmlspecialcharsFix($row['alibaba_2_list']) . '<br>';
-                if (!empty($row['alibaba_3_list'])) echo htmlspecialcharsFix($row['alibaba_3_list']);
-                echo '</div>';
+                if ($contact_result && mysqli_num_rows($contact_result) > 0) {
+                    while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        echo '<div class="contact-block" style="margin-bottom: 10px; border-bottom: 1px dashed #ccc; padding-bottom: 5px;">';
+                        
+                        if (!empty($contact['contact_name'])) {
+                            echo '<div class="contact-name"><strong>' . htmlspecialcharsFix($contact['contact_name']) . '</strong></div>';
+                        }
+                        
+                        echo '<div class="tel">';
+                        if (!empty($contact['tel_1'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_1']) . '<br>';
+                        if (!empty($contact['tel_2'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_2']) . '<br>';
+                        if (!empty($contact['tel_3'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="mail">';
+                        if (!empty($contact['email_1'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_1']) . '">' . htmlspecialcharsFix($contact['email_1']) . '</a><br>';
+                        if (!empty($contact['email_2'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_2']) . '">' . htmlspecialcharsFix($contact['email_2']) . '</a><br>';
+                        if (!empty($contact['email_3'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_3']) . '">' . htmlspecialcharsFix($contact['email_3']) . '</a><br>';
+                        echo '</div>';
+                        
+                        echo '<div class="whatsapp">';
+                        if (!empty($contact['whatsapp_1'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_1']) . '<br>';
+                        if (!empty($contact['whatsapp_2'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_2']) . '<br>';
+                        if (!empty($contact['whatsapp_3'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="wechat">';
+                        if (!empty($contact['wechat_1'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_1']) . '<br>';
+                        if (!empty($contact['wechat_2'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_2']) . '<br>';
+                        if (!empty($contact['wechat_3'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="linkedin">';
+                        if (!empty($contact['linkedin_1'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_1']) . '<br>';
+                        if (!empty($contact['linkedin_2'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_2']) . '<br>';
+                        if (!empty($contact['linkedin_3'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="facebook">';
+                        if (!empty($contact['facebook_1'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_1']) . '<br>';
+                        if (!empty($contact['facebook_2'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_2']) . '<br>';
+                        if (!empty($contact['facebook_3'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="alibaba">';
+                        if (!empty($contact['alibaba_1'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_1']) . '<br>';
+                        if (!empty($contact['alibaba_2'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_2']) . '<br>';
+                        if (!empty($contact['alibaba_3'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '</div>';
+                    }
+                } else {
+                    echo '<div>无联系人信息</div>';
+                }
                 ?>
             </div>
             <div class="noteItem2">备注</div>
@@ -403,12 +385,6 @@ if (isset($totalPages) && $totalPages > 1) {
         echo "<a href=\"{$pageName}Page=" . ($page + 1) . "\">下一页</a>";
         echo "<a href=\"{$pageName}Page={$totalPages}\">尾页</a>";
     }
-    
-    echo "<input type=\"text\" id=\"Pagego\" value=\"{$page}\" 
-          onFocus=\"if(this.value == '{$page}'){this.value='';}\" 
-          onBlur=\"if(this.value == ''){this.value='{$page}';}\" 
-          onKeyUp=\"this.value=this.value.replace(/\D/g,'')\" 
-          onKeyDown=\"if(event.keyCode==13){location.href='{$pageName}Page='+document.getElementById('Pagego').value}\" />";
 }
 ?>
             </div>

+ 1 - 1
home.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 3 - 3
js/js.js

@@ -211,13 +211,13 @@ function postchk(t) {
 	case 1:
 		switch (chkact) {
 		case 2:
-			if (confirm('更改客户状态为【无响应】吗?')) $form.submit();
+			if (confirm('更改客户状态为【明确需求】吗?')) $form.submit();
 			break;
 		case 1:
-			if (confirm('更改客户状态为【已成交】吗?')) $form.submit();
+			if (confirm('更改客户状态为【背景调查】吗?')) $form.submit();
 			break;
 		case 0:
-			if (confirm('更改客户状态为【未成交】吗?')) $form.submit();
+			if (confirm('更改客户状态为【无响应】吗?')) $form.submit();
 			break;
 		default:
 			if (confirm('确认要修改吗?')) $form.submit();

+ 1 - 1
nullTag.php

@@ -8,7 +8,7 @@ while ($row = $result->fetch_assoc()) {
     $tagStr .= "<span>" . htmlspecialcharsFix($row['tagName']) . "</span>,";
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
price.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
pwdEdit.php

@@ -67,7 +67,7 @@ $row = $result->fetch_assoc();
 $em_tel = $row['em_tel'] ?? '';
 $em_email = $row['em_email'] ?? '';
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
relationshipAdd.php

@@ -30,7 +30,7 @@ if (isset($_GET['id']) && is_numeric($_GET['id'])) {
     }
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
relationships.php

@@ -17,7 +17,7 @@ if (isset($fliterStatus) && $fliterStatus !== '') {
     $urlStr .= "&FliterStatus=" . urlencode($fliterStatus);
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
searchResult.php

@@ -30,7 +30,7 @@ $searchStr = "SELECT c.cs_code, cc.contact_name as cs_name, c.cs_country, cc.tel
              OR cc.linkedin LIKE '%" . $conn->real_escape_string($keywordsNative) . "%' 
              OR cc.facebook LIKE '%" . $conn->real_escape_string($keywordsNative) . "%')";
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 119 - 115
silentCustomer.php

@@ -95,7 +95,7 @@ if (!empty($filterContact)) {
 $keys = urlencode($keys);
 $hrefstr = "?keys=" . $keys;
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -207,67 +207,73 @@ $hrefstr = "?keys=" . $keys;
             </div>
 
 <?php
-// 使用GROUP BY和GROUP_CONCAT来聚合多个联系人的信息
-$sqlStr = "SELECT c.id, MAX(c.cs_code) as cs_code, MAX(c.cs_from) as cs_from, 
-         MAX(c.cs_country) as cs_country, MAX(c.cs_type) as cs_type, MAX(c.cs_deal) as cs_deal, 
-         MAX(c.cs_addtime) as cs_addtime, MAX(c.colortag) as colortag, 
-         MAX(c.cs_note) as cs_note, MAX(c.cs_claimFrom) as cs_claimFrom, 
-         MAX(c.cs_belong) as cs_belong, MAX(c.cs_chain) as cs_chain,
-         GROUP_CONCAT(cc.contact_name SEPARATOR '<br>') as contact_names,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_1, '') SEPARATOR '<br>') as tel_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_2, '') SEPARATOR '<br>') as tel_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_3, '') SEPARATOR '<br>') as tel_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_1_format, '') SEPARATOR '<br>') as tel_1_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_2_format, '') SEPARATOR '<br>') as tel_2_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.tel_3_format, '') SEPARATOR '<br>') as tel_3_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.email_1, '') SEPARATOR '<br>') as email_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.email_2, '') SEPARATOR '<br>') as email_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.email_3, '') SEPARATOR '<br>') as email_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_1, '') SEPARATOR '<br>') as whatsapp_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_2, '') SEPARATOR '<br>') as whatsapp_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_3, '') SEPARATOR '<br>') as whatsapp_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_1_format, '') SEPARATOR '<br>') as whatsapp_1_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_2_format, '') SEPARATOR '<br>') as whatsapp_2_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.whatsapp_3_format, '') SEPARATOR '<br>') as whatsapp_3_format,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.wechat_1, '') SEPARATOR '<br>') as wechat_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.wechat_2, '') SEPARATOR '<br>') as wechat_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.wechat_3, '') SEPARATOR '<br>') as wechat_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.linkedin_1, '') SEPARATOR '<br>') as linkedin_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.linkedin_2, '') SEPARATOR '<br>') as linkedin_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.linkedin_3, '') SEPARATOR '<br>') as linkedin_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.facebook_1, '') SEPARATOR '<br>') as facebook_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.facebook_2, '') SEPARATOR '<br>') as facebook_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.facebook_3, '') SEPARATOR '<br>') as facebook_3,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.alibaba_1, '') SEPARATOR '<br>') as alibaba_1,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.alibaba_2, '') SEPARATOR '<br>') as alibaba_2,
-         GROUP_CONCAT(DISTINCT NULLIF(cc.alibaba_3, '') SEPARATOR '<br>') as alibaba_3
+// 使用SQL拼接方式
+$sqlStr = "SELECT c.id, c.cs_code, c.cs_from, c.cs_country, c.cs_type, c.cs_deal, 
+         c.cs_addtime, c.colortag, c.cs_note, c.cs_claimFrom, c.cs_belong, c.cs_chain
          FROM customer c 
-         LEFT JOIN customer_contact cc ON c.id = cc.customer_id
          WHERE (c.is_silent=1 OR (c.cs_deal=0 AND c.cs_belong=" . intval($_SESSION['employee_id']) . "))";
 
 // 添加搜索条件
 if (!empty($keyscode)) {
     $sqlStr .= " AND (c.cs_code LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.contact_name LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.email_1 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.email_2 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.email_3 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.wechat_1 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.wechat_2 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.wechat_3 LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.tel_1_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.tel_2_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.tel_3_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.whatsapp_1_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.whatsapp_2_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' 
-           OR cc.whatsapp_3_format LIKE '%" . $conn->real_escape_string($keyscode) . "%')";
+            OR c.id IN (SELECT customer_id FROM customer_contact WHERE
+                contact_name LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR
+                email_1 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                email_2 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                email_3 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR
+                wechat_1 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                wechat_2 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                wechat_3 LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR
+                tel_1_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                tel_2_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                tel_3_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR
+                whatsapp_1_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                whatsapp_2_format LIKE '%" . $conn->real_escape_string($keyscode) . "%' OR 
+                whatsapp_3_format LIKE '%" . $conn->real_escape_string($keyscode) . "%'))";
 }
 
 // 添加其他筛选条件
-$sqlStr .= $filterStr;
+if (!empty($filterContact)) {
+    switch ($filterContact) {
+        case "1": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE tel_1<>'' OR tel_2<>'' OR tel_3<>'')"; 
+            break;
+        case "2": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE wechat_1<>'' OR wechat_2<>'' OR wechat_3<>'')"; 
+            break;
+        case "3": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE whatsapp_1<>'' OR whatsapp_2<>'' OR whatsapp_3<>'')"; 
+            break;
+        case "4": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE email_1<>'' OR email_2<>'' OR email_3<>'')"; 
+            break;
+        case "5": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE linkedin_1<>'' OR linkedin_2<>'' OR linkedin_3<>'')"; 
+            break;
+        case "6": 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE facebook_1<>'' OR facebook_2<>'' OR facebook_3<>'')"; 
+            break;
+        default: 
+            $sqlStr .= " AND c.id IN (SELECT customer_id FROM customer_contact WHERE alibaba_1<>'' OR alibaba_2<>'' OR alibaba_3<>'')";
+    }
+}
 
-// 分组和排序
-$sqlStr .= " GROUP BY c.id ORDER BY MAX(c.colortag) DESC, c.id DESC";
+// Add other filter conditions
+if (!empty($filterCountry)) {
+    $sqlStr .= " AND c.cs_country=" . intval($filterCountry);
+}
+if (!empty($filterQudao)) {
+    $sqlStr .= " AND c.cs_from=" . intval($filterQudao);
+}
+if (!empty($filterDeal)) {
+    $sqlStr .= " AND c.cs_deal=" . intval($filterDeal);
+}
+if (!empty($filterBusiness)) {
+    $sqlStr .= " AND c.cs_type=" . intval($filterBusiness);
+}
+
+// 排序
+$sqlStr .= " ORDER BY c.colortag DESC, c.id DESC";
 
 $result = $conn->query($sqlStr);
 
@@ -341,69 +347,67 @@ if ($result && $result->num_rows > 0) {
         <div class="notepanel clear">
             <div class="noteItem">联系方式</div>
             <div class="lx">
-                <div class="tel">
-                    <?php
-                    $tels = [];
-                    if (!empty($row['tel_1'])) $tels[] = htmlspecialcharsFix($row['tel_1']);
-                    if (!empty($row['tel_2'])) $tels[] = htmlspecialcharsFix($row['tel_2']);
-                    if (!empty($row['tel_3'])) $tels[] = htmlspecialcharsFix($row['tel_3']);
-                    echo implode('<br>', $tels);
-                    ?>
-                </div>
-                <div class="mail">
-                    <?php
-                    $emails = [];
-                    if (!empty($row['email_1'])) $emails[] = '<a href="mailto:' . htmlspecialcharsFix($row['email_1']) . '">' . htmlspecialcharsFix($row['email_1']) . '</a>';
-                    if (!empty($row['email_2'])) $emails[] = '<a href="mailto:' . htmlspecialcharsFix($row['email_2']) . '">' . htmlspecialcharsFix($row['email_2']) . '</a>';
-                    if (!empty($row['email_3'])) $emails[] = '<a href="mailto:' . htmlspecialcharsFix($row['email_3']) . '">' . htmlspecialcharsFix($row['email_3']) . '</a>';
-                    echo implode('<br>', $emails);
-                    ?>
-                </div>
-                <div class="whatsapp">
-                    <?php
-                    $whatsapps = [];
-                    if (!empty($row['whatsapp_1'])) $whatsapps[] = htmlspecialcharsFix($row['whatsapp_1']);
-                    if (!empty($row['whatsapp_2'])) $whatsapps[] = htmlspecialcharsFix($row['whatsapp_2']);
-                    if (!empty($row['whatsapp_3'])) $whatsapps[] = htmlspecialcharsFix($row['whatsapp_3']);
-                    echo implode('<br>', $whatsapps);
-                    ?>
-                </div>
-                <div class="wechat">
-                    <?php
-                    $wechats = [];
-                    if (!empty($row['wechat_1'])) $wechats[] = htmlspecialcharsFix($row['wechat_1']);
-                    if (!empty($row['wechat_2'])) $wechats[] = htmlspecialcharsFix($row['wechat_2']);
-                    if (!empty($row['wechat_3'])) $wechats[] = htmlspecialcharsFix($row['wechat_3']);
-                    echo implode('<br>', $wechats);
-                    ?>
-                </div>
-                <div class="linkedin">
-                    <?php
-                    $linkedins = [];
-                    if (!empty($row['linkedin_1'])) $linkedins[] = htmlspecialcharsFix($row['linkedin_1']);
-                    if (!empty($row['linkedin_2'])) $linkedins[] = htmlspecialcharsFix($row['linkedin_2']);
-                    if (!empty($row['linkedin_3'])) $linkedins[] = htmlspecialcharsFix($row['linkedin_3']);
-                    echo implode('<br>', $linkedins);
-                    ?>
-                </div>
-                <div class="facebook">
-                    <?php
-                    $facebooks = [];
-                    if (!empty($row['facebook_1'])) $facebooks[] = htmlspecialcharsFix($row['facebook_1']);
-                    if (!empty($row['facebook_2'])) $facebooks[] = htmlspecialcharsFix($row['facebook_2']);
-                    if (!empty($row['facebook_3'])) $facebooks[] = htmlspecialcharsFix($row['facebook_3']);
-                    echo implode('<br>', $facebooks);
-                    ?>
-                </div>
-                <div class="alibaba">
-                    <?php
-                    $alibabas = [];
-                    if (!empty($row['alibaba_1'])) $alibabas[] = htmlspecialcharsFix($row['alibaba_1']);
-                    if (!empty($row['alibaba_2'])) $alibabas[] = htmlspecialcharsFix($row['alibaba_2']);
-                    if (!empty($row['alibaba_3'])) $alibabas[] = htmlspecialcharsFix($row['alibaba_3']);
-                    echo implode('<br>', $alibabas);
-                    ?>
-                </div>
+                <?php
+                // Fetch all contacts for this customer
+                $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                $contact_result = mysqli_query($conn, $contact_sql);
+                
+                if ($contact_result && mysqli_num_rows($contact_result) > 0) {
+                    while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        echo '<div class="contact-block" style="margin-bottom: 10px; border-bottom: 1px dashed #ccc; padding-bottom: 5px;">';
+                        
+                        if (!empty($contact['contact_name'])) {
+                            echo '<div class="contact-name"><strong>' . htmlspecialcharsFix($contact['contact_name']) . '</strong></div>';
+                        }
+                        
+                        echo '<div class="tel">';
+                        if (!empty($contact['tel_1'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_1']) . '<br>';
+                        if (!empty($contact['tel_2'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_2']) . '<br>';
+                        if (!empty($contact['tel_3'])) echo '电话: ' . htmlspecialcharsFix($contact['tel_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="mail">';
+                        if (!empty($contact['email_1'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_1']) . '">' . htmlspecialcharsFix($contact['email_1']) . '</a><br>';
+                        if (!empty($contact['email_2'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_2']) . '">' . htmlspecialcharsFix($contact['email_2']) . '</a><br>';
+                        if (!empty($contact['email_3'])) echo '邮箱: <a href="mailto:' . htmlspecialcharsFix($contact['email_3']) . '">' . htmlspecialcharsFix($contact['email_3']) . '</a><br>';
+                        echo '</div>';
+                        
+                        echo '<div class="whatsapp">';
+                        if (!empty($contact['whatsapp_1'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_1']) . '<br>';
+                        if (!empty($contact['whatsapp_2'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_2']) . '<br>';
+                        if (!empty($contact['whatsapp_3'])) echo 'WhatsApp: ' . htmlspecialcharsFix($contact['whatsapp_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="wechat">';
+                        if (!empty($contact['wechat_1'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_1']) . '<br>';
+                        if (!empty($contact['wechat_2'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_2']) . '<br>';
+                        if (!empty($contact['wechat_3'])) echo '微信: ' . htmlspecialcharsFix($contact['wechat_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="linkedin">';
+                        if (!empty($contact['linkedin_1'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_1']) . '<br>';
+                        if (!empty($contact['linkedin_2'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_2']) . '<br>';
+                        if (!empty($contact['linkedin_3'])) echo '领英: ' . htmlspecialcharsFix($contact['linkedin_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="facebook">';
+                        if (!empty($contact['facebook_1'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_1']) . '<br>';
+                        if (!empty($contact['facebook_2'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_2']) . '<br>';
+                        if (!empty($contact['facebook_3'])) echo 'Facebook: ' . htmlspecialcharsFix($contact['facebook_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '<div class="alibaba">';
+                        if (!empty($contact['alibaba_1'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_1']) . '<br>';
+                        if (!empty($contact['alibaba_2'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_2']) . '<br>';
+                        if (!empty($contact['alibaba_3'])) echo '阿里: ' . htmlspecialcharsFix($contact['alibaba_3']) . '<br>';
+                        echo '</div>';
+                        
+                        echo '</div>';
+                    }
+                } else {
+                    echo '<div>无联系人信息</div>';
+                }
+                ?>
             </div>
             <div class="noteItem2">备注</div>
             <div class="notecontent">

+ 1 - 1
statistics.php

@@ -314,7 +314,7 @@ while ($row = $detailed_orders->fetch_assoc()) {
 }
 ?>
 
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
statistics_header.php

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
subCustomers.php

@@ -81,7 +81,7 @@ if (!empty($filterContact)) {
 $keys = urlencode($keys);
 $hrefstr = "?keys=" . $keys;
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
subTag.php

@@ -15,7 +15,7 @@ if (empty($tagName)) {
     exit;
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
subTagClound.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
tag.php

@@ -39,7 +39,7 @@ while ($row = $result->fetch_assoc()) {
     $tagStr .= "<span>" . htmlspecialcharsFix($row['tagName']) . "</span>,";
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
tagClound.php

@@ -2,7 +2,7 @@
 require_once 'conn.php';
 checkLogin();
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
team.php

@@ -18,7 +18,7 @@ if (empty($dateend) || !strtotime($dateend)) {
     $dateend = date('Y-m-d 23:59:59', strtotime($dateend));
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+ 1 - 1
teamSeas.php

@@ -56,7 +56,7 @@ if ($em_role == 0) {
     $memberStr = "SELECT id FROM employee WHERE em_role=" . $em_role . " OR id=" . $em_role;
 }
 ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />