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

service/agent/database/soft_cash.php

@@ -389,8 +389,8 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'fstart' => array('yes-zdate', '>='),
-                'fend' => array('yes-zdate', '<='),
+                'fstart' => array('yes-cdate', '>='),
+                'fend' => array('yes-cdate', '<='),
                 'status' => array('yes', '!='),
                 'state' => 1,
             ),

service/agent/lib/User.php

@@ -15,7 +15,12 @@ class User
         $id = Dever::input('id');
         $info = Dever::db('agent/user_bind')->one($id);
         $status = Dever::db('agent/user_bind')->config['status'];
-
+        $audit_date='';
+        if(isset($info['aduit_date']) && $info['aduit_date']){
+            $audit_date = date('Y-m-d H:i', $info['audit_date']);
+        }else{
+            $audit_date = '-';
+        }
         /*
         $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="150" /></a>';
         if ($info['idcard_back']) {
@@ -50,7 +55,7 @@ class User
             'content' => array
             (
                 array('状态', $status[$info['status']]),
-                array('时间', date('Y-m-d H:i', $info['audit_date'])),
+                array('时间', $audit_date),
                 array('审核人', Dever::load("manage/admin-find#username", $info['admin'])),
                 array('审核备注', $info['audit_desc']),
             ),