Преглед изворни кода

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

wesmiler пре 5 година
родитељ
комит
1f8960dcdf

+ 3 - 1
app/index/controller/JiamengController.php

@@ -49,7 +49,7 @@ class JiamengController extends HomeBaseController
      */
     public function lists()
     {
-        $param = $this->request->param();
+        $param = $this->request->param(); 
         $cacheKey = 'cache:jiameng_pages:list:' . md5(json_encode($param)).'_'.intval(cmf_is_mobile());
         $pageHtml = RedisService::get($cacheKey);
         if ($pageHtml) {
@@ -67,6 +67,7 @@ class JiamengController extends HomeBaseController
             'pcid' => isset($param['pcid']) ? intval($param['pcid']) : 0,
             'lv' => isset($param['lv']) ? intval($param['lv']) : '11111',
             'aid' => isset($param['aid']) ? intval($param['aid']) : 0,
+           // 'aid' => isset($param['aid']) ? $param['aid'] : '不限',
         ];
         $sonid = 0;
         if ($enname || $pcid) {
@@ -102,6 +103,7 @@ class JiamengController extends HomeBaseController
         }
 
         $param['pageType'] = 1;
+        
         $result = JiamengService::getList($param);
         $page = $result->render();
 

+ 10 - 2
app/index/service/JiamengService.php

@@ -95,7 +95,9 @@ class JiamengService
         if ($dataList) {
             return $dataList;
         }
-
+        if ($param['lv']=='11111') {
+           unset($param['lv']);
+        }
         $pcatid = 0;
         $enname = isset($param['enname']) ? trim($param['enname']) : '';
         if ($enname) {
@@ -151,12 +153,18 @@ class JiamengService
                 $aid = isset($param['aid']) ? intval($param['aid']) : -1;
                 $aid = $aid > 0 ? $aid : (isset($param['area_id']) ? intval($param['area_id']) : -1);
                 if ($aid > 0) {
+
                     $query->where(['j.area_id' => $aid]);
                 }
+                   
+                // if(isset($param['aid']) && $param['aid']!='不限'){
+                //    $query->where('j.area','like','%'.$param['aid'].'%'); 
+                // }
+
             })
             ->order('j.update_time desc, j.create_time desc, j.list_order')
             ->paginate($pageSize, false, ['query' => $pageParams]);
-
+      // echo '::'.Db::name('jiameng')->getLastSql();die();
         if ($dataList) {
             RedisService::set($cacheKey, $dataList, 3 * 24 * 3600);
         }

Разлика између датотеке није приказан због своје велике величине
+ 852 - 426
public/themes/jiameng/index/jiameng/show.html


+ 37 - 6
public/themes/mjmls/index/block/meta_xm.html

@@ -1,46 +1,77 @@
 <!DOCTYPE html>
+
 <html lang="zh-cmn-Hans">
+
 <head>
+
     <meta charset="UTF-8">
+
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
     <title><?php
-        if($param['aid']!=0){ 
 
+        if($param['aid']!=0){ 
               foreach($areaList as $k=>$v){
-                   if($param['aid']==$k){ echo $v."_";}
-               }
-         }
+                   if($param['aid']==$k){ echo $v;}}}
            if($param['lv']!=-1){
                 foreach($touziarr as $key=>$value){
-                    if($param['lv']==$key){echo $value.'_';}}}
+                    if($param['lv']==$key){echo $value;}}}
      if(isset($seo_title)){ ?>{$seo_title}
-    <?php }else{ ?>{$site_info.site_seo_title_news} 
+    <?php }else{ ?>{$site_info.site_seo_title_xm} 
     <?php } ?>-{$site_info.site_name}
+
   </title>
+
     <meta name="keywords" content="<?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">
+
     <meta name="applicable-device" content="pc,mobile">
+
     <meta http-equiv="Cache-Control" content="no-transform">
+
     <meta http-equiv="Cache-Control" content="no-siteapp">
+
     <meta name="format-detection" content="telephone=no,email=no" />
+
     <link rel="stylesheet" href="__TMPL__/static/css/font-awesome.min.css">
+
     <link rel="stylesheet" href="__TMPL__/static/css/swiper.min.css">
+
     <link rel="stylesheet" href="__TMPL__/static/css/master.min.css">
+
     <script src="__TMPL__/static/js/jquery-1.8.3.min.js" type="text/javascript"></script>
+
     <!--[if lt IE 9]>
+
     <script src="__TMPL__/static/js/html5shiv.js"></script>
+
     <script src="__TMPL__/static/js/respondshiv.js"></script>
+
     <![endif]-->
+
     <script>
+
         function imageError(ele){
+
             ele.src="/upload/jdxm-img.jpg";
+
             ele.οnerrοr=null;
+
         }
+
         function resetSize(ele){
+
             var w = $(ele).outerWidth();
+
             $(ele).css('height', w/1.3333);
+
         }
+
     </script>
+
 </head>
+
 <body>

+ 2 - 1
public/themes/mjmls/index/jiameng/list.html

@@ -37,7 +37,7 @@
         <dt>投资金额:</dt>
         <dd class="sub_box">
             <ul>
-                <li <if condition="$param.lv == '11111'">class="touzi on"<else/>class="touzi"</if>><a href="/xm{$v.enname}/">不限</a></li>
+                <li <if condition="$param.lv == '11111'">class="touzi on"<else/>class="touzi"</if>><a href="/xm{$param.enname}/lv11111/area{$param.aid}/">不限</a></li>
                 <foreach name="touziarr" id="v" >
                     <li <if condition="$key eq $param.lv">class="touzi on"<else/>class="touzi"</if>><a href="/xm{$param.enname}/lv{$key}/area{$param.aid}" data-key="{$key}" data-id="{$key}" title="{$v}">{$v}</a></li>
                 </foreach>
@@ -48,6 +48,7 @@
         <dt>加盟区域:</dt>
         <dd class="sub_box">
             <ul>
+           
                 <foreach name="areaList" id="v" >
                     <li <if condition="$key eq $param.aid">class="area on"<else/>class="area"</if>><a href="/xm{$param.enname}/lv{$param.lv}/area{$key}" data-key="{$key}" data-id="{$key}" title="{$v}">{$v}</a></li>
                 </foreach>