From 1667e5240d55310d95e8b57393f8c2c5bd44e38f Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 30 Sep 2025 16:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E5=8A=9B=E5=A5=97=E9=A4=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cunkebao/controller/TokensController.php           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Server/application/cunkebao/controller/TokensController.php b/Server/application/cunkebao/controller/TokensController.php
index d89a8cef..df70d924 100644
--- a/Server/application/cunkebao/controller/TokensController.php
+++ b/Server/application/cunkebao/controller/TokensController.php
@@ -20,14 +20,14 @@ class TokensController extends BaseController
         ];
         $query = TokensPackage::where($where);
         $total = $query->count();
-        $list = $query->where($where)->page($page, $limit)->order('id desc')->select();
+        $list = $query->where($where)->page($page, $limit)->order('sort ASC,id desc')->select();
         foreach ($list as &$item) {
             $item['description'] = json_decode($item['description'], true);
             $item['discount'] = round(((($item['originalPrice'] - $item['price']) / $item['originalPrice']) * 100),2);
-            $price = round($item['price'] / 100,2);
-            $item['price'] = number_format($price, 2);
-            $item['unitPrice'] = round($price / $item['tokens'],6);
-            $item['originalPrice'] = number_format($item['originalPrice'] / 100, 2);
+            $item['price'] = round( $item['price'], 2);
+            $item['unitPrice'] = round( $item['price'] / $item['tokens'],6);
+            $item['originalPrice'] = round($item['originalPrice'] / 100, 2);
+            $item['tokens'] = number_format($item['tokens']);
         }
         unset($item);
         return ResponseHelper::success(['list' => $list, 'total' => $total]);