feat: finish phase 4 portal review fixes

2026-07-03 16:02:29 +08:00
parent ecdbb7292e
commit ebb4782bb2
22 changed files with 3078 additions and 31 deletions
@@ -1,10 +1,11 @@
 <!doctype html>
+{% load static %}
 <html lang="zh-Hans">
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>{% block title %}cmhub{% endblock %}</title>
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  <link href="{% static 'portal/vendor/bootstrap/bootstrap.min.css' %}" rel="stylesheet">
  <style>
    :root {
      --cmhub-bg: #f6f7f9;
@@ -0,0 +1,27 @@
+{% if page_obj and records_total_count %}
+  <div class="d-flex justify-content-between align-items-center gap-3 flex-wrap mt-3">
+    <div class="text-secondary small">
+      共 {{ records_total_count }} 条，每页 {{ records_page_size }} 条，当前第 {{ page_obj.number }} / {{ paginator.num_pages }} 页
+    </div>
+    {% if is_paginated %}
+      <nav aria-label="记录分页">
+        <ul class="pagination pagination-sm mb-0">
+          <li class="page-item{% if not page_obj.has_previous %} disabled{% endif %}">
+            {% if page_obj.has_previous %}
+              <a class="page-link" href="?page={{ page_obj.previous_page_number }}">上一页</a>
+            {% else %}
+              <span class="page-link">上一页</span>
+            {% endif %}
+          </li>
+          <li class="page-item{% if not page_obj.has_next %} disabled{% endif %}">
+            {% if page_obj.has_next %}
+              <a class="page-link" href="?page={{ page_obj.next_page_number }}">下一页</a>
+            {% else %}
+              <span class="page-link">下一页</span>
+            {% endif %}
+          </li>
+        </ul>
+      </nav>
+    {% endif %}
+  </div>
+{% endif %}
@@ -1,4 +1,5 @@
 {% extends "portal/base.html" %}
+{% load static %}

 {% block title %}充值 - cmhub{% endblock %}

@@ -159,7 +160,7 @@
  </section>
 </div>

-<script src="https://cdn.jsdelivr.net/npm/qrcode@1.5.4/build/qrcode.min.js"></script>
+<script src="{% static 'portal/vendor/qrcode/qrcode.js' %}"></script>
 <script>
  (function () {
    const panel = document.querySelector("[data-recharge-order]");
@@ -63,6 +63,7 @@
          </tbody>
        </table>
      </div>
+      {% include "portal/includes/pagination.html" %}
    {% else %}
      <div class="text-secondary">暂无充值记录</div>
    {% endif %}
@@ -87,6 +87,7 @@
          </tbody>
        </table>
      </div>
+      {% include "portal/includes/pagination.html" %}
    {% else %}
      <div class="text-secondary">暂无消费记录</div>
    {% endif %}