wesmiler 5 lat temu
rodzic
commit
492a01bae5
51 zmienionych plików z 458 dodań i 381 usunięć
  1. 10 6
      app/index/controller/IndexController.php
  2. 20 9
      app/index/controller/JiamengController.php
  3. 8 5
      app/index/controller/NewsController.php
  4. 45 4
      app/index/controller/Top10Controller.php
  5. 44 14
      app/index/service/CategoryService.php
  6. 3 2
      app/index/service/JiamengService.php
  7. 22 1
      app/index/service/NewsService.php
  8. 1 1
      data/config/config.php
  9. 2 1
      data/route/route.php
  10. 1 1
      public/api.php
  11. 1 1
      public/index.php
  12. 4 4
      public/static/css/404.css
  13. 16 0
      public/themes/admin_simpleboot3/admin/setting/site.html
  14. 6 5
      public/themes/mjmls/index/block/footer.html
  15. 6 5
      public/themes/mjmls/index/block/footer_new.html
  16. 5 4
      public/themes/mjmls/index/block/footer_xm.html
  17. 8 11
      public/themes/mjmls/index/block/header.html
  18. 6 13
      public/themes/mjmls/index/block/header_xm.html
  19. 10 1
      public/themes/mjmls/index/block/meta.html
  20. 33 0
      public/themes/mjmls/index/block/meta_know.html
  21. 33 0
      public/themes/mjmls/index/block/meta_top.html
  22. 13 4
      public/themes/mjmls/index/block/meta_inside.html
  23. 33 0
      public/themes/mjmls/index/block/meta_xw.html
  24. 3 3
      public/themes/mjmls/index/block/nav.html
  25. 2 0
      public/themes/mjmls/index/index/advert/topic.html
  26. 10 4
      public/themes/mjmls/index/index/floor/banner.html
  27. 10 2
      public/themes/mjmls/index/index/floor/brand.html
  28. 1 1
      public/themes/mjmls/index/index/floor/brand_choice.html
  29. 2 2
      public/themes/mjmls/index/index/floor/join.html
  30. 1 1
      public/themes/mjmls/index/index/floor/new_recommend.html
  31. 15 12
      public/themes/mjmls/index/index/floor/phb.html
  32. 2 1
      public/themes/mjmls/index/index/floor/recommend.html
  33. 1 1
      public/themes/mjmls/index/index/floor/topic.html
  34. 0 2
      public/themes/mjmls/index/index/index.html
  35. 0 198
      public/themes/mjmls/index/jiameng/category.html
  36. 3 2
      public/themes/mjmls/index/jiameng/list.html
  37. 3 2
      public/themes/mjmls/index/jiameng/search.html
  38. 5 4
      public/themes/mjmls/index/jiameng/show.html
  39. 1 1
      public/themes/mjmls/index/know/index.html
  40. 1 0
      public/themes/mjmls/index/know/show.html
  41. 1 0
      public/themes/mjmls/index/news/index.html
  42. 1 0
      public/themes/mjmls/index/news/list.html
  43. 1 1
      public/themes/mjmls/index/news/message.html
  44. 2 1
      public/themes/mjmls/index/news/show.html
  45. 4 3
      public/themes/mjmls/index/top10/index.html
  46. 7 0
      public/themes/mjmls/static/css/index.css
  47. 5 5
      public/themes/mjmls/static/css/master.css
  48. 7 2
      public/themes/mjmls/static/js/base.js
  49. 6 1
      vendor/thinkcmf/cmf/src/controller/HomeBaseController.php
  50. 31 39
      vendor/thinkphp/tpl/dispatch_jump.tpl
  51. 3 1
      vendor/thinkphp/tpl/page_trace.tpl

+ 10 - 6
app/index/controller/IndexController.php

@@ -17,9 +17,6 @@ class IndexController extends HomeBaseController
     public function index()
     {
 
-
-
-
         // 热门分类
         $recCates = CategoryService::getRecCates(6);
         $recCates = $recCates? $recCates->toArray() : [];
@@ -139,7 +136,8 @@ class IndexController extends HomeBaseController
         $brandHot = JiamengService::getTopList([], 16);
 
         // 加盟动态
-        $jmMessages = MessageService::getList(['type'=> 1], 10);
+//        $jmMessages = MessageService::getList(['type'=> 1], 10);
+        $jmMessages = NewsService::getRandList(10);
 
         // 友情链接
         $links = LinkService::getList(['catname'=> 'index'], 50);
@@ -240,9 +238,9 @@ class IndexController extends HomeBaseController
         if(empty($datas)){
             $dataList = CategoryService::getCates(500, -1, "enname as id, catname as title, '1' as 'type'");
             $dataList = $dataList? $dataList->toArray() : [];
-            $brands = JiamengService::getList([], "j.id,j.title, '2' as 'type'", 1000);
+            $brands = JiamengService::getList(['status'=> 1], "j.id,j.title, '2' as 'type'", 1000);
             $brands = $brands? $brands->toArray() : [];
-            $news = NewsService::getList([], 1000,"id,title, '3' as 'type'");
+            $news = NewsService::getList(['status'=> 1], 1000,"id,title, '3' as 'type'");
             $news= $news? $news->toArray() : [];
             $dataList = isset($brands['data']) && $brands['data']? array_merge($dataList, $brands['data']) : $dataList;
             $dataList = isset($news['data']) && $news['data']? array_merge($dataList, $news['data']) : $dataList;
@@ -262,5 +260,11 @@ class IndexController extends HomeBaseController
         return $this->fetch('../sitemap');
 
     }
+
+    public function clearCache(){
+        // 清楚Redis缓存
+        RedisService::delByKeys('cache:*');
+        // end
+    }
 }
 ?>

+ 20 - 9
app/index/controller/JiamengController.php

@@ -21,7 +21,8 @@ class JiamengController extends HomeBaseController
         isset($param['enname']) or $this->error('需要父分类');
         $curarr = Db::name('category')->where('enname',$param['enname'])->find();
         if($curarr['parent_id']>0){
-            $this->error('不是一级分类');
+            header("Location:".url('/404'));
+            exit;
         }
         $sonarr = Db::name('category')->where('parent_id',$curarr['id'])->order('list_order')->limit(10)->select();
         $this->assign('sonarr',$sonarr);
@@ -237,7 +238,12 @@ class JiamengController extends HomeBaseController
         isset($param['id']) or $this->error('需要id');
         $info = Db::name('jiameng')
             ->where('id',$param['id'])
+            ->where('status', 1)
             ->find();
+        if(empty($info)){
+            header("Location:".url('/404'));
+            exit;
+        }
         //内容
         $content = Db::name('jiameng_data')->where('id',$param['id'])->find();
         $info['content'] = $content['content'];
@@ -258,7 +264,7 @@ class JiamengController extends HomeBaseController
         $info['jm_support'] = $jmSupport? $jmSupport : $supports;
         $areaList = config('params.areaList');
         $areaId = isset($info['area_id']) && $info['area_id']? intval($info['area_id']) : '-1';
-        $area = isset($areaList[$areaId])? $areaList[$areaId] : '暂无';
+        $area = isset($areaList[$areaId])? $areaList[$areaId] : '不限';
         $info['area'] = $info['area']? $info['area'] : $area;
 
         $catinfo = Db::name('category')->where('id',$info['catid'])->find();
@@ -269,22 +275,23 @@ class JiamengController extends HomeBaseController
         //热门行业
         $hot_cate = Db::name('category')->where('parent_id',$parinfo['id'])->order('list_order')->limit(12)->select();
         //排行
-        $paihang = Db::name('jiameng')->field('id,title,logo,touzi_level,mendian,hits')->where('catid',$info['catid'])->order('hits desc')->limit(5)->select();
+        $paihang = Db::name('jiameng')->field('id,title,logo,touzi_level,mendian,hits')->where('catid',$info['catid'])->where('status', 1)->order('hits desc')->limit(5)->select();
         //动态
-        $about_news = Db::name('news')->field('id,title,thumb,create_time')->where('ncatid',1)->order('id desc')->limit(6)->select();
-        $brand_news = Db::name('news')->field('id,title,create_time')->where('catid',$info['catid'])->order('id desc')->limit(6)->select();
+        $about_news = Db::name('news')->field('id,title,thumb,create_time')->where(['ncatid'=>1,'status'=> 1])->order('id desc')->limit(6)->select();
+        $brand_news = Db::name('news')->field('id,title,thumb,create_time')->where(['catid'=>$info['catid'],'status'=> 1])->order('id desc')->limit(6)->select();
         //热门加盟
