edit

service/agent/lib/Dhorder.php

@@ -1178,7 +1178,7 @@ class Dhorder
    }
    #权益订单导出
     public function out_dhorder_api($data){
-        $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
+        $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品数量', '商品原价','订单状态','下单时间', '付款时间', '发货时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
@@ -1190,6 +1190,13 @@ class Dhorder
                     $res=Dever::load('agent/address')->getOne($address['mid'],$address['id']);
                 }
             }
+
+            $fhdate = '';
+            $buy_order = Dever::db('shop/buy_order')->find(array('parent_id' => 3, 'parent_order_id' => $v['id']));
+            if ($buy_order) {
+                $ps = Dever::db('shop/sell_order_ps')->find(array('order_id' => $buy_order['id']));
+                $fhdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
+            }
             
             $fdate = '';
             if($v['fdate']){
@@ -1240,6 +1247,7 @@ class Dhorder
                 $status,
                 date('Y-m-d H:i',$v['cdate']),
                 date('Y-m-d H:i',$v['cdate']),
+                $fhdate,
                 $fdate,
                 $v['audit_desc'],
                 $quanyi,

service/agent/src/My.php

@@ -424,17 +424,22 @@ class My extends Core
                 $idcard_path = (array)json_decode($update['idcard_path']);
                 if($idcard_path['face']){
                     $rest = (array)$idcard_path['face'];
-                    if($this->user['name'] != $rest['name'] || $this->user['idcard'] != $rest['idNumber']){
-                        Dever::alert('姓名或身份证号不匹配');
+                    if (isset($rest['name'])) {
+                        if($this->user['name'] != $rest['name'] || $this->user['idcard'] != $rest['idNumber']){
+                            Dever::alert('姓名或身份证号不匹配');
+                        }
                     }
+                    
                 }
                 if($idcard_path['back']){
                     $rest = (array)$idcard_path['back'];
-                    $date = explode('-',$rest['validPeriod']);
-                    if($date[1] && $date[1]!='长期'){
-                        $cdate = strtotime(str_replace('.','-',$date[1]));
-                        if(time()>=$cdate){
-                            Dever::alert('身份证背面已过期');
+                    if (isset($rest['validPeriod'])) {
+                        $date = explode('-',$rest['validPeriod']);
+                        if($date[1] && $date[1]!='长期'){
+                            $cdate = strtotime(str_replace('.','-',$date[1]));
+                            if(time()>=$cdate){
+                                Dever::alert('身份证背面已过期');
+                            }
                         }
                     }
                 }

service/bill/database/tixian.php

@@ -22,6 +22,14 @@ $manage_status = array
     2 => '已发放',
     3 => '已作废',
 );
+
+$type = array
+(
+    1 => '代理商提现',
+    2 => '门店提现',
+    3 => '用户钱包提现',
+);
+
 $list_button = array();
 $list_button['list'] = array('查看详情', '"push_cash&project=bill&id={cash_id}&page_type=1&[refer]"');
 if (Dever::load('manage/auth')->checkFunc('bill.tixian', 'edit1', '发放')) {

service/option/database/agreement.php

@@ -452,7 +452,7 @@ return array
             'option' => array
             (
                 'aid' => 'yes',
-                'audit' => 'yes',
+                'audit' => array('yes', 'in'),
                 'state' => 1,
             ),
             'type' => 'all',

service/option/lib/Account.php

@@ -17,6 +17,8 @@ class Account
 
             $table = array();
             if ($account['idcard_front']) {
+                $account['idcard_front'] = Dever::load('upload/view')->get($account['idcard_front'], 't', 1);
+                $account['idcard_back'] = Dever::load('upload/view')->get($account['idcard_back'], 't', 1);
                 $account['idcard_front'] = Dever::load('upload/view')->get($account['idcard_front'], 't', 1);
                 $table['<img src="'.$account['idcard_front'].'" width="100">'] = '<img src="'.$account['idcard_back'].'" width="100">';
             }