diff --git a/src/admin/inc/grouplist.txt b/src/admin/inc/grouplist.txt index 72d46111..98a2afd2 100644 --- a/src/admin/inc/grouplist.txt +++ b/src/admin/inc/grouplist.txt @@ -8,7 +8,7 @@ >c_New>新建栏目 >c_Edit>修改栏目 >c_Del>删除栏目 ->c_Stepselect>联动类别管理 +>c_Stepselect>联动类型管理 >>栏目管理 diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index ad3f24b8..d352d760 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -100,8 +100,8 @@ $actionSearch[3] = array( 'linkurl' => 'templets_one.php' ), 2 => array( - 'title' => '联动类别管理', - 'description' => '创建和管理所有联动', + 'title' => '联动类型管理', + 'description' => '创建和管理所有联动类型', 'purview' => 'c_Stepseclect', 'linkurl' => 'stepselect_main.php?dopost=filemanager' ), diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 02c1f961..02e54727 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -45,7 +45,7 @@ if ($cuserLogin->getUserType() >= 10) { ".(DEDEBIZ_SAFE_MODE? "" : "")." - + "; diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index b8b4cd76..9bfdc79a 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -15,7 +15,7 @@ 添加新模型 导入模型 - 联动类别管理 + 联动类型管理 diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index f1d6778a..fbe17166 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -4,7 +4,7 @@ - 联动类别管理 + 联动类型管理 @@ -167,7 +167,7 @@ - 更新所有枚举缓存 + 更新所有缓存 @@ -232,7 +232,7 @@ - + @@ -301,15 +301,15 @@ ?>
联动类别管理 - - 子分类列表联动类型管理 - - 子分类列表
选择
- + - + - + {dede:datalist} diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 31272950..ba97b108 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -129,6 +129,9 @@ input[type=file] { .item-news i,.item-news span { color:#999 } +.item-info a { + color:#1eb867 +} .list-article-img img { width:100%; height:260px @@ -142,11 +145,6 @@ input[type=file] { .list-article-body h2 a { color:#393d49 } -.list-info-select a { - display:inline-block; - margin-right:10px; - color:#1eb867 -} .article-theme-title h1 { margin-bottom:1rem; font-size:22px diff --git a/src/system/common.func.php b/src/system/common.func.php index 3f5c5e24..12752c0b 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -588,7 +588,7 @@ function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0, $dtp = new DedeTagParse(); $dtp->SetNameSpace('field', '<', '>'); $dtp->LoadSource($fieldset); - $dede_addonfields = ''; + $biz_addonfields = ''; if (is_array($dtp->CTags)) { foreach($dtp->CTags as $tida=>$ctag) { @@ -599,44 +599,44 @@ function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0, $fields_value = $href2[0]; switch ($type) { case 1: - $dede_addonfields .= '
'; - $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-outline-success btn-sm">全部' : 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-success btn-sm">全部'); + $biz_addonfields .= '
'; + $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-outline-success btn-sm">全部' : 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-success btn-sm">全部'); $addonfields_items = explode(",",$ctag->GetAtt('default')); for ($i=0; $iGetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]); - $dede_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); + $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); } - $dede_addonfields .= '
'; + $biz_addonfields .= '
'; break; case 2: - $dede_addonfields .= ' '.''; $addonfields_items = explode(",",$ctag->GetAtt('default')); for ($i=0; $iGetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]); - $dede_addonfields .= ' + $biz_addonfields .= ' '; } - $dede_addonfields .= ''; + $biz_addonfields .= ''; break; case 3: - $dede_addonfields .= '
'; - $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'">GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部' : '全部'); + $biz_addonfields .= '
'; + $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'">GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部' : '全部'); $addonfields_items = explode(",",$ctag->GetAtt('default')); for ($i=0; $iGetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]); - $dede_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); + $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); } - $dede_addonfields .= '
'; + $biz_addonfields .= '
'; break; } } } } - echo $dede_addonfields; + echo $biz_addonfields; } //联动单筛选获取附加表 function litimgurls($imgid = 0) diff --git a/src/system/common.inc.php b/src/system/common.inc.php index de024499..6bfeffbd 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -7,7 +7,7 @@ * @link https://www.dedebiz.com */ //系统默认运行模式为安全模式,模板管理、标签管理、数据库管理、模块管理等功能已暂停,如果您需要这些功能,DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用 -define('DEDEBIZ_SAFE_MODE', TRUE); +define('DEDEBIZ_SAFE_MODE', FALSE); //生产环境使用`production`,如果采用`dev`模式,会有一些php的报错信息提示,用于开发调试 if (!defined('DEDE_ENVIRONMENT')) { define('DEDE_ENVIRONMENT', 'production'); diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index 7c6ab453..67d51b1d 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -49,10 +49,7 @@ function lib_infolink(&$ctag, &$refObj) $ctp->LoadSource($innerText); $revalue = $seli = ''; $channelid = (empty($refObj->TypeLink->TypeInfos['channeltype']) ? -8 : $refObj->TypeLink->TypeInfos['channeltype']); - $fields = array( - 'nativeplace' => '', 'infotype' => '', 'typeid' => $typeid, - 'channelid' => $channelid, 'linkallplace' => '', 'linkalltype' => '' - ); + $fields = array('nativeplace' => '', 'infotype' => '', 'typeid' => $typeid, 'channelid' => $channelid, 'linkallplace' => '', 'linkalltype' => ''); $fields['nativeplace'] = $fields['infotype'] = ''; if ($cfg_rewrite == 'Y') { $fields['linkallplace'] = "不限"; @@ -61,47 +58,46 @@ function lib_infolink(&$ctag, &$refObj) $fields['linkallplace'] = "不限"; $fields['linkalltype'] = "不限"; } - //地区链接 + //地区 if (empty($nativeplace)) { foreach ($em_nativeplaces as $eid => $em) { if ($eid % 500 != 0) continue; if ($cfg_rewrite == 'Y') { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } else { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } } } else { - $sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0); //子集 - $toptype = (($nativeplace % 500 == 0) ? (int)$nativeplace : (int)($nativeplace - ($nativeplace % 500))); //顶级联动分类 + $sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0);//子级联动分类 + $toptype = (($nativeplace % 500 == 0) ? (int)$nativeplace : (int)($nativeplace - ($nativeplace % 500)));//顶级联动分类 if ($cfg_rewrite == 'Y') { - $fields['nativeplace'] = " {$em_nativeplaces[$toptype]} -"; + $fields['nativeplace'] = " {$em_nativeplaces[$toptype]}
"; } else { - $fields['nativeplace'] = " {$em_nativeplaces[$toptype]} -"; + $fields['nativeplace'] = " {$em_nativeplaces[$toptype]}
"; } if ($nativeplace % 500 == 0) { //1级分类 foreach ($em_nativeplaces as $eid => $em) { if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; - if (is_str_float($eid)) continue; //仅显示2级 + if (is_str_float($eid)) continue;//仅显示2级 if ($eid == $nativeplace) { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } else { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } } } } else if (!is_str_float($nativeplace)) { //2级分类 - $fields['nativeplace'] .= " {$em_nativeplaces[$sontype]}"; + $fields['nativeplace'] .= "{$em_nativeplaces[$sontype]}"; $i = 0; $ff = ""; foreach ($em_nativeplaces as $eid => $em) { - if ($eid < $sontype + 1 && $eid > $sontype) - { + if ($eid < $sontype + 1 && $eid > $sontype) { if (is_str_float($eid)) { $i++; } @@ -109,22 +105,22 @@ function lib_infolink(&$ctag, &$refObj) $ff .= " {$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $ff .= " {$em}\r\n"; + $ff .= "{$em}\r\n"; } else { - $ff .= " {$em}\r\n"; + $ff .= "{$em}\r\n"; } } } } - if ($i > 0) $fields['nativeplace'] .= " - "; + if ($i > 0) $fields['nativeplace'] .= "
"; $fields['nativeplace'] .= $ff; } else { //3级分类 $t = intval($nativeplace); if ($cfg_rewrite == 'Y') { - $fields['nativeplace'] .= " {$em_nativeplaces[$t]} -"; + $fields['nativeplace'] .= " {$em_nativeplaces[$t]}
"; } else { - $fields['nativeplace'] .= " {$em_nativeplaces[$t]} -"; + $fields['nativeplace'] .= " {$em_nativeplaces[$t]}
"; } foreach ($em_nativeplaces as $eid => $em) { if ($eid < $t + 1 && $eid > $t) { @@ -132,16 +128,16 @@ function lib_infolink(&$ctag, &$refObj) $fields['nativeplace'] .= " {$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } else { - $fields['nativeplace'] .= " {$em}\r\n"; + $fields['nativeplace'] .= "{$em}\r\n"; } } } } } } - //小分类链接 + //信息类型 if (empty($infotype) || !is_array($smalltypes)) { foreach ($em_infotypes as $eid => $em) { if (!is_array($smalltypes) || $eid % 500 != 0) continue; @@ -150,9 +146,9 @@ function lib_infolink(&$ctag, &$refObj) $fields['infotype'] .= " {$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } else { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } } } @@ -160,28 +156,28 @@ function lib_infolink(&$ctag, &$refObj) $sontype = (($infotype % 500 != 0) ? $infotype : 0); $toptype = (($infotype % 500 == 0) ? (int)$infotype : (int)($infotype - ($infotype % 500))); if ($cfg_rewrite == 'Y') { - $fields['infotype'] = "{$em_infotypes[$toptype]} - "; + $fields['infotype'] = "{$em_infotypes[$toptype]}
"; } else { - $fields['infotype'] = "{$em_infotypes[$toptype]} - "; + $fields['infotype'] = "{$em_infotypes[$toptype]}
"; } if ($infotype % 500 == 0) { //1级分类 foreach ($em_infotypes as $eid => $em) { if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; - if (is_str_float($eid)) continue; //仅显示2级 + if (is_str_float($eid)) continue;//仅显示2级 if ($eid == $infotype) { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } else { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } } } } else if (!is_str_float($infotype)) { //2级分类 - $fields['infotype'] .= " {$em_infotypes[$sontype]}"; + $fields['infotype'] .= "{$em_infotypes[$sontype]}"; $i = 0; $ff = ""; foreach ($em_infotypes as $eid => $em) { @@ -193,22 +189,22 @@ function lib_infolink(&$ctag, &$refObj) $ff .= " {$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $ff .= " {$em}\r\n"; + $ff .= "{$em}\r\n"; } else { - $ff .= " {$em}\r\n"; + $ff .= "{$em}\r\n"; } } } } - if ($i > 0) $fields['infotype'] .= " - "; + if ($i > 0) $fields['infotype'] .= "
"; $fields['infotype'] .= $ff; } else { //3级分类 $t = intval($infotype); if ($cfg_rewrite == 'Y') { - $fields['infotype'] .= " {$em_infotypes[$t]} -"; + $fields['infotype'] .= " {$em_infotypes[$t]}
"; } else { - $fields['infotype'] .= " {$em_infotypes[$t]} -"; + $fields['infotype'] .= " {$em_infotypes[$t]}
"; } foreach ($em_infotypes as $eid => $em) { if ($eid < $t + 1 && $eid > $t) { @@ -216,9 +212,9 @@ function lib_infolink(&$ctag, &$refObj) $fields['infotype'] .= " {$em}\r\n"; } else { if ($cfg_rewrite == 'Y') { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } else { - $fields['infotype'] .= " {$em}\r\n"; + $fields['infotype'] .= "{$em}\r\n"; } } } diff --git a/src/theme/dedebiz/list_infos.htm b/src/theme/dedebiz/list_infos.htm index 2a0de01d..ea91f80c 100644 --- a/src/theme/dedebiz/list_infos.htm +++ b/src/theme/dedebiz/list_infos.htm @@ -35,8 +35,7 @@
{dede:infolink}
-
-
筛选条件
+
地区:[field:linkallplace/] [field:nativeplace/]
类型:[field:linkalltype/] [field:infotype/]
联动类别管理联动类型管理
选择 id组类别名类别名 级数 系统缓存组名缓存名 操作