|
|
@@ -198,7 +198,7 @@ class Sell
|
|
|
$info['card'] = array();
|
|
|
if ($info['card_code_id'] > 0) {
|
|
|
$config = Dever::db('main/sell_config')->find();
|
|
|
- $data['card']['name'] = $config['card_name'];
|
|
|
+ $info['card']['name'] = $config['card_name'];
|
|
|
|
|
|
$card_code = Dever::db('card/code')->find($info['card_code_id']);
|
|
|
if ($card_code) {
|
|
|
@@ -207,11 +207,11 @@ class Sell
|
|
|
$card_type = Dever::db('card/type')->find($card_info['type_id']);
|
|
|
|
|
|
$card = substr($card_code['card'], -4);
|
|
|
- $data['card']['name'] .= '（'.$card_type['name'].$card.'）';
|
|
|
- $data['card']['info'] = $card_info;
|
|
|
- $data['card']['id'] = $card_code['id'];
|
|
|
- $data['card']['card'] = $card_code['card'];
|
|
|
- $data['card']['cash'] = $info['card_code_cash'];
|
|
|
+ $info['card']['name'] .= '（'.$card_type['name'].$card.'）';
|
|
|
+ $info['card']['info'] = $card_info;
|
|
|
+ $info['card']['id'] = $card_code['id'];
|
|
|
+ $info['card']['card'] = $card_code['card'];
|
|
|
+ $info['card']['cash'] = $info['card_code_cash'];
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -298,7 +298,7 @@ class Sell
|
|
|
if ($this->view == 2) {
|
|
|
$check = false;
|
|
|
if (isset($card_info) && $card_info) {
|
|
|
- $data['card']['goods'] = array();
|
|
|
+ $info['card']['goods'] = array();
|
|
|
$check = false;
|
|
|
$goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_info['id']));
|
|
|
if ($goods || $card_info['category']) {
|
|
|
@@ -316,11 +316,11 @@ class Sell
|
|
|
}
|
|
|
if ($goods) {
|
|
|
if (in_array($v['goods_id'], $goods)) {
|
|
|
- $data['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
+ $info['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
}
|
|
|
} elseif ($card_info['category']) {
|
|
|
if (in_array($info['goods'][$k]['info']['top_category_id'], $card_info['category'])) {
|
|
|
- $data['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
+ $info['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
}
|
|
|
}
|
|
|
}
|
rabin