-        $hot_jm = Db::name('jiameng')->field('id,title,hits')->where('catid',$info['catid'])->order('hits desc')->limit(20)->select();
+        $hot_jm = Db::name('jiameng')->field('id,title,hits')->where('catid',$info['catid'])->where('status', 1)->order('hits desc')->limit(20)->select();
         //最新加盟
         $zx_jm = $brand8 = JiamengService::getNewList(20);
         //精选加盟
-        $jx_jm = Db::name('jiameng')->field('id,title')->where('catid',$info['catid'])->orderRaw('rand()')->limit(20)->select();
+        $jx_jm = Db::name('jiameng')->field('id,title')->where('catid',$info['catid'])->where('status', 1)->orderRaw('rand()')->limit(20)->select();
         //seo
         $seo_title = str_replace('|',$info['title'],$catinfo['seo_title']);
         $seo_keywords = str_replace('|',$info['title'],$catinfo['seo_keywords']);
-        $seo_desc = mb_substr($info['content'],0,200,'utf8');
-        $seo_desc = strip_tags($seo_desc);
+        $seo_desc = trim(strip_tags($info['content']));
+        $seo_desc = mb_substr($seo_desc,0,200,'utf8');
         $link_cate_name = $parinfo['enname'];
+        //var_dump($seo_desc.'++');
 	    // $this->assign('link_cate_name',$link_cate_name);
         $this->assign('seo_title',$seo_title);
         $this->assign('seo_keywords',$seo_keywords);
