From 18b6c70d1a2354f930cea3f388a1c28903ef1f1a Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Tue, 19 Sep 2023 16:37:50 +0800
Subject: [PATCH] =?UTF-8?q?trade:=20=E5=88=86=E9=94=80=E4=B8=9A=E5=8A=A1re?=
 =?UTF-8?q?view=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/constants.ts                        | 17 --------------
 .../user/BrokerageOrderListDialog.vue         | 23 ++++++++-----------
 .../user/BrokerageUserListDialog.vue          | 19 ++++++---------
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e7d10487..898ba563 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -299,23 +299,6 @@ export const BrokerageEnabledConditionEnum = {
     name: '指定分销'
   }
 }
-/**
- * 分销用户类型枚举
- */
-export const BrokerageUserTypeEnum = {
-  ALL: {
-    type: 0,
-    name: '全部'
-  },
-  FIRST: {
-    type: 1,
-    name: '一级推广人'
-  },
-  SECOND: {
-    type: 2,
-    name: '二级推广人'
-  }
-}
 /**
  * 佣金记录业务类型枚举
  */
diff --git a/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
index 5d9bb5ad..d2c0568f 100644
--- a/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
+++ b/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
@@ -9,15 +9,11 @@
         :inline="true"
         label-width="85px"
       >
-        <el-form-item label="用户类型" prop="userType">
-          <el-radio-group v-model="queryParams.userType" @change="handleQuery">
-            <el-radio-button
-              v-for="item in BrokerageUserTypeEnum"
-              :key="item.type"
-              :label="item.type"
-            >
-              {{ item.name }}
-            </el-radio-button>
+        <el-form-item label="用户类型" prop="level">
+          <el-radio-group v-model="queryParams.level" @change="handleQuery">
+            <el-radio-button checked>全部</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -98,7 +94,7 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageRecordApi from '@/api/mall/trade/brokerage/record'
-import { BrokerageRecordBizTypeEnum, BrokerageUserTypeEnum } from '@/utils/constants'
+import { BrokerageRecordBizTypeEnum } from '@/utils/constants'
 import { fenToYuanFormat } from '@/utils/formatter'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
@@ -115,14 +111,15 @@ const queryParams = reactive({
   pageSize: 10,
   userId: null,
   bizType: BrokerageRecordBizTypeEnum.ORDER.type,
-  userType: BrokerageUserTypeEnum.ALL.type,
-  createTime: []
+  level: '',
+  createTime: [],
+  status: null
 })
 const queryFormRef = ref() // 搜索的表单
 
 /** 打开弹窗 */
 const dialogVisible = ref(false) // 弹窗的是否展示
-const open = async (userId: number) => {
+const open = async (userId: any) => {
   dialogVisible.value = true
   queryParams.userId = userId
   resetQuery()
diff --git a/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
index 92d0adea..2277cc01 100644
--- a/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
+++ b/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
@@ -9,15 +9,11 @@
         :inline="true"
         label-width="85px"
       >
-        <el-form-item label="用户类型" prop="userType">
-          <el-radio-group v-model="queryParams.userType" @change="handleQuery">
-            <el-radio-button
-              v-for="item in BrokerageUserTypeEnum"
-              :key="item.type"
-              :label="item.type"
-            >
-              {{ item.name }}
-            </el-radio-button>
+        <el-form-item label="用户类型" prop="level">
+          <el-radio-group v-model="queryParams.level" @change="handleQuery">
+            <el-radio-button checked>全部</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="绑定时间" prop="bindUserTime">
@@ -88,7 +84,6 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
-import { BrokerageUserTypeEnum } from '@/utils/constants'
 
 /** 推广人列表 */
 defineOptions({ name: 'BrokerageUserListDialog' })
@@ -102,14 +97,14 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   bindUserId: null,
-  userType: BrokerageUserTypeEnum.ALL.type,
+  level: '',
   bindUserTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 
 /** 打开弹窗 */
 const dialogVisible = ref(false) // 弹窗的是否展示
-const open = async (bindUserId: number) => {
+const open = async (bindUserId: any) => {
   dialogVisible.value = true
   queryParams.bindUserId = bindUserId
   resetQuery()