|
@@ -169,6 +169,20 @@ Class User extends Core
|
|
|
foreach ($data['info']['field'] as $k => $v) {
|
|
|
$data['info']['field'][$k] = (array)$v;
|
|
|
}
|
|
|
+ foreach ($data['info']['field'] as $k => $v) {
|
|
|
+ $field = Dever::db('active/info_field')->find($v['id']);
|
|
|
+ if ($field) {
|
|
|
+ if ($field['type'] == 1){
|
|
|
+ $data['info']['field'][$k]['name'] = $field['name'];
|
|
|
+ } elseif($field['type'] == 2) {
|
|
|
+ $data['info']['field'][$k]['name'] = $field['name'] ;
|
|
|
+ $field_value = Dever::db('active/info_field')->find($v['value']);
|
|
|
+ if ($field_value) {
|
|
|
+ $data['info']['field'][$k]['value'] = $field_value['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
#使用核销码
|
|
|
$code = Dever::db('active/code')->getCode(array('order_id'=>$id,'status'=>'1,2'));
|