|
@@ -281,7 +281,7 @@ class special_formater
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
|
|
|
|
- public static function format_goods($goods_ids,$title,$sort_summary)
|
|
|
|
|
|
+ public static function format_goods($goods_ids,$title,$sort_summary,$show_type='goods',$type='goods')
|
|
{
|
|
{
|
|
$result = [];
|
|
$result = [];
|
|
|
|
|
|
@@ -292,9 +292,9 @@ class special_formater
|
|
{
|
|
{
|
|
$summary = $sort_summary[$goods_id];
|
|
$summary = $sort_summary[$goods_id];
|
|
$item['image'] = $summary['goods_image_url'];
|
|
$item['image'] = $summary['goods_image_url'];
|
|
- $item['show_type'] = "goods";
|
|
|
|
|
|
+ $item['show_type'] = $show_type;
|
|
$item['show_data'] = strval($goods_id);
|
|
$item['show_data'] = strval($goods_id);
|
|
- $item['type'] = "goods";
|
|
|
|
|
|
+ $item['type'] = $type;
|
|
$item['data'] = strval($goods_id);
|
|
$item['data'] = strval($goods_id);
|
|
$item['title'] = $summary['goods_mobile_name'];
|
|
$item['title'] = $summary['goods_mobile_name'];
|
|
$result['items'][] = $item;
|
|
$result['items'][] = $item;
|
|
@@ -830,27 +830,34 @@ class special_manager
|
|
return self::$stInstance;
|
|
return self::$stInstance;
|
|
}
|
|
}
|
|
|
|
|
|
- public function special($special_id,&$goods_ids)
|
|
|
|
|
|
+ public function special($special_id,&$goods_ids,$pub=true)
|
|
{
|
|
{
|
|
- if(StatesHelper::fetch_state('special')) {
|
|
|
|
- $this->mContents = [];
|
|
|
|
- }
|
|
|
|
|
|
+ if($pub)
|
|
|
|
+ {
|
|
|
|
+ if(StatesHelper::fetch_state('special')) {
|
|
|
|
+ $this->mContents = [];
|
|
|
|
+ }
|
|
|
|
|
|
- $special_id = intval($special_id);
|
|
|
|
- if(array_key_exists($special_id,$this->mContents)) {
|
|
|
|
- $data = $this->mContents[$special_id]['data'];
|
|
|
|
- $goods_ids = $this->mContents[$special_id]['gids'];
|
|
|
|
- return $data;
|
|
|
|
|
|
+ $special_id = intval($special_id);
|
|
|
|
+ if(array_key_exists($special_id,$this->mContents)) {
|
|
|
|
+ $data = $this->mContents[$special_id]['data'];
|
|
|
|
+ $goods_ids = $this->mContents[$special_id]['gids'];
|
|
|
|
+ return $data;
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ $formater = new special_formater($special_id,$this->old_version($special_id));
|
|
|
|
+ $data = $formater->format($goods_ids);
|
|
|
|
+
|
|
|
|
+ $this->mContents[$special_id]['data'] = $data;
|
|
|
|
+ $this->mContents[$special_id]['gids'] = $goods_ids;
|
|
|
|
+ return $data;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
|
|
|
|
- $formater = new special_formater($special_id,$this->old_version($special_id));
|
|
|
|
- $data = $formater->format($goods_ids);
|
|
|
|
-
|
|
|
|
- $this->mContents[$special_id]['data'] = $data;
|
|
|
|
- $this->mContents[$special_id]['gids'] = $goods_ids;
|
|
|
|
- return $data;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
private function old_version($special_id)
|
|
private function old_version($special_id)
|