Начало Каталог Помощ
Вход
derkj
/
NN2020042801
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Merge branch 'master' of http://git.dongerkj.com:9095/derkj/NN2020042801

# Conflicts:
#	app/index/controller/JiamengController.php
#	data/route/route.php
#	public/themes/mjmls/index/block/meta_xm.html
zxb преди 5 години
родител
b65e284914 9334fa5c88
ревизия
730a6e842e
променени са 2 файла, в които са добавени 19 реда и са изтрити 10 реда
Разделен изглед Покажи статистика за разликите
  1. 1 0
      app/index/controller/JiamengController.php
  2. 18 10
      public/themes/mjmls/index/block/meta_xm.html

+ 1 - 0
app/index/controller/JiamengController.php
Целия файл 

@@ -72,6 +72,7 @@ class JiamengController extends HomeBaseController
 
             $seo_title = str_replace('|',$cateData['catname'],$cateData['seo_title']);
 
             $seo_keywords = str_replace('|',$cateData['catname'],$cateData['seo_keywords']);
 
             $seo_desc = str_replace('|',$cateData['catname'],$cateData['seo_desc']);
 
+            $this->assign('catname',$cateData['catname']);
 
             $this->assign('seo_title',$seo_title);
 
             $this->assign('seo_keywords',$seo_keywords);
 
             $this->assign('seo_desc',$seo_desc);

+ 18 - 10
public/themes/mjmls/index/block/meta_xm.html
Целия файл 

@@ -3,19 +3,27 @@
 
 <head>
 
     <meta charset="UTF-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
-    <title>
 
-     
-      <?php if($param.aid!=-1){ 
+    <title><?php if($param['aid']!=0){ 
 
-      foreach($areaList as $k=>$v){
 
-           if($param.aid==$k){ echo $v;}
 
-       }
 
-    }
 
-        ?>
 
+              foreach($areaList as $k=>$v){
 
+                   if($param['aid']==$k){ echo $v."_";}
 
+               }
 
+         }
 
 
-      
+           if($param['lv']!=-1){
 
+                foreach($touziarr as $key=>$value){
 
+                    if($param['lv']==$key){echo $value.'_';}
 
 
-    </title>
 
+                }
 
+            }
 
+
 
+            if(isset($catname)){
 
+                echo $catname."_";
 
+             }
 
+
 
+             echo $site_info['site_name'];
 
+
 
+        ?></title>
 
     <meta name="keywords" content="wrwr<?php if(isset($seo_keywords)){ ?>{$seo_keywords}<?php }else{ ?>{$site_info.site_seo_keywords_xm}<?php } ?>" />
 
     <meta name="description" content="<?php if(isset($seo_desc)){ ?>{$seo_desc}<?php }else{ ?>{$site_info.site_seo_desc_xm}<?php } ?>" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">