feat:注销账号,邀请人列表增加注册时间,邀请人时间

2024-11-01 11:27:55 +08:00 · 2024-11-01 11:27:55 +08:00 · 59618e7eb5
parent aecb0e3c93
commit 59618e7eb5
9 changed files with 79 additions and 17 deletions
--- 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 连接地址
--- 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} 传值参数
--- a/src/views/marketing/lottery/create.vue
+++ b/src/views/marketing/lottery/create.vue
@ -447,6 +447,15 @@
                >
                </el-switch>
              </el-form-item>
+              <el-form-item label="活动商品：" prop="product_ids">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  placeholder="请输入内容"
+                  v-model="formValidate.product_ids"
+                >
+                </el-input>
+              </el-form-item>
              <el-form-item
                v-if="formValidate.factor != 3 && formValidate.factor != 4"
                label="活动规则："
@ -640,7 +649,8 @@ export default {
        is_personal_record: 0, //个人中奖纪录展示
        is_content: 0, //活动规格是否展示
        content: "", //富文本内容
-        status: 0, //状态
+        status: 0, //状态,
+        product_ids: "", //活动商品
      },
      ruleValidate: lotteryFrom,
      currentid: "",
--- a/src/views/promoter/bonusLog/index.vue
+++ b/src/views/promoter/bonusLog/index.vue
@ -42,7 +42,7 @@
          <el-input
            v-model="tableFrom.keyword"
            @keyup.enter.native="getList(1)"
-            placeholder="请输入用户ID用户昵称、标题"
+            placeholder="请输入ID、用户昵称、标题、手机号、身份证号"
            class="selWidth"
            clearable
          />
@ -64,8 +64,16 @@
        <el-table-column prop="bill_id" label="ID" min-width="50" />
        <el-table-column label="用户昵称" prop="nickname" min-width="150" />
        <el-table-column prop="user.phone" label="手机号" min-width="120" />
-        <el-table-column prop="user.real_name" label="真实姓名" min-width="120" />
-        <el-table-column prop="user.card_id" label="身份证号码" min-width="120" />
+        <el-table-column
+          prop="user.real_name"
+          label="真实姓名"
+          min-width="120"
+        />
+        <el-table-column
+          prop="user.card_id"
+          label="身份证号码"
+          min-width="120"
+        />
        <el-table-column label="标题" prop="title" min-width="120" />
        <el-table-column label="变动值" prop="number" min-width="90">
          <template slot-scope="scope">
@ -77,7 +85,7 @@
            >
          </template>
        </el-table-column>
-        <el-table-column label="当前额度" prop="balance" min-width="90" />
+        <el-table-column label="可申请奖励" prop="balance" min-width="90" />
        <el-table-column prop="mark" label="备注" min-width="150" />
        <el-table-column prop="create_time" label="添加时间" min-width="90" />
      </el-table>
--- a/src/views/promoter/order/index.vue
+++ b/src/views/promoter/order/index.vue
@ -189,7 +189,7 @@
            clearable
          />
        </el-form-item>
-        <el-form-item label="上级邀请：" prop="top_spread_name">
+        <el-form-item label="被邀请人：" prop="top_spread_name">
          <el-input
            v-model="tableFrom.top_spread_name"
            @keyup.enter.native="getList(1)"
--- a/src/views/promoter/order/orderDetails.vue
+++ b/src/views/promoter/order/orderDetails.vue
@ -129,14 +129,14 @@
                  <div class="value">{{ orderDetailList.TopSpread.nickname }}</div>
                </li>
                <li class="item">
-                  <div>一级佣金：</div>
+                  <div>自购成长值：</div>
                  <div class="value">
                    {{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
                    <em v-if="orderDetailList.refund_extension_one > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_one }})</em>
                  </div>
                </li>
                <li class="item">
-                  <div>二级佣金：</div>
+                  <div>上级成长值：</div>
                  <div class="value">
                    {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
                    <em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
--- a/src/views/promoter/user/index.vue
+++ b/src/views/promoter/user/index.vue
@ -214,7 +214,7 @@
              @change="onchangeTimeSpread"
            />
          </el-form-item>
-          <el-form-item label="用户类型：">
+          <!-- <el-form-item label="用户类型：">
            <el-select
              v-model="spreadFrom.level"
              clearable
@ -224,10 +224,10 @@
            >
              <el-option label="全部" value="" />
              <el-option label="一级邀请人" value="1" />
-              <!-- <el-option label="二级邀请人" value="2" /> -->
+              <el-option label="二级邀请人" value="2" />
              <el-option v-if="showDistributor" label="服务员自购" value="-1" />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item label="关键字：">
            <el-input
              v-model="spreadFrom.keyword"
@ -296,12 +296,12 @@
          min-width="100"
          prop="spread_count"
        />
-        <el-table-column
+        <!-- <el-table-column
          sortable
          label="订单数"
          min-width="90"
          prop="pay_count"
-        />
+        /> -->
        <el-table-column
          sortable
          label="绑定时间"
@ -400,7 +400,7 @@ export default {
        page: 1,
        limit: 10,
        date: "",
-        level: "",
+        level: "1",
        keyword: "",
      },
      timeValSpread: [],
@ -446,7 +446,7 @@ export default {
        page: 1,
        limit: 10,
        date: "",
-        level: "",
+        level: "1",
        keyword: "",
      };
      this.getListSpread(uid, "");
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@ -501,6 +501,9 @@
                  @click.native="setPassword(scope.row)"
                  >修改密码</el-dropdown-item
                >
+                <el-dropdown-item @click.native="cancellationUser(scope.row)"
+                  >注销账号</el-dropdown-item
+                >
                <!-- <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMember(scope.row)">编辑会员等级</el-dropdown-item> -->
                <!-- <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="giveMember(scope.row)">付费会员设置</el-dropdown-item> -->
              </el-dropdown-menu>
@ -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) {
--- 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",