diff --git a/app/model/Category.php b/app/model/Category.php index 95b5353..2213969 100755 --- a/app/model/Category.php +++ b/app/model/Category.php @@ -35,6 +35,9 @@ class Category extends Base //新闻碎片 public const CATEGORY_SERVE_BLOCK = 16; + //集市服务 + public const CATEGORY_SERVE_LIST = 42; + // 案例模版 public const TEMPLATE_NEWS = 'news_list'; diff --git a/view/manager/article/add.html b/view/manager/article/add.html index 896f301..0f42bc6 100755 --- a/view/manager/article/add.html +++ b/view/manager/article/add.html @@ -11,7 +11,7 @@ - {if in_array($category['id'], [9,10,23,24,25,40])} + {if in_array($category['id'], [9,10,23,24,25,40,42])}
@@ -61,7 +61,7 @@
{/if} - {if !(in_array($category['id'],[5]))} + {if !(in_array($category['id'],[5,42]))}
@@ -154,7 +154,7 @@ --> {if !isset($allowSummary) || $allowSummary} - {if !(in_array($category['id'],[4,5,9,10,6,35,36]))} + {if !(in_array($category['id'],[4,5,9,10,6,35,36,42]))}
{if $category['id'] == 37} diff --git a/view/manager/article/edit.html b/view/manager/article/edit.html index 7462257..f943405 100755 --- a/view/manager/article/edit.html +++ b/view/manager/article/edit.html @@ -13,7 +13,7 @@
- {if in_array($category['id'], [9,10,23,24,25,40])} + {if in_array($category['id'], [9,10,23,24,25,40,42])}
@@ -72,7 +72,7 @@
{/if} - {if !(in_array($category['id'],[5]))} + {if !(in_array($category['id'],[5,42]))}
@@ -165,7 +165,7 @@ --> {if !isset($allowSummary) || $allowSummary} - {if !(in_array($category['id'],[4,5,9,10,6,35,36]))} + {if !(in_array($category['id'],[4,5,9,10,6,35,36,42]))}
{if $category['id'] == 37} diff --git a/view/manager/content/article.html b/view/manager/content/article.html index 35b01c4..b8fc973 100755 --- a/view/manager/content/article.html +++ b/view/manager/content/article.html @@ -59,7 +59,9 @@ use app\model\Category as VCategory; {if $category.id!=5} {/if} + {if $category.id!=42} + {/if} @@ -69,7 +71,6 @@ use app\model\Category as VCategory; {/if} - @@ -77,7 +78,9 @@ use app\model\Category as VCategory; {if $category.id!=5} 封面 {/if} + {if $category.id!=42} 手机封面 + {/if} 标题 创建日期 @@ -89,9 +92,6 @@ use app\model\Category as VCategory; {if $category.id == 39} 活动预告 {/if} - {if $category.id == 40} - 推荐 - {/if} 操作 {foreach name="list" item="item"} @@ -104,11 +104,13 @@ use app\model\Category as VCategory; {/if} {/if} + {if $category.id!=42} {if !empty($item['src_mobile']) && file_exists('.' . $item['src_mobile'])} {/if} + {/if} {$item.title} {$item.create_time|date='Y-m-d'} @@ -122,9 +124,6 @@ use app\model\Category as VCategory; {if $category.id == 39} {$item.is_prev == 1 ? '是' : '否'} {/if} - {if $category.id == 40} - {$item.recommend == 1 ? '是' : '否'} - {/if}
{if !empty($attributeList)} diff --git a/view/page/market.html b/view/page/market.html index cb4a7ce..d55a378 100755 --- a/view/page/market.html +++ b/view/page/market.html @@ -3,7 +3,8 @@ use app\model\Article; use app\model\Category; $childrenMenu = Category::getChildrenByParentId($topCategoryId); -$items = Article::getList(Category::CATEGORY_MARKET_SERVICE, $category['number'] ?? 30, null ,['recommend']); +$items = Article::getList(Category::CATEGORY_MARKET_SERVICE, $category['number'] ?? 30); +$serviceList = Article::getList(Category::CATEGORY_SERVE_LIST, 500); {/php} {include file="public/about_second" /} @@ -39,16 +40,13 @@ $items = Article::getList(Category::CATEGORY_MARKET_SERVICE, $category['number']
- {if isset($blocks['market_service_list']['value']) && !empty($blocks['market_service_list']['value'])} - {php}$serviceImages = json_decode($blocks['market_service_list']['value'], true);{/php} - {foreach $serviceImages as $k => $service} - - {$service.alt ?? ''} + {foreach $serviceList as $k => $service} + + {$service.title ?? ''}

{$service.title ?? ''}

-

{$service.desc ?? ''}

+

{$service.title_en ?? ''}

{/foreach} - {/if}