Merge branch 'develop' of zhengxifeng/zc100 into master

template/mobile/users/users_welcome.htm

@@ -244,7 +244,7 @@
                 </a>
                 <a href="https://www.zc10000.com/cp" class="nav-item" {eyou:if condition='($page=="ciping")'}style="color:red;{/eyou:if}">
                     <div class="nav-item-t"><i class="iconfont icon-fabu"></i></div>
-                    <div class="nav-item-b">测评</div>
+                    <div class="nav-item-b">申报</div>
                 </a>
                 <?php
 

template/pc/common/include/footer.htm

@@ -89,7 +89,7 @@
     </a>
     <a href="https://www.zc10000.com/cp" class="nav-item" {eyou:if condition='($page=="ciping")'}style="color:red;{/eyou:if}">
         <div class="nav-item-t"><i class="iconfont icon-fabu"></i></div>
-        <div class="nav-item-b">测评</div>
+        <div class="nav-item-b">申报</div>
     </a>
 
     <?php

template/pc/components/detail/cl.htm

@@ -62,27 +62,55 @@
                     <p class="cate">
                         <font>所属标签：</font><a href="https://www.zc10000.com/tag{$tag_number}"  target="_blank" class="mcolor">{$tag_name}</a>
 
-                        &nbsp;&nbsp;&nbsp;<font>页面数量：</font> {$eyou.field.pagenum}
+                        &nbsp;&nbsp;&nbsp;<!--<font>页面数量：</font> {$eyou.field.pagenum}-->
                     </p>
 
                     <?php
                     /*<p class="site">官方网址：<a href="" title="{$eyou.field.title}" >{$web_domain}{$web_url}</a></p>*/
                     ?>
 
