Merge branch 'develop' of zhengxifeng/zc100 into master

application/admin/controller/Custom.php

             $sort_order = Db::name('archives')->where('aid','=',(int)$post['level_group_name'])->value('sort_order');
 
             //var_dump($post['addonFieldExt']);die;
+            $ext = '';
             //获取文档文件后缀
             if(!empty($post['addonFieldExt']['down_eyou_remote'])){
                 $file = explode('.',$post['addonFieldExt']['down_eyou_remote']);
                 $ext = end($file);
             }else{
-                $ext = '';
+                //$ext = '';
             }
             if(!empty($post['addonFieldExt']['down_eyou_local'])){
                 $file = explode('.',$post['addonFieldExt']['down_eyou_local']);
                 $ext = end($file);
             }else{
-                $ext = '';
+                //$ext = '';
             }
 
             // --存储数据
                         'number' => $num
                     ];
                     Db::name('seo_number')->insert($in_data);
+                }else if((int)$newData['typeid'] === 371){
+                    $last = Db::name('seo_number')->where([
+                            "type" => 10,
+                            "tid" => (int)$post['typeid'],
+                            'topid' => 0,
+                            'parentid' => 0,
+                            'area_id' => 0,
+                        ])->order('number desc')->find();
+                    if(empty($last['number'])){
+                        $num = 1;
+                    }else{
+                        $num = (int)$last['number'] + 1;
+                    }
+                    $in_data = [
+                        "type" => 10,    //产品类型
+                        "aid" => $aid, //实际的ID
+                        "tid" => (int)$post['typeid'], //属于哪个栏目的
+                        'is_del' => 0,
+                        'is_kan' => 0, // 0正常 1审核
+                        'status' => 1,
+                        'area_id' => 0,
+                        'topid' => 0,
+                        'parentid' => 0,
+                        'number' => $num
+                    ];
+                    Db::name('seo_number')->insert($in_data);
+
+                    //更新主记录 冗余
+                    Db::name('archives')
+                        ->where(['aid'=>$aid])
+                        ->update(['number'=>$num]);
+
                 }else if((int)$newData['typeid'] === 126 || (int)$newData['typeid'] === 825 || (int)$newData['typeid'] === 826){
                     //资料文档
                     $last = Db::name('seo_number')->where([
             $sort_order = Db::name('archives')->where('aid','=',(int)$post['level_group_name'])->value('sort_order');
 
 
+            $ext = '';
             //获取文档文件后缀
             if(!empty($post['addonFieldExt']['down_eyou_remote'])){
                 $file = explode('.',$post['addonFieldExt']['down_eyou_remote']);
                 $ext = end($file);
             }else{
-                $ext = '';
+               //$ext = '';
             }
 
             if(!empty($post['addonFieldExt']['down_eyou_local'])){
                 $file = explode('.',$post['addonFieldExt']['down_eyou_local']);
                 $ext = end($file);
             }else{
-                $ext = '';
+                //$ext = '';
             }
 
+            //var_dump($post['addonFieldExt']);
+            //var_dump($ext);die;
+
             // --存储数据
             $newData = array(
                 'typeid'=> $typeid,

application/api/controller/Other.php

         }
     }
 
+    /*
+     * 标签
+     * https://www.zc10000.com/api/other/index10000
+     * 主要前提是 没有区域 只按发布时间排序就可以
+     */
+    public function index10000(){
+
+        //查询所有期刊 参考
+        $list = Db::name('archives')
+            ->where('typeid','in',[371])
+            ->order('add_time asc')
+            ->select();
+
+        //var_dump($list);
+        $num = 1;
+        foreach ($list as $index => $item){
+            $one = Db::name('seo_number')->where([
+                "type" => 10,
+                "aid" => $item['aid'], //实际的文档aid
+                //'is_del' => 0,  //目前都是未删除
+            ])->find();
+            if(!empty($one)) {
+                if((int)$one['number'] === $num){
+                    $ks = '序号正常';
+                }else{
+                    $ks = '<font style="color:red;">序号不正常</font>';
+                }
+                if((int)$item['is_del'] === 0){
+                    $desc = '(原记录正常)';
+                }else{
+                    $desc = '<font style="color:green;">(原记录已删除)</font>';
+                }
+                echo '文档ID:'.$item['aid'].'-'.$item['title'].'-已存在-'.$desc.'-序号为:'.$one['number'].'-'.$ks.'<br/>';
+                $num++;
+
+
+                //更新主记录
+                Db::name('archives')
+                    ->where(['aid'=>$item['aid']])
+                    ->update(['number'=>(int)$one['number']]);
+
+            }else{
+                if((int)$item['is_del'] === 0){
+                    $data = [
+                        'type' => 10,
+                        'tid' => $item['typeid'],
+                        'aid' => $item['aid'],
+                        'number' => $num,
+                        'is_del' => 0,
+                        //'area_id' => 0,  //非栏目
+                        //'topid' => 0,     //非栏目
+                        //'parentid' => 0    //非栏目
+                    ];
+                    $res = Db::name('seo_number')->insert($data);
+                    echo $item['title'].'-新增成功'.$res.'-序号为:'.$num.'<br/>';
+
+
+                    //更新主记录
+                    Db::name('archives')
+                        ->where(['aid'=>$item['aid']])
+                        ->update(['number'=>$num]);
+
+                    $num++;
+
+                }else {
+                    echo '<font color="blue">文档ID:'.$item['aid'].'-'.$item['title'].'-原记录已删除-不新增-且不存在序号记录表</font><br/>';
+                }
+            }
+        }
+    }
+
     /*
      *  处理文档  注意有省级区分
      *  发布时候可以不选 区域
         }
     }
 
+    /*
+     * https://www.zc10000.com/api/other/iop
+     */
+    public function iop()
+    {
+        $list = Db::name('zczygz_content')
+            //->where(['typeid'=>1232])
+            ->select();
+        foreach ($list as $key=>$item){
+
+            if(!empty($item['down'])){
+                $file = explode('.',$item['down']);
+                $ext = end($file);
+
+                Db::name('archives')
+                    ->where(['aid'=>$item['aid']])
+                    ->update(['ext'=>$ext]);
+            }
+        }
+    }
 }

template/pc/common/include/footer.htm

         <small>我的</small>
     </a>
 </div>-->
-
+{eyou:if condition='($is_mobile !== false)'}
 <link href="https://www.zc10000.com/template/mobile/users/skin/userfont/iconfont.css" rel="stylesheet" media="screen" type="text/css">
 <div class="footer-nav">
     <a href="https://www.zc10000.com" class="nav-item" {eyou:if condition='($page=="index")'}style="color:red;{/eyou:if}">
         <div class="nav-item-b">我的</div>
     </a>
 </div>
-
+{/eyou:if}
 <?php
 /*
  * {:hookexec('Footernav/Footernav/show')}

template/pc/common/include/tdk/tag_detail.htm

 
-<title>{$tag_name}-标签-{eyou:global name='web_title' /}</title>
-<meta name="keywords" content="{eyou:global name='web_keywords' /}">
-<meta name="description" content="{eyou:global name='web_description' /}">
+<title>{$tag_name}评定须知【申报材料下载站】</title>
+<meta name="keywords" content="{$tag_name}">
+<meta name="description" content="{$tag_name}评定须知上【职称E家】专业资讯和职称申报辅导网站,为工程师评审提供相关的政策文件下载及解读、申报材料范本、在线评测一键匹配等服务,辅导工程师更好的提升职业等级。">

template/pc/common/include/tdk/taglist.htm

 
-<title>标签列表-{eyou:global name='web_title' /}</title>
-<meta name="keywords" content="{eyou:global name='web_keywords' /}">
-<meta name="description" content="{eyou:global name='web_description' /}">
+<title>职称专业汇总_职称领域一揽表</title>
+<meta name="keywords" content="职称专业汇总,职称专业一揽表">
+<meta name="description" content="职称专业汇总及职称专业一揽表下载，专业资讯和职称申报辅导网站,为工程师评审提供相关的政策文件下载及解读、申报材料范本、在线评测一键匹配等服务,辅导工程师更好的提升职业等级。">

template/pc/common/main/param/tag_detail.htm

     $tagid = $route_param['tagid']?(int)$route_param['tagid']:0;
     $is_mobile = isMobile();
 
+    $number = $tagid;
     //var_dump($route_param);die;
 
 ?>
 
+{eyou:sql sql="select id,aid from ey_seo_number where type=10 and number=$tagid" cachetime='3600' empty='没有数据'}
+{eyou:php}
+    $tagid = $field['aid'];
+{/eyou:php}
+{/eyou:sql}
+
 
 {eyou:sql sql="select aid,title from ey_archives where aid=$tagid" cachetime='3600' empty='没有数据'}
 {eyou:php}

template/pc/components/list/style12/page/mod_6.htm

 <?php
     //var_dump($route_param['page']);
     //计算limit属性
-    $pagesize = 12;
+    $pagesize = 200;
     if(!empty($route_param['page'])){
         $curpage = $route_param['page'];
         $start_li = $pagesize*($curpage-1); //开始位置
 
 
 
-{eyou:artlist idlist="$ids" titlelen='30' limit='0,12' infolen='160' orderby='update_time desc' addfields='handle_time,province_id'}
+{eyou:artlist idlist="$ids" titlelen='30' limit='0,200' infolen='160' orderby='update_time desc' addfields='handle_time,province_id'}
 <?php
 //var_dump($field['aid']);
-$ar_url = 'https://www.zc10000.com/tag'.$field['aid'];
+$ar_url = 'https://www.zc10000.com/tag'.$field['number'];
+//不存在再查询 一般存在
 ?>
 
 <div class="col-xs-6 col-sm-4 col-md-3 font-563-active-{$i}">

template/pc/components/list/style12/page/mod_page_6.htm

+<!--自定义分页开始-->
+{eyou:sql sql="select count(*) AS num from ey_archives where $where" cachetime='3600' empty='没有数据' id="res333"}
+{eyou:assign name='total_all' value='$res333.num' /}
+{/eyou:sql}
+<div class="page">
+    <div class="page-content">
+    <?php
+        //需要变量
+        $request = request();
+        $url = $request->url();
+
+        if (strpos($url, '-') !== false) {
+            $url = explode('-',$url);
+            $url = $url[0];
+        }else{
+
+        }
+
+        $total = $total_all;
+        $pagesize = 200;
+        $total_page = ceil($total/$pagesize);
+        //$curpage = $curpage;
+        $total_page_for = $total_page + 1;
+        $pro_page = $curpage - 1;
+        $pev_page = $curpage + 1;
+    ?>
+
+        {eyou:if condition='($is_mobile === false)'}
+
+
+    <div class="page-a page-pc">
+    {eyou:if condition='((int)$total_page > 1)'}
+        {eyou:if condition='((int)$curpage === 1)'}
+            <li><a>首页</a></li>
+            <li><a>上一页</a></li>
+        {eyou:else /}
+            <li><a href="{$url}">首页</a></li>
+            {eyou:if condition='((int)$curpage === 2)'}
+                <li><a href="{$url}">上一页</a></li>
+            {eyou:else /}
+                <li><a href="{$url}-{$pro_page}">上一页</a></li>
+            {/eyou:if}
+        {/eyou:if}
+
+        {eyou:for start='1' end="$total_page_for"}
+
+            {eyou:if condition='((int)$i === 1)'}
+                {eyou:if condition='((int)$curpage === $i)'}
+                    <li class="active-1"><a>{$i}</a></li>
+                {eyou:else /}
+                    <li><a href="{$url}" data-ey_fc35fdc="html" data-tmp="1">{$i}</a></li>
+                {/eyou:if}
+            {eyou:else /}
+                {eyou:if condition='((int)$curpage === $i)'}
+                    <li class="active-1"><a>{$i}</a></li>
+                {eyou:else /}
+                    <?php if($total_page > 10){ ?>
+
+                        <?php if(((int)$curpage-2)<$i && ((int)$curpage+2)>$i || ((int)$total_page-1)<$i && ((int)$total_page+1)>$i || 0<$i && 2>$i){  ?>
+
+                            <li><a href="{$url}-{$i}" data-ey_fc35fdc="html" data-tmp="1">{$i}</a></li>
+
+                        <?php }else{ ?>
+
+                            <?php if(((int)$curpage) > 3 && ((int)$curpage-2) === $i){ ?>
+                                <li>...</li>
+                            <?php } ?>
+
+                            <?php  if(((int)$curpage+2) < $total_page && ((int)$curpage+2) === $i){ ?>
+                                <li>...</li>
+                            <?php } ?>
+
+                        <?php } ?>
+
+                    <?php }else{ ?>
+                        <li><a href="{$url}-{$i}" data-ey_fc35fdc="html" data-tmp="1">{$i}</a></li>
+                    <?php } ?>
+                {/eyou:if}
+            {/eyou:if}
+        {/eyou:for}
+        {eyou:if condition='((int)$curpage === (int)$total_page)'}
+            <li><a>下一页</a></li>
+            <li><a>末页</a></li>
+        {eyou:else /}
+            <li><a href="{$url}-{$pev_page}" data-ey_fc35fdc="html" data-tmp="1">下一页</a></li>
+            <li><a href="{$url}-{$total_page}" data-ey_fc35fdc="html" data-tmp="1">末页</a></li>
+        {/eyou:if}
+    {/eyou:if}
+    </div>
+
+        {eyou:else /}
+
+        <div class="page-a page-mobile">
+            <div style="width:auto;float: left;">
+                {eyou:if condition='((int)$total_page > 1)'}
+                {eyou:if condition='((int)$curpage === 1)'}
+                <li><a>上一页</a></li>
+                {eyou:else /}
+                {eyou:if condition='((int)$curpage === 2)'}
+                <li><a href="{$url}">上一页</a></li>
+                {eyou:else /}
+                <li><a href="{$url}-{$pro_page}">上一页</a></li>
+                {/eyou:if}
+                {/eyou:if}
+            </div>
+                <div class="selectBox" style="width: 150px;height:30px;">
+                    <div class="viewBox">
+                        <input type="text" class="viewInput" readonly="readonly" style="width:80%;">
+                        <div class="btnImg" style="width:20%;text-align: center;"><img src="template/pc/images/arrow_input_down.png" alt="" style="width: 12px;"></div>
+                    </div>
+                    <ul class="optionBox" style="width:80%;">
+                        {eyou:for start='1' end="$total_page_for"}
+
+                        <li url="{$url}-{$i}" class="{eyou:if condition='((int)$curpage === $i)'}active-1{/eyou:if}">
+                            <a href="{$url}-{$i}" data-ey_fc35fdc="html" data-tmp="1">第 {$i} 页</a>
+                        </li>
+
+                        {/eyou:for}
+                    </ul>
+                </div>
+            <div style="width: auto;float: left;">
+                {eyou:if condition='((int)$curpage === (int)$total_page)'}
+                <li><a>下一页</a></li>
+                {eyou:else /}
+                <li><a href="{$url}-{$pev_page}" data-ey_fc35fdc="html" data-tmp="1">下一页</a></li>
+                {/eyou:if}
+                {/eyou:if}
+            </div>
+            <div style="clear: both;"></div>
+        </div>
+
+        {/eyou:if}
+
+    <div class="page-b">
+    共<strong>
+    {eyou:php}
+        echo $total_page;
+{/eyou:php}
+    </strong>页 <strong>{$total}</strong>条
+    </div>
+    </div>
+</div>
+
+<script>
+    $(function () {
+        //var view = $(".optionBox li:first").text();
+        var view = $(".optionBox .active-1 a").text();
+        $(".viewInput").val(view);
+    });
+
+    $(".viewBox").click(function () {
+        if($(".optionBox").css("display")=="none"){
+            $(".optionBox").show();
+            $(".btnImg img").attr("src","template/pc/images/arrow_input_up.png")
+        }else{
+            $(".optionBox").hide();
+            $(".btnImg img").attr("src","template/pc/images/arrow_input_down.png")
+        }
+    });
+
+    var checkOption = $(".optionBox li");
+    checkOption.click(function () {
+        var index = $(".optionBox li").index(this);
+        var indexVal = $(".optionBox li:eq("+index+") a").html();
+        $(".viewInput").val(indexVal);
+        if($(".optionBox").css("display")=="none"){
+            $(".optionBox").show();
+            $(".btnImg img").attr("src","template/pc/images/arrow_input_up.png")
+        }else{
+            $(".optionBox").hide();
+            $(".btnImg img").attr("src","template/pc/images/arrow_input_down.png")
+        }
+
+        var url = $(".optionBox li:eq("+index+")").attr('url');
+        location.href = 'https://www.zc10000.com' + url;
+
+    })
+</script>
+
+<!--自定义分页结束-->

template/pc/components/nav/style_1.htm

 
         {eyou:elseif condition='($page == "tag_detail")'}
             <!--文章列表页-->
-            标签 '{$tag_name}' 匹配结果
+        <a href="https://www.zc10000.com/taglist">标签列表</a> > 标签 '{$tag_name}' 匹配结果
 
         {eyou:elseif condition='($page == "taglist")'}
             <!--文章列表页-->

template/pc/lists_zczygz_tglist.htm

             <div class="wordpress_pages">
 
                 <ul class="pager">
-                    {eyou:include file='/template/pc/components/list/style12/page/mod_page.htm' /}
+                    {eyou:include file='/template/pc/components/list/style12/page/mod_page_6.htm' /}
                 </ul>
 
             </div>