|
@@ -121,6 +121,9 @@ class CmsContentTemplateSetRepository
|
|
if (isset($v['link_type'])) {
|
|
if (isset($v['link_type'])) {
|
|
$rules[$k]['link_type'] = intval($v['link_type']);
|
|
$rules[$k]['link_type'] = intval($v['link_type']);
|
|
}
|
|
}
|
|
|
|
+ if (isset($v['link_url'])) {
|
|
|
|
+ $rules[$k]['link_url'] = trim($v['link_url']);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
$templateSet = [
|
|
$templateSet = [
|
|
@@ -262,6 +265,12 @@ class CmsContentTemplateSetRepository
|
|
public function advertisementSet($request)
|
|
public function advertisementSet($request)
|
|
{
|
|
{
|
|
$advertisement_id = $request['id'] ?? '';
|
|
$advertisement_id = $request['id'] ?? '';
|
|
|
|
+ if (isset($request['rule']['link_type'])) {
|
|
|
|
+ $request['rule']['link_type'] = intval($request['rule']['link_type']);
|
|
|
|
+ }
|
|
|
|
+ if (isset($request['rule']['link_url'])) {
|
|
|
|
+ $request['rule']['link_url'] = trim($request['rule']['link_url']);
|
|
|
|
+ }
|
|
$subject = [
|
|
$subject = [
|
|
'tpl_id' => $request['tpl_id'],
|
|
'tpl_id' => $request['tpl_id'],
|
|
'rule' => json_encode($request['rule']),
|
|
'rule' => json_encode($request['rule']),
|
|
@@ -299,6 +308,9 @@ class CmsContentTemplateSetRepository
|
|
if (isset($request['rule']['link_type'])) {
|
|
if (isset($request['rule']['link_type'])) {
|
|
$request['rule']['link_type'] = intval($request['rule']['link_type']);
|
|
$request['rule']['link_type'] = intval($request['rule']['link_type']);
|
|
}
|
|
}
|
|
|
|
+ if (isset($request['rule']['link_url'])) {
|
|
|
|
+ $request['rule']['link_url'] = trim($request['rule']['link_url']);
|
|
|
|
+ }
|
|
if (isset($request['rule']['show_num'])) {
|
|
if (isset($request['rule']['show_num'])) {
|
|
$request['rule']['show_num'] = intval($request['rule']['show_num']);
|
|
$request['rule']['show_num'] = intval($request['rule']['show_num']);
|
|
}
|
|
}
|
|
@@ -347,6 +359,12 @@ class CmsContentTemplateSetRepository
|
|
public function categorySet($request)
|
|
public function categorySet($request)
|
|
{
|
|
{
|
|
$category_id = $request['id'] ?? '';
|
|
$category_id = $request['id'] ?? '';
|
|
|
|
+ if (isset($request['rule']['link_type'])) {
|
|
|
|
+ $request['rule']['link_type'] = intval($request['rule']['link_type']);
|
|
|
|
+ }
|
|
|
|
+ if (isset($request['rule']['link_url'])) {
|
|
|
|
+ $request['rule']['link_url'] = trim($request['rule']['link_url']);
|
|
|
|
+ }
|
|
$subject = [
|
|
$subject = [
|
|
'tpl_id' => $request['tpl_id'],
|
|
'tpl_id' => $request['tpl_id'],
|
|
'rule' => json_encode($request['rule']),
|
|
'rule' => json_encode($request['rule']),
|