|
@@ -531,7 +531,12 @@ class Order
|
|
$v['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
$v['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
if($v['status'] == 1 || $v['status'] == 2){
|
|
if($v['status'] == 1 || $v['status'] == 2){
|
|
$admin = Dever::load('manage/admin-find',$v['admin']);
|
|
$admin = Dever::load('manage/admin-find',$v['admin']);
|
|
- $v['cdate'] .= '<br/>操作人:'.$admin['username'].'<br/>备注:'.$v['desc'];
|
|
|
|
|
|
+ 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']);
|
|
$result[$info['order_num']]['content'][] = array($process_status[$v['status']], $v['cdate']);
|
|
}
|
|
}
|