-                    <p class="cate"><font>产品价格：</font>
+                    <p class="cate">
+                        <font>文件大小：</font>
+                        <?php
+                            $fileinfo = explode('|', $eyou['field']['pagenum']);
+                            if(isset($fileinfo[1])){
+                                echo '共计'.$fileinfo[0].'个文件,合计'.$fileinfo[1].'';
+                            }else{
+                                if(empty($eyou['field']['pagenum'])){
+                                    echo '未知';
+                                }else{
+                                    echo '共计'.$eyou['field']['pagenum'].'个文件';
+                                }
+                            }
+                        ?>
+                    </p>
+                    <p class="cate" style="display: none;">
+                        <font>产品价格：</font>
                         <span class="mod_price" style="margin: 0px 0px;">
                                     <i>¥</i>
                                     <span class="more2_info_price_txt">{$eyou.field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                                      </span>
                             <span style="color:red;">👍<font style="font-weight: bold;">限时免费赠送</font></span>
                                 </span>
+                    </p>
 
-
+                    <p class="site">
+                        <font>发布者：</font>  {$eyou.field.author}
+                        <font style="margin-left:15px;">资料来源：</font> {$eyou.field.origin}
+                    </p>
+                    <p class="site" style="display: none;">
+                        <font>购买须知：</font>  本产品为电子档文件，属虚拟产品，付款后请联系客服领取，一经售出概不退换！
                     </p>
 
-                    <p class="site"><font>购买须知：</font>  本产品为电子档文件，属虚拟产品，付款后请联系客服领取，一经售出概不退换！</p>
 
                     <p class="seo">
+                        {eyou:empty name='$eyou.field.zylm' /}
+                        <font>温馨提示：</font> {eyou:global name='web_attr_33' /}
+                        {eyou:else /}
+                        <font>温馨提示：</font> {$eyou.field.zylm|msubstr=###,0,100,true}
+                        {/eyou:empty}
+                    </p>
+                    <p class="seo" style="display: none;">
 
                         <?php
 
@@ -98,7 +126,7 @@
 
 
                         {eyou:empty name='$eyou.field.zylm' /}
-                            <font>产品简介：</font> {$eyou.field.seo_description|msubstr=###,0,100,true}
+                            <font >产品简介：</font> {$eyou.field.seo_description|msubstr=###,0,100,true}
                         {eyou:else /}
                             <font>产品简介：</font> {$eyou.field.zylm|msubstr=###,0,100,true}
                         {/eyou:empty}
@@ -123,6 +151,22 @@
     <div class="items">
         <div class="art-main">
 
+
+
+            <TABLE><TR>  <TR BGCOLOR=#EEEEEE><td><b><nobr>名称</td><td><b><nobr>扩展名</td><td><b><nobr>大小</td><td><b><nobr>MB</td>   </TR>
+                <TR><td><nobr>+Navicat</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR BGCOLOR=#EEEEEE><td><nobr> +MySQL</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR><td><nobr> &nbsp;|+Servers</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR BGCOLOR=#EEEEEE><td><nobr> &nbsp;| +影刀</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR><td><nobr> &nbsp;| &nbsp; id_cache</td><td><nobr>db</td><td><nobr>24.0 KB</td><td><nobr>0.1 MB</td>   </TR>
+                <TR BGCOLOR=#EEEEEE><td><nobr> &nbsp;| &nbsp; id_cache.db-shm</td><td><nobr>db-shm</td><td><nobr>32.0 KB</td><td><nobr>0.1 MB</td>   </TR>
+                <TR><td><nobr> &nbsp;| &nbsp; id_cache.db-wal</td><td><nobr>db-wal</td><td><nobr>169.0 KB</td><td><nobr>0.2 MB</td>   </TR>
+                <TR BGCOLOR=#EEEEEE><td><nobr> +Premium</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR><td><nobr> &nbsp;+logs</td><td><nobr><文件夹></td><td>&nbsp;</td><td>&nbsp;</td>   </TR>
+                <TR BGCOLOR=#EEEEEE><td><nobr> &nbsp; &nbsp;history</td><td><nobr>log</td><td><nobr>3.1 KB</td><td><nobr>0.1 MB</td>   </TR>
+            </TABLE>
+
+
             {eyou:if condition='($is_mobile === false)'}
                 {$eyou.field.content_5}
             {eyou:else /}

template/pc/components/detail/content.htm

@@ -429,7 +429,7 @@
                     <a class="art-a" href="{$ar_url}" title="" >
                         <img class="img-cover cl-img" src="{$field.litpic}" alt="{$field.title}" />
                     </a>
-                    <h3 class="art-title  cl-art-title" style="">
+                    <h3 class="art-title  cl-art-title">
                         {eyou:if condition='((int)$field.is_recom === 1)'}
                         <i class="more2_info_self">推荐</i>
                         {/eyou:if}
@@ -437,11 +437,11 @@
 
 
 
-                        <a class="" href="{$ar_url}" title="{$field.title}" >
-                            {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
+                        <a class="" href="{$ar_url}" title="{$field.title}">
+                            {$field.title|msubstr=###,0,30,true}<span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                         </a>
                     </h3>
-                    <div class="mod_price">
+                    <div class="mod_price" style="display: none;">
                         <i>¥</i>
                         <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
 

template/pc/components/detail/new.htm

@@ -263,16 +263,16 @@
                     <a class="art-a" href="{$ar_url}" title="" >
                         <img class="img-cover cl-img" src="{$field.litpic}" alt="{$field.title}" />
                     </a>
-                    <h3 class="art-title cl-art-title" style="">
+                    <h3 class="art-title cl-art-title">
                         {eyou:if condition='((int)$field.is_recom === 1)'}
                         <i class="more2_info_self">推荐</i>
                         {/eyou:if}
 
                         <a class="" href="{$ar_url}" title="{$field.title}" >
-                            {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
+                            {$field.title|msubstr=###,0,30,true}<span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                         </a>
                     </h3>
-                    <div class="mod_price">
+                    <div class="mod_price"  style="display: none;">
                         <i>¥</i>
                         <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                                  </span>

template/pc/components/index/content.htm

@@ -434,16 +434,16 @@
                                 <a class="art-a" href="{$ar_url}" title="{$field.title}" >
                                     <img class="img-cover cl-img" src="{$field.litpic}" alt="{$field.title}" />
                                 </a>
-                                <h3 class="art-title cl-art-title" style="">
+                                <h3 class="art-title cl-art-title">
                                     {eyou:if condition='((int)$field.is_recom === 1)'}
                                     <i class="more2_info_self">推荐</i>
                                     {/eyou:if}
 
                                     <a class="" href="{$ar_url}" title="{$field.title}" >
-                                        {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
+                                        {$field.title|msubstr=###,0,30,true}<span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                                     </a>
                                 </h3>
-                                <div class="mod_price">
+                                <div class="mod_price" style="display: none;">
                                     <i>¥</i>
                                     <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                                  </span>

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

@@ -88,16 +88,16 @@ $ar_url = get_tid_url_2($field['arcurl'],$field['typeid'],$field['stypeid'],'0',
         <a class="art-a" href="{$ar_url}" title="{$field.title}" >
             <img class="img-cover cl-img" src="{$field.litpic}" alt="{$field.title}"/>
         </a>
-        <h3 class="art-title cl-art-title" style="">
+        <h3 class="art-title cl-art-title">
             {eyou:if condition='((int)$field.is_recom === 1)'}
             <i class="more2_info_self">推荐</i>
             {/eyou:if}
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
+                {$field.title|msubstr=###,0,30,true}<span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
             </a>
         </h3>
-        <div class="mod_price">
+        <div class="mod_price" style="display: none;">
             <i>¥</i>
             <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                 </span>

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

@@ -114,14 +114,15 @@ $ar_url = get_tid_url_2($field['arcurl'],$field['typeid'],$field['stypeid'],'0',
 
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title}{eyou:if condition='($field.typeid === 1233)'}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>{/eyou:if}
+                {$field.title}{eyou:if condition='($field.typeid === 1233)'}
+                <span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>{/eyou:if}
             </a>
 
         </h3>
 
 
         {eyou:if condition='($field.typeid === 1233)'}
-        <div class="mod_price" style="">
+        <div class="mod_price" style="display: none;">
             <i>¥</i>
             <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
 

template/pc/components/search/content.htm

@@ -16,16 +16,16 @@
         <a class="art-a" href="{$ar_url}" title="" >
             <img class="img-cover cl-img" src="{$field.litpic}" alt="{$field.title}" />
         </a>
-        <h3 class="art-title cl-art-title" style="">
+        <h3 class="art-title cl-art-title">
             {eyou:if condition='((int)$field.is_recom === 1)'}
             <i class="more2_info_self">推荐</i>
             {/eyou:if}
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
+                {$field.title|msubstr=###,0,30,true}<span style="color:red;display: none;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
             </a>
         </h3>
-        <div class="mod_price">
+        <div class="mod_price" style="display: none;">
             <i>¥</i>
             <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                                  </span>

template/pc/css/extend.css

@@ -267,7 +267,7 @@
 }
 .art-title{
     margin: 5px 9px !important;max-height:45px !important;
-    height: 45px !important;
+    height: 25px !important;
 }
 .art-title a{
     font-size: 14px !important;
@@ -508,7 +508,8 @@
 }
 
 #cl_detail .part .post-single .pic img {
-    height: 187px !important;
+    height: 100% !important;
+    max-height: 206px !important;
     width: 154px !important;
 }
 
@@ -530,7 +531,7 @@
     }
 
     .b2{
-        line-height:150%;display: block;float:left;width:80%;text-align: left;
+        line-height:150%;display: block;float:left;width:82%;text-align: left;
     }
 }
 
@@ -592,7 +593,7 @@
 
 @media (max-width: 1240px){
     .part .art-item .art-a .img-cover {
-        height: 152px !important;
+        height: 218px !important;
     }
 
 }
@@ -645,7 +646,7 @@
     width:auto !important;
 }
 .cl-art-title{
-    text-align: left !important;
+    text-align: center  !important;
 }
 
 @media (max-width: 767px){
@@ -756,3 +757,54 @@
 }
 
 
+.art-main table{
+    color: #000 !important;
+    max-width:100% !important;
+}
+.art-main tr{
+    background: #fff !important;
+}
+
+@media screen and (max-width: 991px){
+    .art-main table {
+        width: 100% !important;
+    }
+    .art-main table tbody{
+        width: 100% !important;
+    }
+}
+
+
+.art-main table {
+    /*width: 100%;*/
+    min-width: 500px;
+    border-collapse: collapse;
+}
+
+.art-main th, td {
+    border: 1px solid #ddd;
+    padding: 8px;
+    text-align: left;
+}
+
+/* Media Query for mobile devices */
+@media screen and (max-width: 991px) {
+    .art-main table {
+        min-width: 0px !important;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+
+    .art-main th, td {
+        border: none;
+        padding: 10px 0;
+        /*white-space: normal;
+        word-wrap: break-word;*/
+        overflow: hidden;
+    }
+    .art-main nobr{
+        /*white-space: normal;
+        word-wrap: break-word;*/
+        overflow: hidden;
+    }
+}

template/pc/css/style.css

@@ -745,7 +745,7 @@ body{background:#f1f5f8;color:#6b7386;}
 .part .art-item{background:#fff;margin-bottom:20px;border-radius: 5px;padding-bottom: 10px;box-shadow: 0px 1px 6px 0px rgba(65, 106, 123, 0.1);}
 .part .art-item h3{margin:10px 20px;height: 21px;line-height: 21px;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;font-weight:normal;}
 .part .art-item:hover{background:#fff;box-shadow: 0px 15px 28px 0px rgba(65, 106, 123, 0.2);border-radius: 5px;}
-.part .art-item .art-a img{width:100%;height:152px;border-radius:5px;border-bottom-right-radius:0;border-bottom-left-radius:0;}
+.part .art-item .art-a img{width:100%;height:240px;border-radius:5px;border-bottom-right-radius:0;border-bottom-left-radius:0;}
 .part .art-item p{margin:10px 20px;color:#abb0bd;font-size:12px;height:3em;line-height:1.5em;overflow:hidden;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
 @media (max-width:1240px){
     .quick-nav{display:none;}.part .art-item h3{height:42px;}