|
@@ -30,15 +30,22 @@ class CouponFloorProcess |
|
@@ -30,15 +30,22 @@ class CouponFloorProcess |
|
30
|
|
30
|
|
|
31
|
$build = array();
|
31
|
$build = array();
|
|
32
|
foreach ($data as $k => &$v) {
|
32
|
foreach ($data as $k => &$v) {
|
|
|
|
33
|
+ $fun = '';
|
|
33
|
if (empty($v) || !is_array($v) || !array_key_exists('template_name', $v)) {
|
34
|
if (empty($v) || !is_array($v) || !array_key_exists('template_name', $v)) {
|
|
|
|
35
|
+ if (array_key_exists('templateName', $v)) {
|
|
|
|
36
|
+ $fun = $v['templateName'];
|
|
|
|
37
|
+ } else {
|
|
34
|
continue;
|
38
|
continue;
|
|
35
|
}
|
39
|
}
|
|
|
|
40
|
+ }
|
|
|
|
41
|
+ if ($fun !== 'single_image') {
|
|
36
|
$fun = $v['template_name'];
|
42
|
$fun = $v['template_name'];
|
|
|
|
43
|
+ }
|
|
37
|
if (empty($v['data']) || !is_callable("self::$fun")) {
|
44
|
if (empty($v['data']) || !is_callable("self::$fun")) {
|
|
38
|
continue;
|
45
|
continue;
|
|
39
|
}
|
46
|
}
|
|
40
|
// tar note 处理楼层标题
|
47
|
// tar note 处理楼层标题
|
|
41
|
- if ($fun === 'getCoupon' && $data[$k - 1]['template_name'] === 'text') {
|
48
|
+ if ($fun === 'getCoupon' && array_key_exists('template_name', $data[$k - 1]) && $data[$k - 1]['template_name'] === 'text') {
|
|
42
|
$v['data']['floorTitle'] = $data[$k - 1]['data'];
|
49
|
$v['data']['floorTitle'] = $data[$k - 1]['data'];
|
|
43
|
}
|
50
|
}
|
|
44
|
$build = self::$fun($v['data']);
|
51
|
$build = self::$fun($v['data']);
|
|
@@ -63,8 +70,10 @@ class CouponFloorProcess |
|
@@ -63,8 +70,10 @@ class CouponFloorProcess |
|
63
|
return array();
|
70
|
return array();
|
|
64
|
}
|
71
|
}
|
|
65
|
foreach ($data['list'] as &$item) {
|
72
|
foreach ($data['list'] as &$item) {
|
|
66
|
- $imageSrc = Images::getImageUrl($item['src'], 0, 0);
|
|
|
|
67
|
- $item['src'] = $imageSrc;
|
73
|
+ $item['img'] = Images::getImageUrl($item['src'], 0, 0);
|
|
|
|
74
|
+ if (!is_string($item['url'])) {
|
|
|
|
75
|
+ $item['url'] = '';
|
|
|
|
76
|
+ }
|
|
68
|
}
|
77
|
}
|
|
69
|
$data['isCarouselBanner'] = true;
|
78
|
$data['isCarouselBanner'] = true;
|
|
70
|
return $data;
|
79
|
return $data;
|
|
@@ -132,14 +141,15 @@ class CouponFloorProcess |
|
@@ -132,14 +141,15 @@ class CouponFloorProcess |
|
132
|
|
141
|
|
|
133
|
/**
|
142
|
/**
|
|
134
|
*
|
143
|
*
|
|
135
|
- * 单张图片的处理方法，不用
|
144
|
+ * 单张图片的处理方法
|
|
136
|
*
|
145
|
*
|
|
137
|
* @param $data
|
146
|
* @param $data
|
|
138
|
* @return mixed
|
147
|
* @return mixed
|
|
139
|
*/
|
148
|
*/
|
|
140
|
private static function single_image($data)
|
149
|
private static function single_image($data)
|
|
141
|
{
|
150
|
{
|
|
142
|
- $data['isSingleImage'] = true;
|
|
|
|
143
|
- return $data;
|
151
|
+ $data[0]['src'] = Images::getImageUrl($data[0]['src'], 0, 0);
|
|
|
|
152
|
+ $data[0]['isSingleImage'] = true;
|
|
|
|
153
|
+ return $data[0];
|
|
144
|
}
|
154
|
}
|
|
145
|
} |
155
|
} |