@@ -305,6 +312,7 @@ class JiamengController extends HomeBaseController
 
     public function message(){
         $param = $this->request->param();
+        $orignUrl = $this->request->header('origin');
         // isset($param['name'])&&$param['name']!='' or $this->error('请填写姓名');
         isset($param['mobile'])&&$param['mobile']!='' or $this->error('请填写手机号');
         $param['create_time'] = time();
@@ -313,10 +321,12 @@ class JiamengController extends HomeBaseController
         $todaytime = strtotime(date('Y-m-d'));
         if(strlen($param['content'])>300){
         	$this->error('字符长度不超过300个');
+            exit;
         }
 
         if(isset($param['tzed']) && $param['tzed']<=0){
             $this->error('请选择投资额度');
+            exit;
         }
         $param['content'] = strFilter($param['content']);
         $param['name'] = strFilter($param['name']);
@@ -325,6 +335,7 @@ class JiamengController extends HomeBaseController
         $param['area'] = strFilter($param['area']);
         $param['wechat'] = strFilter($param['wechat']);
         $param['type'] = 1;
+        $param['source_url'] = $orignUrl;
 
         // print_r($param);exit;
         //判断是否已超过10次  今天这个ip是否留言过

+ 8 - 5
app/index/controller/NewsController.php

@@ -57,7 +57,8 @@ class NewsController extends HomeBaseController
         isset($param['id']) or $this->error('非法访问');
         $info = Db::name('news')->where('id',$param['id'])->where('status',1)->find();
         if(empty($info)){
-        	$this->error('未找到新闻');
+            header("Location:".url('/404'));
+            exit;
         }
 
         $catinfo = Db::name('news_category')->where('id',$info['ncatid'])->find();
@@ -86,6 +87,7 @@ class NewsController extends HomeBaseController
         $jx_jm = Db::name('jiameng')
             ->field('id,title,logo,touzi_level,hits')
             ->whereNotIn('id',$info['id'])
+            ->where('status', 1)
             ->orderRaw('rand()')
             ->limit(10)
             ->select()
@@ -99,7 +101,7 @@ class NewsController extends HomeBaseController
         $jm_news = NewsService::getListByCate(1, 6);
 
         // 相关资讯
-        $other_news = NewsService::getListByCate($info['catid'], 10);
+        $other_news = NewsService::getListByCate($info['ncatid'], 10);
 
         $keywords = [];
         if(isset($info['keywords']) && !empty($info['keywords'])){
@@ -121,8 +123,8 @@ class NewsController extends HomeBaseController
         //seo
         $seo_title = $info['seo_title'];
         $seo_keywords = $info['seo_keywords'];;
-        $seo_desc = mb_substr($info['content'],0,200,'utf8');
-        $seo_desc = strip_tags($seo_desc);
+        $seo_desc = strip_tags($info['content']);
+        $seo_desc = mb_substr($seo_desc,0,200,'utf8');
         $this->assign('seo_title',$seo_title);
         $this->assign('seo_keywords',$seo_keywords);
         $this->assign('seo_desc',$seo_desc);
@@ -137,7 +139,8 @@ class NewsController extends HomeBaseController
         if(isset($param['catname'])){
             $catinfo = Db::name('news_category')->where('enname',$param['catname'])->find();
             if(empty($catinfo)){
-                $this->error('未找到分类');
+                header("Location:".url('/404'));
+                exit;
             }
             $catid = $catinfo['id'];
             $map['ncatid'] = $catid;

+ 45 - 4
app/index/controller/Top10Controller.php

@@ -2,16 +2,56 @@
 namespace app\index\controller;
 use app\index\service\AdvertService;
 use app\index\service\JiamengService;
+use app\index\service\RedisService;
 use cmf\controller\HomeBaseController;
 use think\Db;
 class Top10Controller extends HomeBaseController
 {
     public function index()
     {
+        $areaList = config('params.areaList');
         //top10
-        $top10 = Db::name('jiameng')->field('id,title,logo,hits,area,touzi_level,product,thumb')->order('hits desc')->limit(10)->select();
+        $top10 = Db::name('jiameng')
+            ->where('status', 1)
+            ->field('id,title,logo,hits,area_id,mendian,touzi_level,product,thumb')
+            ->order('hits desc')->limit(10)
+            ->select()
+            ->each(function($item, $k) use ($areaList){
+                $cacheKey = 'jiameng:searchCount1:'.$item['id'];
+                $searchCount = RedisService::get($cacheKey);
+                if($searchCount){
+                    $item['search_count'] = $searchCount;
+                }else{
+                    $item['search_count'] = rand(2000,200000);
+                    RedisService::set($cacheKey, $item['search_count'], 3600);
+                }
+
+                $areaId = isset($item['area_id']) && $item['area_id']? intval($item['area_id']) : '-1';
+                $item['area'] = isset($areaList[$areaId])? $areaList[$areaId] : '不限';
+
+                return $item;
+            });
         //飙升榜
-        $zengzhang10 = Db::name('jiameng')->field('id,title,logo,area,hits,touzi_level,product')->order('list_order')->limit(10)->select();
+        $zengzhang10 = Db::name('jiameng')->where('status',1)
+            ->field('id,title,logo,area_id,hits,mendian,touzi_level,product')
+            ->order('list_order')
+            ->limit(10)
+            ->select()
+            ->each(function($item, $k) use ($areaList){
+                $cacheKey = 'jiameng:searchCount2:'.$item['id'];
+                $searchCount = RedisService::get($cacheKey);
+                if($searchCount){
+                    $item['search_count'] = $searchCount;
+                }else{
+                    $item['search_count'] = rand(2000,200000);
+                    RedisService::set($cacheKey, $item['search_count'], 3600);
+                }
+
+                $areaId = isset($item['area_id']) && $item['area_id']? intval($item['area_id']) : '-1';
+                $item['area'] = isset($areaList[$areaId])? $areaList[$areaId] : '不限';
+
+                return $item;
+            });;
 
         //推荐
         $tuijian = JiamengService::getNewList(15);
@@ -29,7 +69,7 @@ class Top10Controller extends HomeBaseController
         );
 
         // 最新新闻
-        $zuixin_news = Db::name('news')->where('ncatid',4)->order('id desc')->limit(10)->select();
+        $zuixin_news = Db::name('news')->where('status',1)->orderRaw('rand()')->limit(10)->select();
 
         // 轮播
         $banner = AdvertService::getListBySlide(7, 1);
@@ -62,7 +102,8 @@ class Top10Controller extends HomeBaseController
         if(isset($param['catname'])){
             $catinfo = Db::name('category')->where('enname',$param['catname'])->find();
             if(empty($catinfo)){
-                $this->error('未找到分类');
+                header("Location:".url('/404'));
+                exit;
             }
             $map = array();
             $new_map['status'] = 3;

+ 44 - 14
app/index/service/CategoryService.php

@@ -16,7 +16,7 @@ class CategoryService
      * @throws \think\exception\DbException
      */
     public static function getCateList($refresh = false){
-        $cacheKey ='cache:index:catearr';
+        $cacheKey ="cache:index:catearr";
         $catearr = RedisService::get($cacheKey);
         if(empty($catearr) || $refresh){
             //一级分类+二级分类
@@ -31,24 +31,14 @@ class CategoryService
                     ->where('parent_id',$v['id'])
                     ->field('id,enname,catname')
                     ->order('list_order')
-                    ->limit(0,2)
+                    ->limit(0,3)
                     ->select();
-                $v['son'] = $erji_cate;
-
-                $xmList = Db::name('jiameng')
-                    ->where(['catid|pcatid'=> $v['id'],'status'=> 1])
-                    ->field('id,title')
-                    ->order('list_order')
-                    ->limit(12)
-                    ->select();
-                $data = $v;
-                $data['xmList'] = $xmList;
-                $v['sonData'][] = $data;
+                $erji_cate = $erji_cate? $erji_cate->toArray() : [];
 
                 // 子类的ID
                 foreach ($erji_cate as $val){
                     $xmList = Db::name('jiameng')
-                        ->where(['catid|pcatid'=> $val['id'],'status'=> 1])
+                        ->where(['catid'=> $val['id'],'status'=> 1])
                         ->field('id,title')
                         ->order('list_order')
                         ->limit(12)
@@ -59,6 +49,46 @@ class CategoryService
                 }
 
 
+                $v['son'] = $erji_cate? array_slice($erji_cate, 0, 2) : [];
+                $catearr[$k] = $v;
+            }
+
+            if($catearr){
+                $catearr = $catearr->toArray();
+                RedisService::set($cacheKey, $catearr, 7 * 24 *3600);
+            }
+        }
+
+        return $catearr;
+    }
+
+    /**
+     * 获取首页分类导航列表
+     * @param bool $refresh
+     * @return array|bool|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public static function getNavCateList($refresh = false){
+        $cacheKey ="cache:index:nav_catearr";
+        $catearr = RedisService::get($cacheKey);
+        if(empty($catearr) || $refresh){
+            //一级分类+二级分类
+            $catearr = Db::name('category')
+                ->where('parent_id',0)
+                ->field('id,catname,enname')
+                ->order('list_order')
+                ->limit(0,12)
+                ->select();
+            foreach($catearr as $k=>$v){
+                $erji_cate = Db::name('category')
+                    ->where('parent_id',$v['id'])
+                    ->field('id,enname,catname')
+                    ->order('list_order')
+                    ->select();
+                $erji_cate = $erji_cate? $erji_cate->toArray() : [];
+
                 $v['son'] = $erji_cate;
                 $catearr[$k] = $v;
             }

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

@@ -45,7 +45,7 @@ class JiamengService
     public static function getHotList($num = 20)
     {
         return Db::name('jiameng')
-            ->field('id,title,thumb,hits')
+            ->field('id,title,thumb,hits,zhiying')
             ->where(['status' => 1])->order('hits desc')
             ->limit($num)
             ->select();
@@ -80,12 +80,13 @@ class JiamengService
         if($pageType == 1){
             $pageParams = ['page'=> input('page', 1)];
         }
-        $field = $field ? $field : 'j.id,j.title,j.logo,j.catid,j.pcatid,j.touzi_level,j.area,j.level,j.company,j.product,j.area_id,j.mendian,j.zhiying,j.found_at,c1.catname as catname,c1.enname as encatname,c2.catname as pcatname,c2.enname as penname';
+        $field = $field ? $field : 'j.id,j.title,j.logo,j.catid,j.pcatid,j.touzi_level,j.area,j.level,j.company,j.product,j.area_id,j.mendian,j.zhiying,j.found_at,j.is_choose,c1.catname as catname,c1.enname as encatname,c2.catname as pcatname,c2.enname as penname';
         $dataList = Db::name('jiameng')->alias('j')
             ->field($field)
             ->leftJoin('category c1', 'c1.id=j.catid')
             ->leftJoin('category c2', 'c2.id=j.pcatid')
             ->where(function ($query) use ($param, $catids) {
+                $query->where('j.status', 1);
                 $kw = isset($param['kw']) ? trim($param['kw']) : '';
                 if ($kw) {
                     $query->where('j.title', 'like', "%{$kw}%");

+ 22 - 1
app/index/service/NewsService.php

@@ -21,7 +21,7 @@ class NewsService
         return Db::name('news')
             ->field($field)
             ->where(function($query) use($params){
-                $status = isset($params['status'])? $params['status'] : 0;
+                $status = isset($params['status'])? $params['status'] : 1;
                 if($status){
                     $query->where('status', $status);
                 }
@@ -87,6 +87,27 @@ class NewsService
     }
 
     /**
+     * 获随机发布信息
+     * @param int $num 记录数
+     * @param string $field 字段
+     * @return array|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public static function getRandList($num=6, $field=''){
+        $field = $field? $field : 'id,title,thumb,keywords,description,create_time';
+        $result = Db::name('news')
+            ->where('status',1)
+            ->field($field)
+            ->order(db()->raw('rand()'))
+            ->limit($num)
+            ->select();
+
+        return $result? $result->toArray() : [];
+    }
+
+    /**
      * 获取分类对应的信息列表
      * @param $cateId 分类ID:数组则为多个分类
      * @param $num 记录数

+ 1 - 1
data/config/config.php

@@ -19,7 +19,7 @@ return [
         // 连接密码
         'password' => 'derkj&6688',
         // 数据库索引
-        'select' => 3,
+        'select' => 1,
         // 超时
         'timeout' => 60,
         // 有效期

+ 2 - 1
data/route/route.php

@@ -23,8 +23,9 @@
         '/news/level-:id.shtml' => 'index/news/lists',
         '/know/detail/:id' => 'index/know/show',
         'top10/:catname' => 'index/top10/cate',
-        '/sitemap.shtml' => 'index/index/sitemap',
+        '/sitemap.xml' => 'index/index/sitemap',
         '/sitemap-:p.shtml' => 'index/index/sitemap',
+        '/sitemap-:p.xml' => 'index/index/sitemap',
     );
 
 ?>

+ 1 - 1
public/api.php

@@ -12,7 +12,7 @@ namespace think;
 // [ 入口文件 ]
 
 // 调试模式开关
-define('APP_DEBUG', true);
+define('APP_DEBUG', false);
 
 // 定义CMF根目录,可更改此目录
 define('CMF_ROOT', dirname(__DIR__) . '/');

+ 1 - 1
public/index.php

@@ -11,7 +11,7 @@ namespace think;
 // [ 入口文件 ]
 
 // 调试模式开关
-define('APP_DEBUG', true);
+define('APP_DEBUG', false);
 
 // 定义CMF根目录,可更改此目录
 define('CMF_ROOT', dirname(__DIR__) . '/');

+ 4 - 4
public/static/css/404.css

@@ -1,4 +1,4 @@
-p.main_404{width:400px;margin:140px auto;text-align:center;}
-p span.main_404_desc{float:left;margin-top:50px;font-size:26px;font-weight:bold;color:#666;}
-p span.main_404_back{float:left;margin:50px 0 70px 135px;font-size:18px;font-weight:bold;border-radius:3px;width: 130px;height: 36px;line-height: 36px;background-color:#00b350;}
-p span.main_404_back a{color:#fff;}
+.main_404{width:400px;margin:140px auto;text-align:center;}
+.main_404 span.main_404_desc{float:left;margin-top:50px;font-size:26px;font-weight:bold;color:#666;}
+.main_404 span.main_404_back{float:left;margin:50px 0 70px 135px;font-size:18px;font-weight:bold;border-radius:3px;width: 130px;height: 36px;line-height: 36px;background-color:#00b350;}
+.main_404 span.main_404_back a{color:#fff;}

+ 16 - 0
public/themes/admin_simpleboot3/admin/setting/site.html

@@ -128,6 +128,22 @@
                             </div>
                         </div>
                         <div class="form-group">
+                            <label for="input-hot_tags" class="col-sm-2 control-label">热搜标签</label>
+                            <div class="col-md-6 col-sm-10">
+                                <input type="text" class="form-control" id="input-hot_tags" name="options[hot_tags]"
+                                       value="{$site_info.hot_tags|default=''}">
+                                <span class="help-block">多个小写逗号分隔,如:火锅,特色烤肉</span>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="input-liuyan_url" class="col-sm-2 control-label">留言发布地址</label>
+                            <div class="col-md-6 col-sm-10">
+                                <input type="text" class="form-control" id="input-liuyan_url" name="options[liuyan_url]"
+                                       value="{$site_info.liuyan_url|default=''}">
+                                <span class="help-block">填写留言端发布地址域名HTTP开头,如:http://i.1688cypt.com</span>
+                            </div>
+                        </div>
+                        <div class="form-group">
                             <label for="input-site_icp" class="col-sm-2 control-label">{:lang('WEBSITE_ICP')}</label>
                             <div class="col-md-6 col-sm-10">
                                 <input type="text" class="form-control" id="input-site_icp" name="options[site_icp]"

+ 6 - 5
public/themes/mjmls/index/block/footer.html

@@ -2,11 +2,11 @@
 <include file="block/link" />
 
 <!-- footer start-->
-<div class="online-box mob_none">
+<!--<div class="online-box mob_none">
     <div class="container">
         <img src="__TMPL__/static/images/fd_pic0101.png" alt="">
     </div>
-</div>
+</div>-->
 <footer>
     <div class="container">
         <ul class="foot-nav">
@@ -33,6 +33,8 @@
         </div>
         <p>{$site_info.copyright|default=''}<br>技术支持 东尔技术团队  备案号:{$site_info.site_icp|default=''}</p>
     </div>
+    <!-- 统计代码 -->
+    {$site_info.site_analytics|default=''}
 </footer>
 <!-- footer over -->
 <!-- 侧边栏固定 -->
@@ -56,7 +58,7 @@
             <strong>我们将尽快给您回电</strong>
             <span>上班时间:9:00-12:00 13:30-18:00(周一至周五,节假日除外)</span>
         </p>
-        <form id="liuyanForm" action="/index/jiameng/message.html" method="POST">
+        <form id="liuyanForm" action="{$site_info.liuyan_url|default=''}/index/jiameng/message.html" method="POST">
             <input type="hidden" name="jm_id"  value="{$info.id|default='0'}">
             <input class="name" type="text" name="name" id="name" value="" placeholder="您的称呼" required="required" />
             <input class="xm" type="text" name="jm_title" id="xm" value="{$info.title|default=''}" placeholder="创业项目" required="required" />
@@ -69,7 +71,7 @@
 
 <!--  -->
 <script src="__TMPL__/static/js/swiper.min.js" type="text/javascript"></script>
-<script src="__TMPL__/static/js/base.js" type="text/javascript"></script>
+<script src="__TMPL__/static/js/base.js?v=20200617" type="text/javascript"></script>
 <script src="__TMPL__/static/js/index.js" type="text/javascript"></script>
 <script src="__TMPL__/static/layer/layer.js"></script>
 <script>
@@ -95,6 +97,5 @@
         });
     });
 </script>
-</script>
 </body>
 </html>

+ 6 - 5
public/themes/mjmls/index/block/footer_new.html

@@ -2,11 +2,11 @@
 <include file="block/link" />
 
 <!-- footer start-->
-<div class="online-box mob_none">
+<!--<div class="online-box mob_none">
     <div class="container">
         <img src="__TMPL__/static/images/fd_pic0101.png" alt="">
     </div>
-</div>
+</div>-->
 <footer>
     <div class="container">
         <ul class="foot-nav">
@@ -33,11 +33,13 @@
         </div>
         <p>{$site_info.copyright|default=''}<br>技术支持 东尔技术团队  备案号:{$site_info.site_icp|default=''}</p>
     </div>
+    <!-- 统计代码 -->
+    {$site_info.site_analytics|default=''}
 </footer>
 <!-- footer over -->
 <!-- 侧边栏固定 -->
 <div class="siderBar mob_none">
-    <div class="free-tel"><i class="fa fa-phone"></i>获取加盟资料</div>
+    <div class="free-tel"><a href="#liuyan"><i class="fa fa-phone"></i>获取加盟资料</a></div>
     <div class="online">
         <a href="#liuyan" class="" target=""><i class="fa fa-commenting"></i>在线咨询</a>
     </div>
@@ -56,7 +58,7 @@
             <strong>我们将尽快给您回电</strong>
             <span>上班时间:9:00-12:00 13:30-18:00(周一至周五,节假日除外)</span>
         </p>
-        <form id="liuyanForm" action="/index/jiameng/message.html" method="POST">
+        <form id="liuyanForm" action="{$site_info.liuyan_url|default=''}/index/jiameng/message.html" method="POST">
             <input type="hidden" name="jm_id"  value="{$info.id|default='0'}">
             <input class="name" type="text" name="name" id="name" value="" placeholder="您的称呼" required="required" />
             <input class="xm" type="text" name="jm_title" id="xm" value="{$info.title|default=''}" placeholder="创业项目" required="required" />
@@ -111,6 +113,5 @@
         });
     });
 </script>
-</script>
 </body>
 </html>

+ 5 - 4
public/themes/mjmls/index/block/footer_xm.html

@@ -2,11 +2,11 @@
 <include file="block/link" />
 
 <!-- footer start-->
-<div class="online-box mob_none">
+<!--<div class="online-box mob_none">
     <div class="container">
         <img src="__TMPL__/static/images/fd_pic0101.png" alt="">
     </div>
-</div>
+</div>-->
 <footer>
     <div class="container">
         <ul class="foot-nav">
@@ -33,6 +33,8 @@
         </div>
         <p>{$site_info.copyright|default=''}<br>技术支持 东尔技术团队  备案号:{$site_info.site_icp|default=''}</p>
     </div>
+    <!-- 统计代码 -->
+    {$site_info.site_analytics|default=''}
 </footer>
 <!-- footer over -->
 <!-- 侧边栏固定 -->
@@ -56,7 +58,7 @@
             <strong>我们将尽快给您回电</strong>
             <span>上班时间:9:00-12:00 13:30-18:00(周一至周五,节假日除外)</span>
         </p>
-        <form id="liuyanForm" action="/index/jiameng/message.html" method="POST">
+        <form id="liuyanForm" action="{$site_info.liuyan_url|default=''}/index/jiameng/message.html" method="POST">
             <input type="hidden" name="jm_id"  value="{$info.id|default='0'}">
             <input class="name" type="text" name="name" id="name" value="" placeholder="您的称呼" required="required" />
             <input class="xm" type="text" name="jm_title" id="xm" value="{$info.title|default=''}" placeholder="创业项目" required="required" />
@@ -112,6 +114,5 @@
         });
     });
 </script>
-</script>
 </body>
 </html>

+ 8 - 11
public/themes/mjmls/index/block/header.html

@@ -1,5 +1,5 @@
 <include file="block/meta" />
-<link rel="stylesheet" href="__TMPL__/static/css/index.css">
+<link rel="stylesheet" href="__TMPL__/static/css/index.css?v=20200617">
 <!-- header start -->
 <header>
     <div class="t-header mob_none">
@@ -14,7 +14,7 @@
             <ul class="fr">
                 <li>免费咨询:<b>400-606-6786</b></li>
                 <li class="wx"><i class="fa fa-mobile"></i>手机版
-                    <div><img src="__TMPL__/static/images/ewm.png" alt=""></div>
+                    <div><img src="__TMPL__/static/images/ewm.png" alt="" ></div>
                 </li>
                 <li class="wx"><i class="fa fa-weixin"></i>微信
                     <div><img src="__TMPL__/static/images/erweima1.png" alt=""></div>
@@ -118,18 +118,15 @@
             </script>
             <p class="nowrap">
                 <b>热门标签:</b>
-                <a href="/xmhuoguo/" title="" target="_blank">火锅</a>
-                <a href="/xmcanyin/" title="" target="_blank">餐饮</a>
-                <a href="/xmjiaoyu/" title="" target="_blank">教育</a>
-                <a href="/xmkuaican/" title="" target="_blank">快餐</a>
-                <a href="/xmzaojiao/" title="" target="_blank">早教</a>
+                <foreach name="site_info.hot_tags" id="v">
+                    <a href="/search/{$v}/" title="{$v}" >{$v}</a>
+                </foreach>
             </p>
             <p class="nowrap">
                 <b>热门品牌:</b>
-                <a href="/xmcanyin/" title="" target="_blank">餐饮</a>
-                <a href="/xmmuying/" title="" target="_blank">母婴</a>
-                <a href="/xmjiancai/" title="" target="_blank">建材</a>
-                <a href="/xmfuzhuang/" title="" target="_blank">服装</a>
+                <foreach name="site_info.hot_keywords" id="v">
+                <a href="/search/{$v}/" title="{$v}" >{$v}</a>
+                </foreach>
             </p>
         </div>
         <i class="fa fa-bars pc_show"></i>

+ 6 - 13
public/themes/mjmls/index/block/header_xm.html

@@ -1,7 +1,3 @@
-<include file="block/meta" />
-<title><?php if(isset($seo_title)){ ?>{$seo_title}<?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="{$site_info.site_name}<?php if(isset($seo_desc)){ ?>{$seo_desc}<?php }else{ ?>{$site_info.site_seo_desc_xm}<?php } ?>" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 <!-- header start -->
 <header>
@@ -119,18 +115,15 @@
             </script>
             <p class="nowrap">
                 <b>热门标签:</b>
-                <a href="/xmhuoguo/" title="" target="_blank">火锅</a>
-                <a href="/xmcanyin/" title="" target="_blank">餐饮</a>
-                <a href="/xmjiaoyu/" title="" target="_blank">教育</a>
-                <a href="/xmkuaican/" title="" target="_blank">快餐</a>
-                <a href="/xmzaojiao/" title="" target="_blank">早教</a>
+                <foreach name="site_info.hot_tags" id="v">
+                    <a href="/search/{$v}/" title="{$v}" >{$v}</a>
+                </foreach>
             </p>
             <p class="nowrap">
                 <b>热门品牌:</b>
-                <a href="/xmcanyin/" title="" target="_blank">餐饮</a>
-                <a href="/xmmuying/" title="" target="_blank">母婴</a>
-                <a href="/xmjiancai/" title="" target="_blank">建材</a>
-                <a href="/xmfuzhuang/" title="" target="_blank">服装</a>
+                <foreach name="site_info.hot_keywords" id="v">
+                    <a href="/search/{$v}/" title="{$v}" >{$v}</a>
+                </foreach>
             </p>
         </div>
         <i class="fa fa-bars pc_show"></i>

+ 10 - 1
public/themes/mjmls/index/block/meta.html

@@ -10,7 +10,6 @@
     <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="mobile-agent" content="format=html5;url={$dqurl}">
     <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">
@@ -20,5 +19,15 @@
     <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>

+ 33 - 0
public/themes/mjmls/index/block/meta_know.html

@@ -0,0 +1,33 @@
+<!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(isset($seo_title)){ ?>{$seo_title}<?php }else{ ?>{$site_info.site_seo_title_know}<?php } ?>-{$site_info.site_name}</title>
+    <meta name="keywords" content="<?php if(isset($seo_keywords)){ ?>{$seo_keywords}<?php }else{ ?>{$site_info.site_seo_keywords_know}<?php } ?>" />
+    <meta name="description" content="<?php if(isset($seo_desc)){ ?>{$seo_desc}<?php }else{ ?>{$site_info.site_seo_desc_know}<?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.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>

+ 33 - 0
public/themes/mjmls/index/block/meta_top.html

@@ -0,0 +1,33 @@
+<!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(isset($seo_title)){ ?>{$seo_title}<?php }else{ ?>{$site_info.site_seo_title_top}<?php } ?>-{$site_info.site_name}</title>
+    <meta name="keywords" content="<?php if(isset($seo_keywords)){ ?>{$seo_keywords}<?php }else{ ?>{$site_info.site_seo_keywords_top}<?php } ?>" />
+    <meta name="description" content="<?php if(isset($seo_desc)){ ?>{$seo_desc}<?php }else{ ?>{$site_info.site_seo_desc_top}<?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.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>

+ 13 - 4
public/themes/mjmls/index/block/meta_inside.html

@@ -3,14 +3,13 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>【{$site_info.site_seo_title}】-{$site_info.site_name}</title>
-    <meta name="keywords" content="{$site_info.site_seo_keywords}" />
-    <meta name="description" content="{$site_info.site_seo_description}" />
+    <title><?php if(isset($seo_title)){ ?>{$seo_title}<?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="mobile-agent" content="format=html5;url={$dqurl}">
     <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">
@@ -20,5 +19,15 @@
     <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>

+ 33 - 0
public/themes/mjmls/index/block/meta_xw.html

@@ -0,0 +1,33 @@
+<!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(isset($seo_title)){ ?>{$seo_title}<?php }else{ ?>{$site_info.site_seo_title_news}<?php } ?>-{$site_info.site_name}</title>
+    <meta name="keywords" content="<?php if(isset($seo_keywords)){ ?>{$seo_keywords}<?php }else{ ?>{$site_info.site_seo_keywords_news}<?php } ?>" />
+    <meta name="description" content="<?php if(isset($seo_desc)){ ?>{$seo_desc}++<?php }else{ ?>{$site_info.site_seo_desc_news}<?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.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>

+ 3 - 3
public/themes/mjmls/index/block/nav.html

@@ -33,14 +33,14 @@
                     </div>
                 </div>
             </div>
-            <foreach name="catearr" id="v">
+            <foreach name="navcate" id="v">
                 <div class="trade-list-box">
                     <div class="swiper-img-list">
                         <div class="trade-box">
                             <p class="trade-title"><a href="/xm{$v.enname}/">所有{$v.catname}项目></a></p>
-                            <if condition="v.sonData">
+                            <if condition="v.son">
                                 <div class="trade-list">
-                                    <foreach name="v.sonData" id="v1">
+                                    <foreach name="v.son" id="v1">
                                     <a href="/xm{$v1.enname}/">{$v1.catname}</a>
                                     </foreach>
                                 </div>

+ 2 - 0
public/themes/mjmls/index/index/advert/topic.html

@@ -1,6 +1,8 @@
 <!--  -->
+<if condition="!$is_mobile">
 <div class="container mob_none">
     <foreach name="banner2" id="v">
     <img src="{:cmf_get_image_preview_url($v.image)}" target="{$v.target}" width="1200" height="80" alt="{$v.title}">
     </foreach>
 </div>
+</if>

+ 10 - 4
public/themes/mjmls/index/index/floor/banner.html

@@ -1,4 +1,5 @@
 <div class="container">
+    <if condition="!$is_mobile">
     <div class="fl mob_none">
         <ul class="sub-list">
             <?php $colorarr = ['#f3bb84','#d0aaf8','#3c8ec1','#bed79f','#88e5bb','#eb98ca','#f3adae','#e8ab5e']; ?>
@@ -29,13 +30,14 @@
             </foreach>
         </ul>
     </div>
+    </if>
     <div class="fl slide-banner">
         <div class="swiper-container" id="slide1">
             <div class="swiper-wrapper">
                 <foreach name="banner" id="v">
                     <div class="swiper-slide">
                         <a href="{$v.url|default='#'}" target="{$v.target}" title="{$v.title}">
-                            <img class="swiper-lazy" data-src="{:cmf_get_image_preview_url($v.image)}" alt="{$v.title}">
+                            <img class="swiper-lazy" data-src="{:cmf_get_image_preview_url($v.image)}" >
                             <div class="swiper-lazy-preloader"></div>
                         </a>
                     </div>
@@ -43,11 +45,12 @@
             </div>
             <div class="swiper-pagination"></div>
         </div>
+        <if condition="!$is_mobile">
         <div class="slide-bottom mob_none">
             <div class="fl">
                 <foreach name="banner1" id="v">
                 <a href="{$v.url|default='#'}" target="{$v.target}" title="{$v.title}">
-                    <img data-src="{:cmf_get_image_preview_url($v.image)}" width="150" height="190" alt="{$v.title}">
+                    <img data-src="{:cmf_get_image_preview_url($v.image)}" width="150" height="190" >
                 </a>
                 </foreach>
             </div>
@@ -55,7 +58,7 @@
                 <foreach name="bannerMin" id="v">
                 <li>
                     <a href="{$v.url|default='#'}" target="{$v.target}" title="{$v.title}">
-                        <img data-src="{:cmf_get_image_preview_url($v.image)}" width="80" height="80" alt="{$v.title}">
+                        <img data-src="{:cmf_get_image_preview_url($v.image)}" width="80" height="80" >
                         <p class="nowrap">{$v.title}</p>
                         <span>{$v.description}</span>
                     </a>
@@ -64,10 +67,12 @@
             </ul>
             <div class="clearfix"></div>
         </div>
+        </if>
     </div>
+    <if condition="!$is_mobile">
     <div class="fr slide-right mob_none">
         <div class="br-top">
-            <img data-src="__TMPL__/static/images/noLogin.png" width="54" height="54" alt="">
+            <img data-src="__TMPL__/static/images/noLogin.png" width="54" height="54" alt="" >
             <p>HI,你好!<br> <span class="nowrap">创业开好店,如此简单!</span></p>
         </div>
         <div class="zsxx-box">
@@ -125,5 +130,6 @@
             </form>
         </div>
     </div>
+    </if>
     <div class="clearfix"></div>
 </div>

+ 10 - 2
public/themes/mjmls/index/index/floor/brand.html

@@ -1,6 +1,7 @@
 <!-- 品牌精选 -->
 <div class="mt20 bgf">
     <div class="container">
+        <if condition="!$is_mobile">
         <div class="fl tod-star mob_none">
             <h2 class="hb-title"><i class="fa fa-star-o"></i>今日之星</h2>
             <div class="swiper-container" id="slide2">
@@ -8,7 +9,7 @@
                     <foreach name="brand1" id="v">
                     <li class="swiper-slide">
                         <a href="/b{$v.id}/" title="{$v.title}" target="_blank">
-                            <img class="swiper-lazy" data-src="{:cmf_get_image_preview_url($v.logo)}" width="280" height="215" alt="{$v.title}">
+                            <img class="swiper-lazy" data-src="{:cmf_get_image_preview_url($v.logo)}" width="280" height="215" alt="{$v.title}" onerror="imageError(this)">
                             <div class="swiper-lazy-preloader"></div>
                         </a>
                         <div class="botbox">
@@ -26,16 +27,23 @@
                 <div class="swiper-pagination"></div>
             </div>
         </div>
+        </if>
         <div class="fr ppjx-box">
             <h2 class="hb-title"><i class="fa fa-diamond"></i>品牌精选<a class="fr" href="/list/brand-2.shtml" target="">更多></a></h2>
             <ul>
                 <foreach name="brand2" id="v">
                 <li>
                     <a href="/b{$v.id}/" title="{$v.title}" target="_blank">
-                        <img data-src="{:cmf_get_image_preview_url($v.logo)}" width="174" height="130" alt="{$v.title}">
+                        <if condition="!$is_mobile">
+                            <img src="{:cmf_get_image_preview_url($v.logo)}?v=1" width="174" height="130" alt="{$v.title}" onerror="imageError(this)">
+                            <else/>
+                            <img src="{:cmf_get_image_preview_url($v.logo)}?v=1" width="174" onload="resetSize(this)" height="130" alt="{$v.title}" onerror="imageError(this)" >
+                        </if>
+
                         <h3 class="nowrap">{$v.title}</h3>
                         <p><font>{$v.touzi_level_name}</font><span>门店: {$v.mendian}家</span></p>
                     </a>
+                    <!--<p style="width: 100px">{:cmf_get_image_preview_url($v.logo)}?v=1</p>-->
                 </li>
                 </foreach>
             </ul>

+ 1 - 1
public/themes/mjmls/index/index/floor/brand_choice.html

@@ -8,7 +8,7 @@
         <foreach name="brand4" id="v">
         <li>
             <a href="/b{$v.id}/" target="_blank" title="{$v.title}">
-                <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="162.79" height="122.09">
+                <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="162.79" height="122.09" onerror="imageError(this)">
                 <i>{$v.catname}</i>
                 <h3 class="nowrap">{$v.title}</h3>
                 <p>

+ 2 - 2
public/themes/mjmls/index/index/floor/join.html

@@ -12,7 +12,7 @@
                         <foreach name="$brand7" id="brands">
                         <div class="swiper-slide">
                             <foreach name="brands" id="v">
-                            <a href="/b{$v.id}/" target="_blank" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}"></a>
+                            <a href="/b{$v.id}/" target="_blank" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.logo)}" onerror="imageError(this)" alt="{$v.title}"></a>
                             </foreach>
                         </div>
                         </foreach>
@@ -31,7 +31,7 @@
             <foreach name="courseList" id="v">
                 <if condition="$key eq 0">
                     <div>
-                        <a href="/news{$v.id}/" target="_blank" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.thumb)}" width="300" height="170" alt="{$v.title}"></a>
+                        <a href="/news{$v.id}/" target="_blank" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.thumb)}" onerror="imageError(this)" width="300" height="170" alt="{$v.title}"></a>
                     </div>
                 </if>
             </foreach>

+ 1 - 1
public/themes/mjmls/index/index/floor/new_recommend.html

@@ -8,7 +8,7 @@
         <foreach name="brand8" id="v">
             <li>
                 <a href="/b{$v.id}/" target="_blank" title="{$v.title}">
-                    <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="185.85" height="139.39">
+                    <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="185.85" height="139.39" onerror="imageError(this)">
                     <h3 class="nowrap">{$v.title}</h3>
                     <p>
                         <b>¥{$v.touzi_level_name}</b>

+ 15 - 12
public/themes/mjmls/index/index/floor/phb.html

@@ -10,7 +10,7 @@
                         <foreach name="phb1" id="v">
                         <li <if condition="$key eq 0">class="active"</if>>
                             <a href="#" target="">
-                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}">
+                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}" onerror="imageError(this)">
                                 <div>
                                     <i></i>
                                     <span class="nowrap">{$v.title}</span>
@@ -28,7 +28,7 @@
                         <foreach name="phb2" id="v">
                             <li <if condition="$key eq 0">class="active"</if>>
                             <a href="#" target="">
-                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}">
+                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}" onerror="imageError(this)">
                                 <div>
                                     <i></i>
                                     <span class="nowrap">{$v.title}</span>
@@ -46,7 +46,7 @@
                         <foreach name="phb3" id="v">
                             <li <if condition="$key eq 0">class="active"</if>>
                             <a href="#" target="">
-                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}">
+                                <img class="fl" data-src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}" onerror="imageError(this)">
                                 <div>
                                     <i></i>
                                     <span class="nowrap">{$v.title}</span>
@@ -67,7 +67,7 @@
             </div>
             <div class="mob_none mt30">
                 <foreach name="banner3" id="v">
-                <a href="{$v.url}" target="{$v.target}" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.image)}" width="880" height="70" alt="{$v.title}"></a>
+                <a href="{$v.url}" target="{$v.target}" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.image)}" onerror="imageError(this)" width="880" height="70" alt="{$v.title}"></a>
                 </foreach>
             </div>
         </div>
@@ -77,22 +77,25 @@
                 <div class="swiper-wrapper">
                     <foreach name="jmMessages" id="v">
                     <div class="swiper-slide">
-                        <div>
-                            <b>{$v.name|default='游客'}</b>
-                            咨询了
-                            <span>{$v.jm_title|default=''}</span>
-                            <em>来自{$v.address|default='未知地区'}</em>
-                        </div>
-                        <p>{$v.content|default='暂无内容'}</p>
+                        <a href="/news{$v.id}/" title="{$v.title}">
+                            <div>
+                                <b>{$v.title|default=''}</b>
+                                <!--<span>{$v.title|default=''}</span>-->
+                                <em>{:date('Y-m-d',$v.create_time)}</em>
+                            </div>
+                            <p>{$v.description|default='暂无内容'}</p>
+                        </a>
                     </div>
                     </foreach>
                 </div>
             </div>
+            <if condition="!$is_mobile">
             <div class="mt30 mob_none">
                 <foreach name="banner4" id="v">
-                    <a href="{$v.url}" target="{$v.target}" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.image)}" width="300" height="170" alt="{$v.title}"></a>
+                    <a href="{$v.url}" target="{$v.target}" title="{$v.title}"><img data-src="{:cmf_get_image_preview_url($v.image)}" onerror="imageError(this)" width="300" height="170" alt="{$v.title}"></a>
                 </foreach>
             </div>
+            </if>
         </div>
         <div class="clearfix"></div>
     </div>

+ 2 - 1
public/themes/mjmls/index/index/floor/recommend.html

@@ -8,7 +8,7 @@
         <foreach name="brand3" id="v">
         <li>
             <a href="/b{$v.id}/" target="" title="{$v.title}">
-                <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="224" height="168">
+                <img data-src="{:cmf_get_image_preview_url($v.logo)}?v=1" alt="{$v.title}" onload="resetSize(this)" width="" height="168" onerror="imageError(this)">
                 <h3 class="nowrap">{$v.title}</h3>
                 <p>
                     <b class="fl">{$v.touzi_level_name|default='暂无'}</b>
@@ -17,5 +17,6 @@
             </a>
         </li>
         </foreach>
+
     </ul>
 </div>

+ 1 - 1
public/themes/mjmls/index/index/floor/topic.html

@@ -9,7 +9,7 @@
             <foreach name="brand6" id="v">
             <li>
                 <a href="#" target="" title="{$v.title}">
-                    <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="216" height="162">
+                    <img data-src="{:cmf_get_image_preview_url($v.logo)}" alt="{$v.title}" width="216" height="162" onerror="imageError(this)">
                     <span>{$v.title}</span>
                 </a>
             </li>

+ 0 - 2
public/themes/mjmls/index/index/index.html

@@ -41,7 +41,5 @@
 
 <!-- content over -->
 
-
-
 <!-- 页脚 -->
 <include file="block/footer" />

Plik diff jest za duży
+ 0 - 198
public/themes/mjmls/index/jiameng/category.html


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

@@ -1,3 +1,4 @@
+<include file="block/meta_xm" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 
@@ -66,7 +67,7 @@
                 <li>
                     <div class="fl li-le">
                         <a href="/b{$v.id}/" title="{$v.title}">
-                            <img src="{:cmf_get_image_preview_url($v.logo)}" alt="">
+                            <img src="{:cmf_get_image_preview_url($v.logo)}" alt="" onerror="imageError(this)">
                         </a>
                     </div>
                     <div class="fl li-mid">
@@ -123,7 +124,7 @@
                     <li>
                         <i></i>
                         <a href="/b{$v.id}/" title="{$v.title},{$v.company},{$v.catname}">{$v.title}</a>
-                        <span class="fr">{$v.hits|default='0'}</span>
+                        <span class="fr">{$v.zhiying|default='0'}</span>
                     </li>
                 </foreach>
             </ul>

+ 3 - 2
public/themes/mjmls/index/jiameng/search.html

@@ -1,3 +1,4 @@
+<include file="block/meta_xm" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 
@@ -81,7 +82,7 @@
             <li>
                 <div class="fl li-le">
                     <a href="/b{$v.id}/" title="{$v.title}">
-                        <img src="{:cmf_get_image_preview_url($v.logo)}" alt="">
+                        <img src="{:cmf_get_image_preview_url($v.logo)}" alt="" onerror="imageError(this)">
                     </a>
                 </div>
                 <div class="fl li-mid">
@@ -138,7 +139,7 @@
                 <li>
                     <i></i>
                     <a href="/b{$v.id}/" title="{$v.title},{$v.company},{$v.catname}">{$v.title}</a>
-                    <span class="fr">{$v.hits|default='0'}</span>
+                    <span class="fr">{$v.zhiying|default='0'}</span>
                 </li>
                 </foreach>
             </ul>

+ 5 - 4
public/themes/mjmls/index/jiameng/show.html

@@ -1,3 +1,4 @@
+<include file="block/meta_xm" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 <!-- nav -->
@@ -15,7 +16,7 @@
     <!-- 项目详情 header -->
     <div class="container item-detail-top">
         <div class="fl">
-            <div class="swiper-container item-slide">
+            <div class="swiper-container item-slide" style="min-height: 300px;">
                 <ul class="swiper-wrapper">
                     <if condition="$info.thumb">
                     <li class="swiper-slide">
@@ -175,7 +176,7 @@
                     <if condition="$key eq 0">
                         <div class="fir-nbox mob_none">
                             <a href="/news{$v.id}/" title="{$v.title}">
-                                <img src="{:cmf_get_image_preview_url($v.thumb)}" alt="{$v.title}">
+                                <img src="{:cmf_get_image_preview_url($v.thumb)}">
                                 <h3> {$v.title}</h3>
                                 <p> {$v.description}</p>
                                 <span>{:date('m-d',$v.create_time)}</span>
@@ -201,7 +202,7 @@
                     <if condition="$key eq 0">
                     <div class="fir-nbox mob_none">
                         <a href="/news{$v.id}/" title="{$v.title}">
-                            <img src="{:cmf_get_image_preview_url($v.thumb)}" alt="{$v.title}">
+                            <img src="{:cmf_get_image_preview_url($v.thumb)}">
                             <h3> {$v.title}</h3>
                             <p> {$v.description}</p>
                             <span>{:date('m-d',$v.create_time)}</span>
@@ -226,7 +227,7 @@
             <div class="message-box-top">我要咨询<p><i class="fa fa-phone"></i> 免费咨询热线:<b>400-***-****</b></p>
             </div>
             <div class="message-box-form">
-                <form action="{:url('jiameng/message')}" method="post">
+                <form action="{$site_info.liuyan_url|default=''}/index/jiameng/message" method="post">
                     <input type="hidden" name="jm_id" value="{$info.id}">
                     <input type="hidden" name="jm_title" value="{$info.title}">
                     <input type="hidden" name="catid" value="{$catinfo.id}">

+ 1 - 1
public/themes/mjmls/index/know/index.html

@@ -1,5 +1,5 @@
+<include file="block/meta_know" />
 <include file="block/header_xm" />
-
 <link rel="stylesheet" type="text/css" href="__TMPL__/static/css/know-content.css"/>
 <link rel="stylesheet" type="text/css" href="__TMPL__/static/css/know.css"/>
 <style>

+ 1 - 0
public/themes/mjmls/index/know/show.html

@@ -1,3 +1,4 @@
+<include file="block/meta_know" />
 <include file="block/header_xm"/>
 <link rel="stylesheet" type="text/css" href="__TMPL__/static/css/know-content.css"/>
 <link rel="stylesheet" type="text/css" href="__TMPL__/static/css/know.css"/>

+ 1 - 0
public/themes/mjmls/index/news/index.html

@@ -1,3 +1,4 @@
+<include file="block/meta_xw" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 

+ 1 - 0
public/themes/mjmls/index/news/list.html

@@ -1,3 +1,4 @@
+<include file="block/meta_xw" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 

+ 1 - 1
public/themes/mjmls/index/news/message.html

@@ -80,7 +80,7 @@
 		<div class="advisory">
                 <h2>欢迎留言咨询</h2>
                 <h3>留下您的联系方式,我们会尽快联系您</h3>
-                <form action="/index/jiameng/message.html">
+                <form action="{$site_info.liuyan_url|default=''}/index/jiameng/message">
                 	<input type="hidden" name="jm_id" id="" value="0">
                     <p><span>咨询项目:</span><input type="text" name="jm_title" value=""></p>
                     <p><span>您的称呼:</span><input type="text" name="name" placeholder="输入您的名字" id="message_name"></p>

+ 2 - 1
public/themes/mjmls/index/news/show.html

@@ -1,3 +1,4 @@
+<include file="block/meta_xw" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 <!-- nav -->
@@ -49,7 +50,7 @@
                 <span>免费咨询电话: 400-606-9888</span>
             </div>
             <div class="fr">
-                <form action="{:url('jiameng/message')}" method="post">
+                <form action="{$site_info.liuyan_url|default=''}/index/jiameng/message" method="post">
                     <input type="hidden" name="jm_id" value="{$info.pid}" />
                     <input type="hidden" name="news_id" value="{$info.id}" />
                     <input type="hidden" name="catid" value="{$info.catid}" />

+ 4 - 3
public/themes/mjmls/index/top10/index.html

@@ -1,3 +1,4 @@
+<include file="block/meta_top" />
 <include file="block/header_xm" />
 <link rel="stylesheet" href="__TMPL__/static/css/inside.css">
 <!-- nav -->
@@ -26,7 +27,7 @@
                         <i></i>
                         <h3 class="nowrap">{$v.title}</h3>
                         <em>¥{$touziarr[$v.touzi_level]}</em>
-                        <span>{$v.hits|default='0'}</span>
+                        <span>{$v.search_count|default='0'}</span>
                     </div>
                     <div class="afli">
                         <img src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}" />
@@ -86,7 +87,7 @@
                         <i></i>
                         <h3 class="nowrap">{$v.title}</h3>
                         <em>¥{$touziarr[$v.touzi_level]}</em>
-                        <span>{$v.hits|default='0'}</span>
+                        <span>{$v.search_count|default='0'}</span>
                     </div>
                     <div class="afli">
                         <img src="{:cmf_get_image_preview_url($v.logo)}" width="100" height="75" alt="{$v.title}" />
@@ -122,7 +123,7 @@
             <li>
                 <a href="/b{$v.id}/" target="" title="{$v.title}">
                     <img src="{:cmf_get_image_preview_url($v.logo)}" width="163.2" height="122.4" alt="{$v.title}">
-                    <h3 class="nowrap">光猪圈健身</h3>
+                    <h3 class="nowrap">{$v.title}</h3>
                     <p>
                         <b>{$touziarr[$v.touzi_level]}</b>
                         <span>门店:{$v.mendian|default='0'}家</span>

+ 7 - 0
public/themes/mjmls/static/css/index.css

@@ -1226,6 +1226,10 @@
 	vertical-align: top;
 	margin-right: 10px;
 	color: #fff;
+
+	max-width: 198px;
+	overflow: hidden;
+	height: 20px;
 }
 
 .rank-right .swiper-slide span {
@@ -1530,6 +1534,9 @@
 		font-size: 22px;
 	}
 	/*  */
+	.troom ul li p {
+		display: none !important;
+	}
 	.troom {
 		padding: 0 10px;
 	}

+ 5 - 5
public/themes/mjmls/static/css/master.css

@@ -601,8 +601,8 @@ footer p a {
 
 .free-tel {
 	background: #fffbef;
-	color: #856f31;
-	border: 1px solid #bca35b;
+	color: #ee0f15;
+	border: 1px solid #f73e43;
 }
 
 .free-tel:hover {
@@ -612,15 +612,15 @@ footer p a {
 .siderBar i {
 	margin-bottom: 4px;
 	font-size: 20px;
-	color: #856f31;
+	color: #f73e43;
 }
 
 .online {
-	background: #bca35b;
+	background: #ee0f15;
 }
 
 .online:hover {
-	background: #a0875a
+	background: #f73e43
 }
 
 .online a {

+ 7 - 2
public/themes/mjmls/static/js/base.js

@@ -1,5 +1,7 @@
 
 $(function () {
+
+
     // menu
     $(".m-header i").click(function () {
         $(".mob-navigation").addClass("on");
@@ -46,15 +48,18 @@ $(function () {
         var scrollTop = document.documentElement.scrollTop || document.body.scrollTop; //滚动条距离顶部高度
         for (var i = n; i < num; i++) {
             if (img[i].offsetTop < seeHeight + scrollTop) {
-                var src = img[i].getAttribute("src");
+                var src = $.trim(img[i].getAttribute("src"));
+                var dataSrc = img[i].getAttribute("data-src");
                 if (src == "" || typeof(src) == 'undefined' || src==null) {
-                    img[i].src = img[i].getAttribute("data-src");
+                    img[i].src = dataSrc;
                 }
                 n = i + 1;
             }
         }
     }
 
+
+
     // 回顶部
     $('.go-top').click(function () {
         $('body,html').animate({ scrollTop: 0 });

+ 6 - 1
vendor/thinkcmf/cmf/src/controller/HomeBaseController.php

@@ -25,16 +25,21 @@ class HomeBaseController extends BaseController
         parent::initialize();
         $siteInfo = cmf_get_site_info();
         $siteInfo['hot_keywords'] = isset($siteInfo['hot_keywords'])&&$siteInfo['hot_keywords']? explode(',', $siteInfo['hot_keywords']) : [];
+        $siteInfo['hot_tags'] = isset($siteInfo['hot_tags'])&&$siteInfo['hot_tags']? explode(',', $siteInfo['hot_tags']) : [];
         View::share('site_info', $siteInfo);
 
         // 分类列表
         $catearr = CategoryService::getCateList();
+        $navcate = CategoryService::getNavCateList();
+
         // 获取热门分类
         $hotCateList = CategoryService::getHotCates(10);
         $this->assign('hotCateList',$hotCateList);
+        $this->assign('navcate',$navcate);
         $this->assign('catearr',$catearr);
         $this->assign('searchType', 1);
-        
+        $this->assign('is_mobile', cmf_is_mobile());
+
         //当前url
         if($_SERVER['REQUEST_URI']!='/'){
         	$dqurl = "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];

+ 31 - 39
vendor/thinkphp/tpl/dispatch_jump.tpl

@@ -1,49 +1,41 @@
 {__NOLAYOUT__}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+    <title>页面错误</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
-    <title>跳转提示</title>
-    <style type="text/css">
-        *{ padding: 0; margin: 0; }
-        body{ background: #fff; font-family: "Microsoft Yahei","Helvetica Neue",Helvetica,Arial,sans-serif; color: #333; font-size: 16px; }
-        .system-message{ padding: 24px 48px; }
-        .system-message h1{ font-size: 100px; font-weight: normal; line-height: 120px; margin-bottom: 12px; }
-        .system-message .jump{ padding-top: 10px; }
-        .system-message .jump a{ color: #333; }
-        .system-message .success,.system-message .error{ line-height: 1.8em; font-size: 36px; }
-        .system-message .detail{ font-size: 12px; line-height: 20px; margin-top: 12px; display: none; }
-    </style>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <link rel="stylesheet" href="/static/css/404.css" />
 </head>
 <body>
-    <div class="system-message">
+<div class="main_404">
+    <img src="/static/images/404.png" />
+    <br>
+    <p class="main_404_desc">
         <?php switch ($code) {?>
-            <?php case 1:?>
-            <h1>:)</h1>
-            <p class="success"><?php echo(strip_tags($msg));?></p>
-            <?php break;?>
-            <?php case 0:?>
-            <h1>:(</h1>
-            <p class="error"><?php echo(strip_tags($msg));?></p>
-            <?php break;?>
+        <?php case 1:?>
+        <p class="success"><?php echo(strip_tags($msg));?></p>
+        <?php break;?>
+        <?php case 0:?>
+        <p class="error"><?php echo(strip_tags($msg));?></p>
+        <?php break;?>
         <?php } ?>
-        <p class="detail"></p>
-        <p class="jump">
-            页面自动 <a id="href" href="<?php echo($url);?>">跳转</a> 等待时间: <b id="wait"><?php echo($wait);?></b>
-        </p>
-    </div>
-    <script type="text/javascript">
-        (function(){
-            var wait = document.getElementById('wait'),
-                href = document.getElementById('href').href;
-            var interval = setInterval(function(){
-                var time = --wait.innerHTML;
-                if(time <= 0) {
-                    location.href = href;
-                    clearInterval(interval);
-                };
-            }, 1000);
-        })();
-    </script>
+    </p>
+    <br>
+    <p><span><a href="/" class="main_404_back"><&nbsp;返回首页</a> 页面自动 <a id="href" href="<?php echo($url);?>">跳转</a> 等待时间: <b id="wait"><?php echo($wait);?></b></span></p>
+</div>
 </body>
-</html>
+<script type="text/javascript">
+    (function(){
+        var wait = document.getElementById('wait'),
+            href = document.getElementById('href').href;
+        var interval = setInterval(function(){
+            var time = --wait.innerHTML;
+            if(time <= 0) {
+                location.href = href;
+                clearInterval(interval);
+            };
+        }, 1000);
+    })();
+</script>
+</html>

+ 3 - 1
vendor/thinkphp/tpl/page_trace.tpl

@@ -1,4 +1,5 @@
-<div id="think_page_trace" style="position: fixed;bottom:0;right:0;font-size:14px;width:100%;z-index: 999999;color: #000;text-align:left;font-family:'微软雅黑';">
+<?php if(\think\facade\App::isDebug()) { ?>
+<div id="think_page_trace gg" style="position: fixed;bottom:0;right:0;font-size:14px;width:100%;z-index: 999999;color: #000;text-align:left;font-family:'微软雅黑';">
     <div id="think_page_trace_tab" style="display: none;background:white;margin:0;height: 250px;">
         <div id="think_page_trace_tab_tit" style="height:30px;padding: 6px 12px 0;border-bottom:1px solid #ececec;border-top:1px solid #ececec;font-size:16px">
             <?php foreach ($trace as $key => $value) {?>
@@ -69,3 +70,4 @@
         tab_tit[history[1]].click();
     })();
 </script>
+<?php } ?>