新增前台客户端工单列表全局搜索。

修复手机端查看客户信息弹窗位置异常的问题。
修复本地应用登录按钮没有登录框的问题。
修复特定联系方式在添加工单会存在报错的可能。

App/Form/GET/Member.php

@@ -80,12 +80,15 @@ class Member extends \Core\Controller\Controller {
      */
     private function ticketList($page = 15){
         $condition = '';
+        $join = [];
         $param = ['member_id' => $this->session()->get('member')['member_id']];
+
         //关键词搜索
         if(!empty($_GET['keyword'])){
+            $join[] = " LEFT JOIN {$this->prefix}ticket_content AS tc ON tc.ticket_id = t.ticket_id ";
             $keyword = $this->g('keyword');
-            $condition .= ' AND (ticket_number LIKE :ticket_number OR ticket_title LIKE :ticket_title)  ';
-            $param['ticket_number'] = $param['ticket_title'] = "%{$keyword}%";
+            $condition .= ' AND (ticket_number LIKE :ticket_number OR ticket_title LIKE :ticket_title OR tc.ticket_form_content LIKE :ticket_form_content OR tc.ticket_form_option_name LIKE :ticket_form_option_name )  ';
+            $param['ticket_form_option_name'] = $param['ticket_form_content'] = $param['ticket_number'] = $param['ticket_title'] = "%{$keyword}%";
         }
         //快速日期搜索
         if(!empty($_GET['dataType'])){
@@ -118,7 +121,8 @@ class Member extends \Core\Controller\Controller {
         }
 
         $sql = "SELECT %s FROM {$this->prefix}ticket AS t
-                LEFT JOIN {$this->prefix}ticket_model AS tm ON tm.ticket_model_id = t.ticket_model_id
+                LEFT JOIN {$this->prefix}ticket_model AS tm ON tm.ticket_model_id = t.ticket_model_id 
+                ".implode(' ', $join)."
                 WHERE t.member_id = :member_id {$condition}
                 ORDER BY t.ticket_submit_time DESC
                 ";

Model/Ticket.php

@@ -64,7 +64,7 @@ class Ticket extends \Core\Model\Model {
         $param['ticket_contact_account'] = self::isP('contact_account', '请填写您的联系信息');
 
         //微信和小程序选项不验证格式
-        if (\Model\Extra::checkInputValueType($param['ticket_contact_account'], $param['ticket_contact']) === false && !in_array($param['ticket_contact'], ['3', '6'])) {
+        if (\Model\Extra::checkInputValueType($param['ticket_contact_account'], $param['ticket_contact']) === false && in_array($param['ticket_contact'], ['1', '2'])) {
             self::error('您填写联系方式的信息格式不正确。');
         }
 

Public/Install/version

-1.3.9
\ No newline at end of file
+1.3.10
\ No newline at end of file

Public/Theme/Ticket/Common/Ticket_view_package.php

@@ -49,7 +49,7 @@
                     <div class="am-u-sm-12 am-u-lg-3">
                         <?php if (!empty($this->session()->get('ticket')['user_id']) && !empty($member)): ?>
                         <span class="pt-text-explode">客户信息 :
-                            <div class="am-dropdown" data-am-dropdown>
+                            <div class="am-dropdown ticket-member-table-dropdown" data-am-dropdown>
                                 <a href="javascript:;" class=" am-dropdown-toggle" data-am-dropdown-toggle><?= $member['member_name'] ?> <span class="am-icon-caret-down"></span></a>
                                 <ul class="am-dropdown-content">
                                     <li class="am-dropdown-header">客户详细信息</li>

Public/Theme/Ticket/Default/Application/Application_local.php

@@ -72,6 +72,7 @@
         </div>
     </div>
 </div>
+<div id="app-list" class="am-hide" project="5" version="<?= $system['version'] ?>">正在连接PESCMS应用商店...</div>
 <div class="pes-installed am-hide"><?= empty($installed) ? json_encode([]) : $installed ?></div>
 <script src="<?= PESCMS_URL ?>/Theme/Api/App/1.0/pescms_app.min.js?mt=<?= time() ?>"></script>
 <script>

Public/Theme/Ticket/Default/Ticket/Ticket_handle.php

 <div class="am-padding-xs am-padding-top-0">
-    <?php require THEME . '/Ticket/Common/Ticket_view_package.php'; ?>
+    <?php require_once THEME . '/Ticket/Common/Ticket_view_package.php'; ?>
 
     <?php if ($ticket_status < 3 && $ticket_close == '0' && ($user_id == $this->session()->get('ticket')['user_id'] || empty($user_id) || $label->checkAuth('TicketPUTTicketintervene') === true )): ?>
         <form action="<?= $label->url('Ticket-Ticket-reply'); ?>" class="am-form ajax-submit" method="POST" data-am-validator>

Public/Theme/assets/css/ticket.css

@@ -18,6 +18,14 @@
     .ticket-search-form .am-selected{
         margin-bottom: 10px;
     }
+    .ticket-member-table-dropdown .am-dropdown-content{
+        left: 0 !important;
+        right: auto !important;
+
+    }
+    .ticket-member-table{
+        width: 31vh;
+    }
 }
 
 

Public/Theme/assets/css/ticket.min.css

-.msg-tips{display:block;width:10px;height:10px;background-color:#f65645;border-radius:5px;left:28px;top:13px;position:absolute}@media only screen and (max-width:640px){.msg-tips{width:5pt;height:5pt;top:7px}.ticket-search-form .am-selected{margin-bottom:10px}}@media only screen and (min-width:641px){#mobile-new-tips{display:none!important}}@media only screen and (min-width:1025px){.ticket-index-table tr td:last-child{width:10rem}.ticket-remark-input{min-width:30rem}.ticket-member-table{width:750px}}.admin-task-meta{color:#888}.admin-task-bd,.ticket-operation-bd{margin-top:.5rem}.admin-task-bd a{color:#333}.ticket-operation-bd a{color:#06c}.admin-task-bd a:hover{color:#a9a9a9}#setting-panel .am-tabs-bd{border:none!important}.ticket-timeout,.ticket-timeout a{font-weight:700;color:#ff4500}.sms-1,.sms-2{display:none}.pes-ucheck{padding-left:22px!important;position:relative!important;-webkit-transition:color .25s linear!important;transition:color .25s linear!important;font-size:14px!important;line-height:1.5!important}@media only screen and (min-width:1025px){.pes-ticket-search-input{width:250px!important}}.assign-user select option:disabled{color:#ccc}
\ No newline at end of file
+.msg-tips{display:block;width:10px;height:10px;background-color:#f65645;border-radius:5px;left:28px;top:13px;position:absolute}@media only screen and (max-width:640px){.msg-tips{width:5pt;height:5pt;top:7px}.ticket-search-form .am-selected{margin-bottom:10px}.ticket-member-table-dropdown .am-dropdown-content{left:0!important;right:auto!important}.ticket-member-table{width:31vh}}@media only screen and (min-width:641px){#mobile-new-tips{display:none!important}}@media only screen and (min-width:1025px){.ticket-index-table tr td:last-child{width:10rem}.ticket-remark-input{min-width:30rem}.ticket-member-table{width:750px}}.admin-task-meta{color:#888}.admin-task-bd,.ticket-operation-bd{margin-top:.5rem}.admin-task-bd a{color:#333}.ticket-operation-bd a{color:#06c}.admin-task-bd a:hover{color:#a9a9a9}#setting-panel .am-tabs-bd{border:none!important}.ticket-timeout,.ticket-timeout a{font-weight:700;color:#ff4500}.sms-1,.sms-2{display:none}.pes-ucheck{padding-left:22px!important;position:relative!important;-webkit-transition:color .25s linear!important;transition:color .25s linear!important;font-size:14px!important;line-height:1.5!important}@media only screen and (min-width:1025px){.pes-ticket-search-input{width:250px!important}}.assign-user select option:disabled{color:#ccc}
\ No newline at end of file

Upgrade/action.ini

@@ -41,4 +41,6 @@ delete[]= 'Upgrade/sql/1.3.8.sql';
 
 [1.3.9]
 sql[] = '1.3.9.sql';
-delete[]= 'Upgrade/sql/1.3.9.sql';
\ No newline at end of file
+delete[]= 'Upgrade/sql/1.3.9.sql';
+
+[1.3.10]
\ No newline at end of file