Merge pull request 'dev' (#5) from dev into main

Reviewed-on: #5

src/views/user/money/index.vue

@@ -3,14 +3,14 @@
       <el-card shadow="always"> 
         <el-space alignment="start" :size="30">
         充值金值：
-        <el-input-number v-model="form.paymentPrice" :precision="0" :step="1" :max="100" :min="1" />
+        <el-input-number v-model="form.paymentPrice" :precision="0" :step="1" :max="100" :min="5" />
         <el-button type="primary" @click="handlePayment" :loading="loading">充值</el-button>
         </el-space>
       </el-card>
       <div style="margin-top:5px;">
         <!--<el-alert title="支付通道暂时有问题，如需急用，可加客服微信 K-coder 手动帮您支付" type="warning" :closable="false" />-->
         <!--<el-alert title="第一次充值建议先小额进行试用，充值最高100元，如遇支付受限，请点支付受限按钮" type="warning" :closable="false" />-->
-        <el-alert title="第一次充值建议先小额进行试用，充值最高100元" type="warning" :closable="false" />
+        <el-alert title="新注册用户有小额试用额，请试用成功后再充值" type="warning" :closable="false" />
       </div>
     <div class="main2">
       <el-card class="box-card">
@@ -135,7 +135,9 @@ function handlePayment() {
     aoid.value = response.data.aoid // XorPay平台订单唯一标识
     loading.value = false
     open.value = true
-  });
+  }).catch(() => {
+    loading.value = false
+  })
 }
 
 // 刷新订单状态

src/views/user/usage/index.vue

@@ -30,7 +30,12 @@
             </el-form>
             <el-table v-loading="loading" :data="usageRecordList" @selection-change="handleSelectionChange">
                 <el-table-column label="调用时间" align="center" prop="createTime" />
-                <el-table-column label="调用ID" align="center" prop="secretKey" />
+                <el-table-column label="调用KEY" align="center" prop="secretKey" />
+                <el-table-column label="KEY备注" align="center" prop="secretKey" >
+                  <template #default="scope">
+                    <el-tag class="ml-2" type="success">{{ getRemark(scope.row.secretKey) }}</el-tag>
+                  </template>
+                </el-table-column>
                 <el-table-column label="模型" align="center" prop="model" />
                 <el-table-column label="prompt" align="center" prop="promptTokens" />
                 <el-table-column label="completion" align="center" prop="completionTokens" />
@@ -55,11 +60,12 @@
  
  <script setup name="usage">
 import { currentUserListUsageRecord } from "@/api/cert/usageRecord";
-import { getUserProfile } from "@/api/system/user";
+import { getKeyList } from "@/api/cert/apiToken";
 
 const { proxy } = getCurrentInstance();
 
 const usageRecordList = ref([]);
+const keyList = ref([]);
 const loading = ref(true);
 const total = ref(0);
 
@@ -76,9 +82,20 @@ const data = reactive({
 
 const { queryParams } = toRefs(data);
 
+function getRemark(key) {
+  for(let i=0;i<keyList.value.length;i++) {
+    if('AK-'+keyList.value[i].id == key) {
+      return keyList.value[i].remark;
+    }
+  }
+}
+
 /** 查询使用记录列表 */
 function getList() {
   loading.value = true;
+  getKeyList().then(response => {
+    keyList.value = response.data
+  })
   currentUserListUsageRecord(queryParams.value).then(response => {
     usageRecordList.value = response.rows;
     total.value = response.total;