|
@@ -1346,12 +1346,15 @@ class Dhorder
|
|
|
|
|
|
if($v['name'] && $v['total_num']>0 && $v['type_id']!=8){
|
|
if($v['name'] && $v['total_num']>0 && $v['type_id']!=8){
|
|
$key = $v['type'] . '_' . $v['type_id'];
|
|
$key = $v['type'] . '_' . $v['type_id'];
|
|
|
|
+ if ($v['type'] == 2) {
|
|
|
|
+ $card = Dever::db('card/info')->find($v['type_id']);
|
|
|
|
+ $v['name'] = $card['name'];
|
|
|
|
+ }
|
|
if ($v['type'] == 1) {
|
|
if ($v['type'] == 1) {
|
|
$res[0][$key] = array($v['name'], '价值');
|
|
$res[0][$key] = array($v['name'], '价值');
|
|
} else {
|
|
} else {
|
|
- $card = Dever::db('card/info')->find($v['type_id']);
|
|
|
|
- $res[0][$key] = array($card['name'], '');
|
|
|
|
- $res[2][$key] = $card['name'];
|
|
|
|
|
|
+ $res[0][$key] = array($v['name'], '');
|
|
|
|
+ $res[2][$key] = $v['name'];
|
|
}
|
|
}
|
|
$res[1][$key] = $v['name'];
|
|
$res[1][$key] = $v['name'];
|
|
}
|
|
}
|