快乐的梦鱼 3 tygodni temu
rodzic
commit
869ba31209
6 zmienionych plików z 45 dodań i 22 usunięć
  1. 3 3
      CommonQuery.php
  2. 15 5
      components/footer.php
  3. 11 7
      css/style.css
  4. 1 1
      css/style.css.map
  5. 14 5
      css/style.scss
  6. 1 1
      lianXiWoMeng.php

+ 3 - 3
CommonQuery.php

@@ -73,7 +73,7 @@ function loadListByChannelNameAndPage($maxCount, $name, $page, $searchKeyword =
         }
         
         $articles = $articlesQuery
-            ->order('createtime DESC')
+            ->order('weigh DESC, createtime DESC')
             ->limit(($page - 1) * $maxCount, $maxCount)
             ->get();
         
@@ -115,7 +115,7 @@ function loadListByChannelIdInNameAndPage($maxCount, $channelIds, $page, $search
         }
         
         $articles = $articlesQuery
-            ->order('createtime DESC')
+            ->order('weigh DESC, createtime DESC')
             ->limit(($page - 1) * $maxCount, $maxCount)
             ->get();
         
@@ -155,7 +155,7 @@ function loadListPage($maxCount, $page, $searchKeyword = '') {
         }
         
         $articles = $articlesQuery
-            ->order('createtime DESC')
+            ->order('weigh DESC, createtime DESC')
             ->limit(($page - 1) * $maxCount, $maxCount)
             ->get();
         

+ 15 - 5
components/footer.php

@@ -21,9 +21,9 @@ $footerInfo = [
       <div class="footer-select">
           <select name="related-links" id="related-links">
               <option value="">相关网站链接</option>
-              <option value="1">国家文物局</option>
-              <option value="2">福建省文化和旅游厅</option>
-              <option value="3">厦门市人民政府</option>
+              <option value="http://www.ncha.gov.cn/index.html">国家文物局</option>
+              <option value="https://wlt.fujian.gov.cn/">福建省文化和旅游厅</option>
+              <option value="https://www.xm.gov.cn/">厦门市人民政府</option>
           </select>
       </div>
       
@@ -34,10 +34,20 @@ $footerInfo = [
       </div>
       
       <div class="footer-info">
-          <p>	闽公网安备35020302036685号 | 闽ICP备2025115303号-1 | <script type="text/javascript">document.write(unescape("%3Cspan id='_ideConac' %3E%3C/span%3E%3Cscript src='https://dcs.conac.cn/js/14/215/0000/60539030/CA142150000605390300003.js' type='text/javascript'%3E%3C/script%3E"));</script></p>
+          <p>	闽公网安备35020302036685号 | <a href="https://beian.miit.gov.cn/">闽ICP备2025115303号-1</a> | <script type="text/javascript">document.write(unescape("%3Cspan id='_ideConac' %3E%3C/span%3E%3Cscript src='https://dcs.conac.cn/js/14/215/0000/60539030/CA142150000605390300003.js' type='text/javascript'%3E%3C/script%3E"));</script></p>
           <p>联系地址: <?php echo $footerInfo['address']; ?></p>
           <p>联系电话: <?php echo $footerInfo['contactPhone']; ?> | 工作电话: <?php echo $footerInfo['workPhone']; ?></p>
           
       </div>
   </div>
-</footer>
+</footer>
+
+<script>
+    // 相关网站链接选择框事件处理
+    document.getElementById('related-links').addEventListener('change', function() {
+        var selectedValue = this.value;
+        if (selectedValue) {
+            window.location.href = selectedValue;
+        }
+    });
+</script>

+ 11 - 7
css/style.css

@@ -19,7 +19,7 @@ html, body {
   position: relative;
   color: var(--color-text);
   line-height: 1.6;
-  font-family: "PingFang SC", "STSongtiSC", "Microsoft YaHei", sans-serif;
+  font-family: "PingFang SC", "STSongtiSC", "Microsoft YaHei", sans-serif !important;
   margin: 0;
   padding: 0;
 }
@@ -481,6 +481,12 @@ footer {
   background-size: cover;
   padding: 40px 0 20px;
 }
+footer a {
+  color: #ddd;
+}
+footer a:hover, footer a:active {
+  color: #fff;
+}
 
 .footer-links {
   display: flex;
@@ -582,17 +588,15 @@ footer {
 }
 .pagination li {
   margin: 0 5px;
-  border: 1px solid var(--color-border);
-  border-radius: 6px;
 }
 .pagination li a {
   padding: 6px 10px;
-}
-.pagination li.active {
-  border-color: var(--color-primary);
+  color: var(--color-text-secondary) !important;
 }
 .pagination li.active a {
-  color: var(--color-primary);
+  border-color: var(--color-primary) !important;
+  background-color: var(--color-primary) !important;
+  color: var(--color-text-light) !important;
 }
 
 .news-detail h1 {

Plik diff jest za duży
+ 1 - 1
css/style.css.map


+ 14 - 5
css/style.scss

@@ -19,7 +19,7 @@ html, body {
   position: relative;
   color: var(--color-text);
   line-height: 1.6;
-  font-family: 'PingFang SC', 'STSongtiSC', "Microsoft YaHei", sans-serif;
+  font-family: 'PingFang SC', 'STSongtiSC', "Microsoft YaHei", sans-serif !important;
   margin: 0;
   padding: 0;
 }
@@ -512,6 +512,14 @@ footer {
   background-position: center;
   background-size: cover;
   padding: 40px 0 20px;
+
+  a {
+    color: #ddd;
+
+    &:hover, &:active {
+      color: #fff;
+    }
+  }
 }
 .footer-links {
   display: flex;
@@ -619,18 +627,19 @@ footer {
 
   li {
     margin: 0 5px;
-    border: 1px solid var(--color-border);
-    border-radius: 6px;
+    //border-radius: 6px;
 
     a {
       padding: 6px 10px;
+      color: var(--color-text-secondary)!important;
     }
     
     &.active {
-      border-color: var(--color-primary);
 
       a {
-        color: var(--color-primary);
+        border-color: var(--color-primary)!important;
+        background-color: var(--color-primary)!important;
+        color: var(--color-text-light)!important;
       }
     }
   }

+ 1 - 1
lianXiWoMeng.php

@@ -82,7 +82,7 @@ $carouselItems = [
       </div>
       <div class="row">
         <div class="col col-sm-12 col-md-6 col-lg-8">
-          <h3>厦门市文化遗保护中心</h3>
+          <h3>厦门市文化遗保护中心</h3>
           <p>厦门市文化遗产保护中心(厦门市非物质文化遗产保护中心、厦门市闽南文化生态保护中心)为全额拨款公益一类事业单位,隶属厦门市文化和旅游局,机构规格为副处级,内设办公室、文物保护部、非遗保护部、考古部、信息科技部、安全管理部。</p>
         </div>
         <div class="col col-sm-12 col-md-6 col-lg-4 d-flex flex-row justify-content-end">