diff --git a/src/api/admin/tm-member-platform.js b/src/api/admin/tm-member-platform.js index f6455f2..febc134 100644 --- a/src/api/admin/tm-member-platform.js +++ b/src/api/admin/tm-member-platform.js @@ -44,3 +44,11 @@ export function delTmMemberPlatform(data) { }) } +//修改TmMemberPlatform的字符 +export function tmMemberPlatformChangeChar(data){ + return request({ + url: '/api/v1/tm-member-platform/change-chars', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/api/admin/tm-member.js b/src/api/admin/tm-member.js index e820908..1f8c2ce 100644 --- a/src/api/admin/tm-member.js +++ b/src/api/admin/tm-member.js @@ -1,78 +1,86 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询TmMember列表 export function listTmMember(query) { return request({ - url: '/api/v1/tm-member', - method: 'get', - params: query - }) + url: "/api/v1/tm-member", + method: "get", + params: query, + }); } // 查询TmMember详细 export function getTmMember(id) { return request({ - url: '/api/v1/tm-member/' + id, - method: 'get' - }) + url: "/api/v1/tm-member/" + id, + method: "get", + }); } // 新增TmMember export function addTmMember(data) { return request({ - url: '/api/v1/tm-member', - method: 'post', - data: data - }) + url: "/api/v1/tm-member", + method: "post", + data: data, + }); } // 修改TmMember export function updateTmMember(data) { return request({ - url: '/api/v1/tm-member/' + data.id, - method: 'put', - data: data - }) + url: "/api/v1/tm-member/" + data.id, + method: "put", + data: data, + }); } // 删除TmMember export function delTmMember(data) { return request({ - url: '/api/v1/tm-member', - method: 'delete', - data: data - }) + url: "/api/v1/tm-member", + method: "delete", + data: data, + }); } // 获取API Key export function getMyKey() { return request({ - url: '/api/v1/tm-member/api-key', - method: 'get' - }) + url: "/api/v1/tm-member/api-key", + method: "get", + }); } // 获取使用量统计 export function getTranslateDataStatistic() { return request({ - url: '/api/v1/translate/datastatistics', - method: 'get' - }) + url: "/api/v1/translate/datastatistics", + method: "get", + }); } // 字符充值 -export function tmMemberRecharge(data) { +// export function tmMemberRecharge(data) { +// return request({ +// url: '/api/v1/tm-member/recharge', +// method: 'post', +// data: data +// }) +// } + +export function tmMemberManageRecharge(data) { return request({ - url: '/api/v1/tm-member/recharge', - method: 'post', - data: data - }) + url: "/api/v1/tm-member/manager-recharge", + method: "post", + data: data, + }); } export function changeTmMemberStatus(data) { return request({ - url: '/api/v1/tm-member/status', - method: 'put', - data: data - }) + url: "/api/v1/tm-member/status", + method: "put", + data: data, + }); } diff --git a/src/views/admin/sys-config/set.vue b/src/views/admin/sys-config/set.vue index ced6c0e..eaa97ed 100644 --- a/src/views/admin/sys-config/set.vue +++ b/src/views/admin/sys-config/set.vue @@ -79,6 +79,9 @@ :style="{ width: '100%' }" /> + + + 提交 重置 @@ -121,7 +124,8 @@ export default { sys_user_initPassword: undefined, sys_index_skinName: undefined, sys_index_sideTheme: undefined, - trx_receive_address: undefined + trx_receive_address: undefined, + tm_gift_characters: undefined }, rules: { sys_app_name: [{ @@ -144,7 +148,8 @@ export default { message: '请选择侧栏主题', trigger: 'change' }], - trx_receive_address: [{ required: true, message: '请输入TRX收货地址', trigger: 'blur' }] + trx_receive_address: [{ required: true, message: '请输入TRX收货地址', trigger: 'blur' }], + tm_gift_characters: [{ required: true, message: '请输入默认赠送字符数', trigger: 'blur' }] }, otherRules: { diff --git a/src/views/admin/tm-member/index.vue b/src/views/admin/tm-member/index.vue index d17f61b..1e39755 100644 --- a/src/views/admin/tm-member/index.vue +++ b/src/views/admin/tm-member/index.vue @@ -3,23 +3,13 @@ - + - + @@ -49,23 +39,33 @@ + - + - {{ item.name }}:{{ item.remainChars }} + + {{ item.name }}:{{ item.totalChars }} + + - + - + {{ item.name }}:{{ + item.totalChars }} 修改 + + + + + + 启用 禁用 @@ -73,18 +73,18 @@ - + 正常 禁用 - + {{ parseTime(scope.row.createdAt) }} - + - - 充值 + + 充值 @@ -118,13 +109,8 @@ - + - + + + @@ -181,11 +168,13 @@ import { addTmMember, delTmMember, getTmMember, listTmMember, updateTmMember, changeTmMemberStatus } from '@/api/admin/tm-member' import TmMemberRecharge from './tm-member-recharge.vue' import checkPermisAction from '@/utils/permisaction' +import TmMemberChange from './tm-member-change.vue' export default { name: 'TmMember', components: { - TmMemberRecharge + TmMemberRecharge, + TmMemberChange }, data() { return { @@ -205,8 +194,20 @@ export default { open: false, isEdit: false, showRecharge: false, - showApiKey: undefined, - showNickName: undefined, + showRechargeData: { + showApiKey: undefined, + showNickName: undefined, + memberId: undefined, + userId: undefined, + }, + showChange: false, + showCangeData: { + nickName: undefined, + platformId: undefined, + platformName: undefined, + totalNum: undefined, + type: undefined, + }, rechargeId: undefined, // 类型数据字典 typeOptions: [], @@ -282,10 +283,10 @@ export default { } this.resetForm('form') }, - getImgList: function() { + getImgList: function () { this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl }, - fileClose: function() { + fileClose: function () { this.fileOpen = false }, areaCodeFormat(row) { @@ -321,7 +322,7 @@ export default { handleUpdate(row) { this.reset() const id = - row.id || this.ids + row.id || this.ids getTmMember(id).then(response => { this.form = response.data this.open = true @@ -330,7 +331,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm: function () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.id !== undefined) { @@ -365,7 +366,7 @@ export default { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }).then(function() { + }).then(function () { return delTmMember({ 'ids': Ids }) }).then((response) => { if (response.code === 200) { @@ -375,13 +376,16 @@ export default { } else { this.msgError(response.msg) } - }).catch(function() { + }).catch(function () { }) }, handleRecharge(row) { - this.rechargeId = row.id - this.showApiKey = row.apiKey - this.showNickName = row.nickName + this.showRechargeData={ + UserId: row.userId, + memberId: row.id, + showApiKey: row.apiKey, + showNickName: row.nickName + } this.showRecharge = true }, handleRechargeClose() { @@ -404,7 +408,31 @@ export default { .finally(() => { this.loading = false }) + }, + handleChangeChar(row, nickName, type) { + this.showCangeData = { + nickName: nickName, + platformId: row.platformId, + platformName: row.name, + memberId: row.memberId, + userId: row.userId, + totalNum: row.totalChars, + type: type + } + + this.showChange = true + + }, + // 修改字符关闭事件 + handleChangeCharClose() { + this.getList() } } } + + \ No newline at end of file diff --git a/src/views/admin/tm-member/tm-member-change.vue b/src/views/admin/tm-member/tm-member-change.vue new file mode 100644 index 0000000..f6523e2 --- /dev/null +++ b/src/views/admin/tm-member/tm-member-change.vue @@ -0,0 +1,119 @@ + + + + + {{ userName }} + + {{ platformName }} + + + + + + + + + \ No newline at end of file diff --git a/src/views/admin/tm-member/tm-member-recharge.vue b/src/views/admin/tm-member/tm-member-recharge.vue index ab043e9..ade9112 100644 --- a/src/views/admin/tm-member/tm-member-recharge.vue +++ b/src/views/admin/tm-member/tm-member-recharge.vue @@ -1,114 +1,141 @@ - - - - {{ nickName }} - - - - - - - - {{ apiKey }} - - - - - - - + + + + {{ nickName }} + + + + + + + + {{ apiKey }} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/dev-tools/gen/index.vue b/src/views/dev-tools/gen/index.vue index b2897d6..0507080 100644 --- a/src/views/dev-tools/gen/index.vue +++ b/src/views/dev-tools/gen/index.vue @@ -109,11 +109,13 @@ icon="el-icon-view" @click="handlePreview(scope.row)" >预览 + +