diff --git a/.env.dev b/.env.dev index c832c8c..ca8a5d2 100644 --- a/.env.dev +++ b/.env.dev @@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/ VITE_ROUTER_HISTORY=hash # api -VITE_API_BASIC=http://10.10.1.21:8040 +VITE_API_BASIC=http://10.10.1.22:8040 VITE_API_HTTP=/api/v1/ # storage VITE_STORAGE_NAMESPACE = gin-admin_local_ \ No newline at end of file diff --git a/config/useServer.js b/config/useServer.js index cf0d325..8896964 100644 --- a/config/useServer.js +++ b/config/useServer.js @@ -3,7 +3,7 @@ export default () => ({ port: 8080, proxy: { '/api': { - target: 'http://10.10.1.21:8040/api', + target: 'http://10.10.1.22:8040/api', // target: 'http://127.0.0.1:8045/api', changeOrigin: true, rewrite: (path) => path.replace('/api', ''), diff --git a/src/apis/modules/contract.js b/src/apis/modules/contract.js index faee93e..ceb61f7 100644 --- a/src/apis/modules/contract.js +++ b/src/apis/modules/contract.js @@ -5,7 +5,7 @@ import request from '@/utils/request' // 获取待审核列表 export const getPageList = (params) => request.basic.get('/api/v1/contractPendingList', params) // 审核 -export const review = (id) => request.basic.post(`/api/v1/contractPendingList/review`,params) +export const review = (params) => request.basic.post(`/api/v1/contractPendingList/review`,params) //合同详情 export const getInfo=(id)=>request.basic.get('/api/v1/contractPendingList/'+id) // 审核失败列表 diff --git a/src/apis/modules/images.js b/src/apis/modules/images.js index 49a764d..e955f45 100644 --- a/src/apis/modules/images.js +++ b/src/apis/modules/images.js @@ -7,7 +7,7 @@ export const getPageList = (params) => request.basic.get('/api/v1/mirror', param // 新增 export const addVouchers = (params) => request.basic.post(`/api/v1/mirror`,params) // 编辑 -export const editeVouchers = (params) => request.basic.put(`/api/v1/mirror${params.id}`, params) +export const editeVouchers = (id,params) => request.basic.put(`/api/v1/mirror/${id}`, params) // 删除 export const deleteVouchers = (id) => request.basic.delete('/api/v1/mirror/'+id) // 获取详情 diff --git a/src/apis/modules/review.js b/src/apis/modules/review.js index f085468..78f043c 100644 --- a/src/apis/modules/review.js +++ b/src/apis/modules/review.js @@ -13,7 +13,7 @@ export const getPendingList = (params) => request.basic.get('/api/v1/withdrawLis // 提现确认 export const pendingUpload = (params) => request.basic.post('/api/v1/withdrawChecked', params) // 提现失败列表 -export const getPendingFaildList = (params) => request.basic.post('/api/v1/withdrawErrorList', params) +export const getPendingFaildList = (params) => request.basic.get('/api/v1/withdrawErrorList', params) //提现成功列表 export const getInvoicingFailedList=(params)=>request.basic.get('/api/v1/withdrawSuccessList',params) diff --git a/src/apis/modules/vouchers.js b/src/apis/modules/vouchers.js index 35ba7f3..939f0c5 100644 --- a/src/apis/modules/vouchers.js +++ b/src/apis/modules/vouchers.js @@ -9,7 +9,7 @@ export const addVouchers = (params) => request.basic.post(`/api/v1/vouchers`,par // 编辑 export const editeVouchers = (params) => request.basic.put(`/api/v1/vouchers${params.id}`, params) // 删除 -export const deleteVouchers = (id) => request.basic.delete('/api/v1/withdrawList/'+id) +export const deleteVouchers = (id) => request.basic.delete('/api/v1/vouchers/'+id) //算力点列表 export const getPointList=(params)=>request.basic.get('/api/v1/points',params) diff --git a/src/enums/dict.js b/src/enums/dict.js index 22d0e86..c0da555 100644 --- a/src/enums/dict.js +++ b/src/enums/dict.js @@ -71,6 +71,36 @@ class DisabledDict extends BaseDict { ]) } } +//镜像类型 +class ImgType extends BaseDict{ + constructor(){ + super([ + ['USER','用户镜像'], + ['SYSTEM','系统镜像'] + ]) + } +} +//计费方式 +class PayType extends BaseDict{ + constructor(){ + super([ + ['PayOnTime','按时付费'], + ['PayOnDay','按日付费'], + ['PayOnWeek','按周付费'], + ['PayOnMonth','按月付费'], + ['PayOnYear','按年付费'], + ]) + } +} +//算力券状态 +class TicketStatus extends BaseDict{ + constructor(){ + super([ + ['ENABLED','启用'], + ['DISABLED','禁用'], + ]) + } +} //如何使用:import {payTypeDict} from '@/enums/dict //获取下拉框列表:payTypeDict.options //获取label:payTypeDict.getLabel(1) @@ -79,3 +109,6 @@ export const payStatusDict = new PayStatusDict() export const authenticationDict = new AuthenticationDict() export const authenticationTypeDict = new AuthenticationTypeDict() export const disabledDict = new DisabledDict() +export const imgType =new ImgType() +export const payType=new PayType() +export const ticketStatus=new TicketStatus() diff --git a/src/views/balance/components/EditDialog.vue b/src/views/balance/components/EditDialog.vue index e738037..f0435d8 100644 --- a/src/views/balance/components/EditDialog.vue +++ b/src/views/balance/components/EditDialog.vue @@ -6,9 +6,7 @@ - - - + @@ -47,7 +45,6 @@ function handleEdit(record = {}) { type: 'edit', title: '添加余额', }) - formRecord.value.userId = record.userId formData.value = cloneDeep(record) } @@ -61,7 +58,8 @@ function handleOk() { try { showLoading() const params = { - ...formData.value, + balanceId:formData.value.id, + amount:formData.value.amount, } let result = null switch (modal.value.type) { @@ -77,7 +75,7 @@ function handleOk() { break } hideLoading() - if (200 === result?.code) { + if (result.success) { hideModal() emit('ok') } diff --git a/src/views/balance/index.vue b/src/views/balance/index.vue index 53d071c..588e4b0 100644 --- a/src/views/balance/index.vue +++ b/src/views/balance/index.vue @@ -30,7 +30,7 @@