|
@@ -163,20 +163,18 @@ Class User extends Core
|
|
|
$data['info']['share_name'] = $active['share_name'];
|
|
|
}
|
|
|
$data['info']['mobile'] = $active['mobile'];
|
|
|
- $data['info']['field'] = Dever::db('active/info_field')->getList(array('active_id'=>$data['info']['active_id'],'state'=>1));
|
|
|
- foreach($data['info']['field'] as $k => $v){
|
|
|
- if($v['type'] == 2) {
|
|
|
- $data['info']['field'][$k]['value_name']= Dever::db('active/info_field_value')->getList(array('active_id'=>$data['info']['active_id'],'field_id'=>$v['id']));
|
|
|
-
|
|
|
- }else{
|
|
|
- $data['info']['field'][$k]['value_name'] = '';
|
|
|
+ $data['info']['field'] = array();
|
|
|
+ if ($data['info']['path']) {
|
|
|
+ $data['info']['field'] = json_decode($data['info']['path']);
|
|
|
+ foreach ($data['info']['field'] as $k => $v) {
|
|
|
+ $data['info']['field'][$k] = (array)$v;
|
|
|
}
|
|
|
}
|
|
|
#使用核销码
|
|
|
$code = Dever::db('active/code')->getCode(array('order_id'=>$id,'status'=>'1,2'));
|
|
|
- // if (!$data['info']['refund_num']){
|
|
|
- // $data['info']['refund_num'] = 0;
|
|
|
- // }
|
|
|
+ if (!$data['info']['refund_num']){
|
|
|
+ $data['info']['refund_num'] = 0;
|
|
|
+ }
|
|
|
$no_code = $data['info']['num']-count($code)-$data['info']['refund_num'];
|
|
|
if ($data['info']['status'] == 2) {
|
|
|
$data['info']['use_code'] = '已使用'.count($code).'个';
|