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

service/agent/lib/Order.php

@@ -1768,11 +1768,15 @@ class Order
                         $record = $db->fetch('select sum(num) as total from `ims_ewei_shop_member_credit_record` where `remark` LIKE "%推荐%" and `remark` LIKE "%'.$member['openid'].'%" and credittype = "credit2"');
                     }
 
-                    if (isset($record) && $record && isset($record['total'])) {
+                    if (isset($record) && $record && isset($record['total']) && $record['total']) {
                         $cash += $record['total'];
                     }
                 }
             }
+
+            if (!$cash) {
+                $cash = 0;
+            }
             
             $d = array
             (

service/option/database/account.php

@@ -216,7 +216,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $is_idcard,
             'search'    => 'select,order',
-            'order'     => 'asc',
+            //'order'     => 'asc',
             //'update'    => 'radio',
             'list'      => $search_auth == 1 ? 'Dever::load("option/lib/account.getIdcard", {id})' : false,
             'list_order' => 3,
@@ -319,6 +319,16 @@ return array
             'desc'      => '审核时间',
         ),
 
+        'up_date'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '上传资料的时间',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'order'     => 'desc',
+            'desc'      => '上传资料的时间',
+        ),
+
         'option-agreement-status'=> array
         (
             'name'      => '名称',

service/option/src/My.php

@@ -258,6 +258,7 @@ class My extends Core
             $where['audit'] = 2;
             $where['status'] = 2;
             $where['is_idcard'] = 1;
+            $where['up_date'] = time();
             Dever::db('option/account')->update($where);
 
             Dever::db('option/member')->update(array('where_id' => $this->user['mid'], 'idcard_bind' => 1));

service/setting/lib/Idcard.php

@@ -46,15 +46,25 @@ class Idcard
             			return $v['data'];
             		}
             	}else{
-            		Dever::alert('身份证正面有误');
+            		Dever::alert('请上传正确的身份证正面图片');
             	}
             }elseif($type == 2){
             	if(isset($rest['back']) && $rest['back']){
             		foreach($rest as $k =>$v){
+                        if (isset($v['data']['validPeriod'])) {
+                            $date = explode('-',$v['data']['validPeriod']);
+                            $cdate = strtotime(str_replace('.','-',$date[1]));
+                            if(time()>=$cdate){
+                                Dever::alert('身份证背面已过期');
+                            }
+                        } else {
+                            Dever::alert('请上传正确的身份证背面图片');
+                        }
+
             			return $v['data'];
             		}
             	}else{
-            		Dever::alert('身份证背面已过期');
+            		Dever::alert('请上传正确的身份证背面图片');
             	}
             }
            //  if(isset($rest['face']) && $rest['face']){