11

core/cless_jx3.py

@@ -435,7 +435,18 @@ class JX3Function:
             item["LowestPrice"] = gold_to_string(item["LowestPrice"])
             item["AvgPrice"] = gold_to_string(item["AvgPrice"])
             item["IconID"] = f"https://icon.jx3box.com/icon/{item['IconID']}.png"
-        
-        return_data["data"]=resultjyh
+        # 准备模板渲染数据
+        return_data["data"] = {
+            "items": resultjyh,
+            "server": server,
+            "update_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        } 
+        # 加载模板
+        try:
+            return_data["temp"] = load_template("jiaoyihang.html")
+        except FileNotFoundError as e:
+            logger.error(f"加载模板失败: {e}")
+            return_data["msg"] = "系统错误：模板文件不存在"
+            return return_data 
         return_data["code"] = 200
         return return_data

core/function_basic.py

@@ -96,11 +96,21 @@ def gold_to_string(gold_amount):
     Returns:
         str: 格式化后的金钱字符串，例如 "1金2银3铜"
     """
-    bricks = gold_amount // 100000000 if gold_amount else 0
-    gold = (gold_amount % 100000000) // 10000 if gold_amount else 0
-    silver = (gold_amount % 10000) // 100 if gold_amount else 0
-    copper = gold_amount % 100 if gold_amount else 0
-        
-    gold_str = f"{bricks}砖{gold}金{silver}银{copper}铜" if gold_amount else "无价格"
+    if not gold_amount:
+        return "无价格"
 
-    return gold_str
+    parts = []
+    started = False  # 标记是否已经遇到第一个非零位
+
+    bricks = gold_amount // 100000000
+    gold = (gold_amount % 100000000) // 10000
+    silver = (gold_amount % 10000) // 100
+    copper = gold_amount % 100
+
+    for value, unit in [(bricks, "砖"), (gold, "金"), (silver, "银"), (copper, "铜")]:
+        if value != 0:
+            started = True
+        if started:
+            parts.append(f"{value}{unit}")
+
+    return "".join(parts)