|
|
@@ -87,6 +87,7 @@ class Order extends Base
|
|
|
'num' => $num,
|
|
|
'integral' =>$spec_info['integral'] * $num,
|
|
|
'int_cash' =>$int_cash,
|
|
|
+ 'spec_img' =>$spec_info['spec_img'],
|
|
|
'sell_money'=>$spec_info['sell_money'],
|
|
|
'spec_exp' =>$spec_info['spec_exp'],
|
|
|
'spec_key' =>$spec_info['spec_key'],
|
|
|
@@ -249,6 +250,7 @@ class Order extends Base
|
|
|
'num' =>$tv['num'],
|
|
|
'integral' => isset($sv['integral']) ? $sv['integral'] * $tv['num'] : 0,
|
|
|
'int_cash' =>'--',
|
|
|
+ 'spec_img' =>$sv['spec_img'],
|
|
|
'sell_money'=>$sv['sell_money'],
|
|
|
'spec_exp' =>$sv['spec_exp'],
|
|
|
'spec_key' =>$sv['spec_key'],
|
|
|
@@ -360,13 +362,6 @@ class Order extends Base
|
|
|
{
|
|
|
$order_id = input('id',0);
|
|
|
$detail = Db::table('store_order')->find($order_id);
|
|
|
- foreach (json_decode($detail['pro_info'],true) as &$pv) {
|
|
|
- $spec_info = get_goods_spec($pv['goods_id'],$pv['goods_no']);
|
|
|
- $pv['spec_img'] = $spec_info['spec_img'];
|
|
|
- $pv['spec_exp'] = $spec_info['spec_exp'];
|
|
|
- $pv['spec_key'] = $spec_info['spec_key'];
|
|
|
- }
|
|
|
-
|
|
|
$this->success('获取成功',$detail);
|
|
|
|
|
|
}
|
|
|
@@ -455,14 +450,6 @@ class Order extends Base
|
|
|
->order('o.id desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
->select();
|
|
|
- array_walk($list,function (&$val){
|
|
|
- foreach (json_decode($val['pro_info'],true) as &$pv ){
|
|
|
- $spec_info = get_goods_spec($pv['goods_id'],$pv['goods_no']);
|
|
|
- $pv['spec_img'] = $spec_info['spec_img'];
|
|
|
- $pv['spec_exp'] = $spec_info['spec_exp'];
|
|
|
- $pv['spec_key'] = $spec_info['spec_key'];
|
|
|
- }
|
|
|
- });
|
|
|
$this->success('获取成功',$list);
|
|
|
|
|
|
}
|
