diff --git a/.env.development b/.env.development index 2fda086..b1bd2dd 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # www.shop.xyz -# VUE_APP_BASE_API = 'http://www.shop.xyz' -VUE_APP_BASE_API = 'http://test.tropjoin.com' +VUE_APP_BASE_API = 'http://testg.tropjoin.com/' +# VUE_APP_BASE_API = 'http://test.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com' # socket 连接地址 diff --git a/src/api/user.js b/src/api/user.js index 68f62ae..aa90760 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -54,6 +54,12 @@ export function createUserApi() { export function addUserApi(data) { return request.post(`user/create`, data) } +/** + * @description 注销用户 + */ +export function cancelUserApi(id) { + return request.get(`user/cancel/user/${id}`) +} /** * @description 用户分组 -- 编辑表单 * @param {Object} param params {Object} 传值参数 diff --git a/src/views/marketing/lottery/create.vue b/src/views/marketing/lottery/create.vue index 316a227..9cc20e8 100644 --- a/src/views/marketing/lottery/create.vue +++ b/src/views/marketing/lottery/create.vue @@ -447,6 +447,15 @@ > + + + + @@ -64,8 +64,16 @@ - - + + - + diff --git a/src/views/promoter/order/index.vue b/src/views/promoter/order/index.vue index 06c0219..811d356 100644 --- a/src/views/promoter/order/index.vue +++ b/src/views/promoter/order/index.vue @@ -189,7 +189,7 @@ clearable /> - + {{ orderDetailList.TopSpread.nickname }}
  • -
    一级佣金：
    +
    自购成长值：
    {{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }} (-{{ orderDetailList.refund_extension_one }})
  • -
    二级佣金：
    +
    上级成长值：
    {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }} (-{{ orderDetailList.refund_extension_two }}) diff --git a/src/views/promoter/user/index.vue b/src/views/promoter/user/index.vue index b4ca262..87c87b2 100644 --- a/src/views/promoter/user/index.vue +++ b/src/views/promoter/user/index.vue @@ -214,7 +214,7 @@ @change="onchangeTimeSpread" /> - + + - + --> - + /> --> 修改密码 + 注销账号 @@ -628,6 +631,7 @@ import { userInfoSelectApi, userMemberListApi, sysVerifyCodeApi, + cancelUserApi, } from "@/api/user"; import newsCategory from "@/components/newsCategory/index.vue"; import userDetail from "./userDetails"; @@ -867,6 +871,30 @@ export default { this.$refs.searchForm.resetFields(); this.changeSearch(1); }, + cancellationUser(row) { + this.$confirm("此操作将注销账号, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + cancelUserApi(row.uid).then((res) => { + if (res.status == 200) { + this.$message({ + type: "success", + message: res.message, + }); + this.getList(1); + } + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消注销", + }); + }); + }, handleRefer() { this.$refs["verify"].validate((valid) => { if (valid) { diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue index 6ca3a7d..97e143d 100644 --- a/src/views/user/list/userDetails.vue +++ b/src/views/user/list/userDetails.vue @@ -1268,6 +1268,16 @@ export default { key: "activation_promoter_name", minWidth: 100, }, + { + title: "注册时间", + key: "create_time", + minWidth: 100, + }, + { + title: "邀请时间", + key: "spread_time", + minWidth: 100, + }, { title: "绑定时间", key: "activation_time",