Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

tool/work/assets/pc/html/index.html

@@ -263,7 +263,7 @@ body{
     </div>
     <{endif}>
     <{if(isset($info['pic']) && $info['pic']):}>
-      <div id="layer-photos-<{$info['id']}>" class="grid-demo layui-col-xs5 layer-photos-demo " id="tk">
+      <div id="layer-photos-<{$info['id']}>" class="grid-demo layer-photos-demo " id="tk">
       <{foreach($info['pic'] as $k => $v):}>
           <img src='<{$v}>' id='show' class="fd show" height='100px'>
         <{endforeach}>
@@ -291,7 +291,7 @@ body{
       <video class="player " height="100px" src="<{$v['video']}>" onclick="player($(this))">查看视频</video>
       </div>
        <{endif}>
-      <div id="layer-photos_log-<{$v['id']}>" class="layer-photos-demo layui-col-xs5" id="tk">
+      <div id="layer-photos_log-<{$v['id']}>" class="layer-photos-demo" id="tk">
       
       <{if(isset($v['pic'])):}>
       <{foreach($v['pic'] as $k1 => $v1):}>

tool/work/database/info.php

@@ -151,19 +151,13 @@ return array
         'mobile'      => array
         (
             'type'      => 'bigint-11',
-            'name'      => '手机号/姓名',
+            'name'      => '手机号',
             'default'   => '',
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             // 'is_numeric',
             'update'    => 'text',
-            'search'    => array
-            (
-                'api' => 'work/info-getSearch',
-                'col' => 'col',
-                'result' => 'id',
-                'search' => 'id',
-            ),
+            
             'value'     => Dever::input('search_option_mobile'),
             # 绑定js脚本，更新时使用，第一个参数是执行的方式，第二个参数执行的方法，第三个参数是传值。
             'bind'        => array('onblur', 'loading', array('url' => Dever::url("lib/manage.search","work"))),
@@ -180,6 +174,7 @@ return array
             'desc'      => '用户姓名（或微信名）',
             'match'     => 'option',
             'update'    => 'text',
+
             // 'search'    => 'fulltext',
             // 'list'      => true,
         ),
@@ -187,11 +182,18 @@ return array
         'work_num'      => array
         (
             'type'      => 'varchar-100',
-            'name'      => '工单号',
+            'name'      => '用户姓名/手机号',
             'default'   => '',
             'desc'      => '工单号',
             'match'     => 'is_string',
             'update'    => 'hidden',
+            'search'    => array
+            (
+                'api' => 'work/info-getSearch',
+                'col' => 'col',
+                'result' => 'id',
+                'search' => 'id',
+            ),
             // 'search'    => 'fulltext',
             // 'list'      => true,
         ),