|
|
@@ -190,16 +190,34 @@ class PurchaseClass extends BaseClass
|
|
|
];
|
|
|
}
|
|
|
|
|
|
- $list[$key]['sendProgress'] = ['title' => '已取货,配送中'];
|
|
|
-
|
|
|
+ $list[$key]['sendProgress'] = [];
|
|
|
if ($showProduct) {
|
|
|
- $list[$key]['product'] = [
|
|
|
- [
|
|
|
- 'cover' => 'https://img.huahb.com/uploads/12358/202101/13/0e713d46064ca89b1fb11095b710f244_small.jpeg',
|
|
|
- 'name' => '昆明B级红玫瑰卡罗拉', 'property' => 'B级', 'price' => '8.45', 'bigNum' => 2,
|
|
|
- 'smallNum' => 10
|
|
|
- ],
|
|
|
- ];
|
|
|
+ $orderSn = $val['orderSn'];
|
|
|
+ $orderItem = PurchaseItemClass::getOrderItemDetail($orderSn);
|
|
|
+ $itemData = [];
|
|
|
+ if($orderItem) {
|
|
|
+ foreach ($orderItem as $v) {
|
|
|
+ $info = json_decode($v['itemInfo'],true);
|
|
|
+ $tmp = $info;
|
|
|
+ $tmp['cover'] = self::groupImg($info['itemCover']);
|
|
|
+ unset($v['itemInfo']);
|
|
|
+ //兼容 旧数据,没有 rank (花材等级 默认给B)
|
|
|
+ if(!isset($tmp['rank'])){
|
|
|
+ $tmp['rank']= 'B';
|
|
|
+ }
|
|
|
+ $tmp['name'] = $tmp['itemName'];
|
|
|
+ $tmp = array_merge($tmp,$v);
|
|
|
+ $itemData[] = $tmp;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $list[$key]['product'] = $itemData;
|
|
|
+// $list[$key]['product'] = [
|
|
|
+// [
|
|
|
+// 'cover' => 'https://img.huahb.com/uploads/12358/202101/13/0e713d46064ca89b1fb11095b710f244_small.jpeg',
|
|
|
+// 'name' => '昆明B级红玫瑰卡罗拉', 'property' => 'B级', 'price' => '8.45', 'bigNum' => 2,
|
|
|
+// 'smallNum' => 10
|
|
|
+// ],
|
|
|
+// ];
|
|
|
}
|
|
|
}
|
|
|
return $list;
|