Merge remote-tracking branch 'origin/develop' into develop

src/api/compute/resourceorder/index.ts

@@ -5,6 +5,7 @@ import type { Dayjs } from 'dayjs';
 export interface ResourceOrder {
 export interface ResourceOrder {
           id: number; // 订单ID
           id: number; // 订单ID
           userId?: number; // 下单用户ID
           userId?: number; // 下单用户ID
+          mobile?: string; // 下单用户手机号
           skuId?: number; // 算力资源SKU ID
           skuId?: number; // 算力资源SKU ID
           spuName?: string; // 算力资源名称（下单时快照）
           spuName?: string; // 算力资源名称（下单时快照）
           orderNo?: string; // 订单编号
           orderNo?: string; // 订单编号

src/views/Home/Index.vue

@@ -42,12 +42,7 @@
               <el-divider direction="vertical" border-style="dashed"/>
               <el-divider direction="vertical" border-style="dashed"/>
               <div class="px-8px text-right">
               <div class="px-8px text-right">
                 <div class="mb-16px text-14px text-gray-400">{{ '今日订单金额' }}</div>
                 <div class="mb-16px text-14px text-gray-400">{{ '今日订单金额' }}</div>
-                <CountTo
-                  class="text-20px"
-                  :start-val="0"
-                  :end-val="todayData.newOrdersAmount"
-                  :duration="2600"
-                />
+                <div class="text-20px">¥{{ todayData.newOrdersAmount?.toFixed(2) || '0.00' }}</div>
               </div>
               </div>
             </div>
             </div>
           </el-col>
           </el-col>
@@ -373,7 +368,7 @@ const getComputeOrderChartData = async (orderDateType) => {
 
 
   computeOrderChartOptions.value.xAxis!.data = ordersData.map(item => t(item.countDate))
   computeOrderChartOptions.value.xAxis!.data = ordersData.map(item => t(item.countDate))
   computeOrderChartOptions.value.series![0].data = ordersData.map(item => item.computeOrdersCount)
   computeOrderChartOptions.value.series![0].data = ordersData.map(item => item.computeOrdersCount)
-  computeOrderChartOptions.value.series![1].data = ordersData.map(item => item.computeOrdersAmount)
+  computeOrderChartOptions.value.series![1].data = ordersData.map(item => (item.computeOrdersAmount / 100).toFixed(2))
 }
 }
 
 
 // API订单折线图数据
 // API订单折线图数据
@@ -382,7 +377,7 @@ const getApiOrderChartData = async (orderDateType) => {
 
 
   apiOrderChartOptions.value.xAxis!.data = ordersData.map(item => t(item.countDate))
   apiOrderChartOptions.value.xAxis!.data = ordersData.map(item => t(item.countDate))
   apiOrderChartOptions.value.series![0].data = ordersData.map(item => item.apiOrdersCount)
   apiOrderChartOptions.value.series![0].data = ordersData.map(item => item.apiOrdersCount)
-  apiOrderChartOptions.value.series![1].data = ordersData.map(item => item.apiOrdersAmount)
+  apiOrderChartOptions.value.series![1].data = ordersData.map(item => (item.apiOrdersAmount / 100).toFixed(2))
 }
 }
 
 
 // 初始化数据
 // 初始化数据

src/views/apihub/apiorder/index.vue

@@ -166,7 +166,6 @@
         :formatter="dateFormatter"
         :formatter="dateFormatter"
         width="180px"
         width="180px"
       />
       />
-      <el-table-column label="支付状态" align="center" prop="payStatusName"/>
       <!--      <el-table-column-->
       <!--      <el-table-column-->
       <!--        label="订单完成时间"-->
       <!--        label="订单完成时间"-->
       <!--        align="center"-->
       <!--        align="center"-->

src/views/compute/resourceorder/index.vue

@@ -6,7 +6,7 @@
       :model="queryParams"
       :model="queryParams"
       ref="queryFormRef"
       ref="queryFormRef"
       :inline="true"
       :inline="true"
-      label-width="68px"
+      label-width="100px"
     >
     >
       <!--      <el-form-item label="下单用户ID" prop="userId">-->
       <!--      <el-form-item label="下单用户ID" prop="userId">-->
 <!--        <el-input-->
 <!--        <el-input-->