Merge branch 'develop' of zhengxifeng/tyqngp into master

.idea/sshConfigs.xml

@@ -3,6 +3,7 @@
   <component name="SshConfigs">
     <configs>
       <sshConfig authType="PASSWORD" host="121.196.214.32" id="99f8b8b0-530e-4055-b09a-489c059a3ae5" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="116.62.235.179" id="2d3a601e-f8cd-412e-80fa-4b54e039a1d8" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
     </configs>
   </component>
 </project>

.idea/webServers.xml

@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="5b2626fd-4859-4a68-8be6-8eccfe28d9f3" name="leda">
-        <fileTransfer rootFolder="/www/wwwroot/tyqngp" accessType="SFTP" host="121.196.214.32" port="22" sshConfigId="99f8b8b0-530e-4055-b09a-489c059a3ae5" sshConfig="root@121.196.214.32:22 password">
+        <fileTransfer rootFolder="/www/wwwroot/tyqngp" accessType="SFTP" host="116.62.235.179" port="22" sshConfigId="2d3a601e-f8cd-412e-80fa-4b54e039a1d8" sshConfig="root@116.62.235.179:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

config/config.php

@@ -20,7 +20,7 @@ return array(
     'tpl_html_cache' => 0,
     
     // 模板内容缓存有效时间（秒）
-    'tpl_html_cache_time' => 900,
+    'tpl_html_cache_time' => 3600,
     
     // 会话文件使用网站路径
     'session_in_sitepath' => 1,

template/dafeult/case.html

@@ -54,6 +54,11 @@
               <p>{content:ext_pingjia}</p>
             </div>
           </li>
+          <li> <span class="cs">{label:m_case_5}：</span>
+            <div class="tuandui-body">
+              <p>{content:content}</p>
+            </div>
+          </li>
         </ul>
       </div>
       <div class="tuandui-zixun">

template/dafeult/index.html

@@ -115,8 +115,8 @@
     </div>
     <div class="picScroll-zhuanjia">
       <div class="bd">
-        <ul class="infoList">
-          {pboot:list scode=[sort:scode] num=9 order=sorting}
+        <ul class="infoList infoList1">
+          {pboot:list scode=[sort:scode] start=1 num=9 order=sorting}
           <li> <a href="/[list:id]">
             <div class="img"> <img src="[list:ico]"> </div>
             <div class="desc">
@@ -128,8 +128,36 @@
             </a> </li>
           {/pboot:list}
         </ul>
+        <ul class="infoList infoList2">
+          {pboot:list scode=[sort:scode] start=10 num=9 order=sorting}
+          <li> <a href="/[list:id]">
+            <div class="img"> <img src="[list:ico]"> </div>
+            <div class="desc">
+              <h2>[list:title]<i>丨</i><span>[list:ext_zhiwei]</span></h2>
+              <p class="jianjie"><b>{label:index_str_3}：</b>
+                <text style="white-space: pre-wrap;">[list:ext_jianjie]</text>
+              </p>
+            </div>
+          </a> </li>
+          {/pboot:list}
+        </ul>
+        <ul class="infoList infoList3">
+          {pboot:list scode=[sort:scode] start=19 num=9 order=sorting}
+          <li> <a href="/[list:id]">
+            <div class="img"> <img src="[list:ico]"> </div>
+            <div class="desc">
+              <h2>[list:title]<i>丨</i><span>[list:ext_zhiwei]</span></h2>
+              <p class="jianjie"><b>{label:index_str_3}：</b>
+                <text style="white-space: pre-wrap;">[list:ext_jianjie]</text>
+              </p>
+            </div>
+          </a> </li>
+          {/pboot:list}
+        </ul>
       </div>
-      <div class="hd"> <a class="prev"><span class="icon iconfont icon-xiangzuo1"></span></a> <span class="pageState"></span> <a class="next"><span class="icon iconfont icon-xiangyou1"></span></a> </div>
+      <div class="hd">
+        <a class="prev"><span class="icon iconfont icon-xiangzuo1"></span></a>
+        <span class="pageState"></span> <a class="next"><span class="icon iconfont icon-xiangyou1"></span></a> </div>
     </div>
   </div>
 </div>

template/dafeult/wap/case.html

@@ -52,6 +52,15 @@
           {content:ext_pingjia}
         </div>
       </li>
+
+      <li>
+        <div class="cs">{label:m_case_5}：</div>
+        <div class="tuandui-body">
+          {content:content}
+        </div>
+      </li>
+
+
     </ul>
   </div>
   <div class="tuandui-zixun">

template/dafeult/wap/index.html

@@ -76,7 +76,7 @@
   <div class="index-tuandui-content">
     <div class="index-tuandui">
       <ul>
-        {pboot:list scode=[sort:scode] num=10 order=sorting}
+        {pboot:list scode=[sort:scode] start=1 num=10 order=sorting}
         <li>
           <div class="box"> <a href="/[list:id]">
             <div class="img"> <img src="[list:ico]"> </div>
@@ -88,6 +88,19 @@
         </li>
         {/pboot:list}
       </ul>
+      <ul>
+        {pboot:list scode=[sort:scode]  start=11 num=10 order=sorting}
+        <li>
+          <div class="box"> <a href="/[list:id]">
+            <div class="img"> <img src="[list:ico]"> </div>
+            <div class="desc">
+              <h2>[list:title]</h2>
+              <p>[list:ext_zhiwei]</p>
+            </div>
+          </a> </div>
+        </li>
+        {/pboot:list}
+      </ul>
     </div>
   </div>
 </div>

批量修改色调.txt

@@ -1,13 +1,23 @@
+pc端  主配色
 #05B381
 改成
 #c01e1f
 
+第二配色
+#ffa309  #18191a 黑色 主要是hover状态
+#f39800  #eb243b 红色 主要是咨询按钮
+
 =============================================
-手机端
+手机端  主配色
 #70ba96
 改成
 #c01e1f
 
+第二配色
+#f39800   #eb243b 红色 主要是咨询按钮
+#ffa309   #18191a 黑色 主要是hover状态
+
+
 ===========================================
 m/
 skin/
@@ -17,6 +27,8 @@ skin/
 文件搜索及批量修改 1.1.2
 插件
 
+替换前选择备份
+/www/server/panel/plugin/mfsearch/backups/20240904060444.zip
 查找目标 #05B381
 文件类型 *.css;*.svg
 目录选择网站根目录 包含子目录打钩