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

service/agent/lib/Order.php

@@ -529,10 +529,18 @@ class Order
         if ($process) {
             foreach ($process as $k => $v) {
                 $v['cdate'] = date('Y-m-d H:i', $v['cdate']);
+                if($v['status'] == 1 || $v['status'] == 2){
+                    $admin = Dever::load('manage/admin-find',$v['admin']);
+                    if($v['desc']){
+                         $v['cdate'] .= '<br/>操作人：'.$admin['username'].'<br/>备注：'.$v['desc'];
+                     }else{
+                        $v['cdate'] .= '<br/>操作人：'.$admin['username'];
+                     }
+                    
+                } 
                 $result[$info['order_num']]['content'][] = array($process_status[$v['status']], $v['cdate']);
             }
         }
-
         $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="100" /></a>';
         if ($info['idcard_back']) {
             $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="100" /></a>';