Merge remote-tracking branch 'origin/master'

src/api/modules/user.ts

@@ -78,11 +78,11 @@ export async function updateCapitalApi(params: { target_user_id: number; amount:
  */
 export async function editUserApi(params: {
   user_id: number;
-  risk_control_id?: string | number;
-  fee_setting_id?: string | number;
-  username?: string;
+  risk_control_id?: string | number | null;
+  fee_setting_id?: string | number | null;
+  username?: string | null;
   is_levelup?: number | null;
-  status?: number;
+  status?: number | null;
 }) {
   return request.post<boolean>('/user/editUser', params);
 }

src/views/agent/user/index.vue

@@ -23,14 +23,14 @@
         <el-button link type="primary" size="small" @click="openDetailDrawer(row)" v-if="row.userId">
           查看详情
         </el-button>
-        <el-divider direction="vertical" />
-        <el-button link type="primary" size="small" @click="handleEditCustomer(row)">
-          编辑
+        <el-divider direction="vertical"  v-if="+row.role_id !== 5"/>
+        <el-button link type="primary" size="small" @click="handleEditCustomer(row)" v-if="+row.role_id !== 5">
+          升级代理{{ row.roleId }}
         </el-button>
-        <el-divider direction="vertical" />
-        <el-button link type="warning" size="small" @click="handleAdjustAmount(row)">
+        <!-- <el-divider direction="vertical" /> -->
+        <!-- <el-button link type="warning" size="small" @click="handleAdjustAmount(row)">
           调整金额
-        </el-button>
+        </el-button> -->
       </template>
     </CustomerListTable>
 
@@ -80,10 +80,10 @@
     </CustomerListDialog>
 
     <!-- 修改客户弹窗 -->
-    <CustomerListDialog :visible="editCustomerVisible" title="修改客户" type="editCustomer"
+    <CustomerListDialog :visible="editCustomerVisible" title="" type="editCustomer"
       @confirm="handleEditCustomerSubmit" @cancel="handleEditCustomerCancel" @close="handleEditCustomerClose">
       <el-form :model="editCustomerForm" :rules="editCustomerRules" ref="editCustomerFormRef" label-width="140px">
-        <el-form-item label="手续费模板" prop="feeSettingId">
+        <!-- <el-form-item label="手续费模板" prop="feeSettingId">
           <el-select v-model="editCustomerForm.feeSettingId" placeholder="请选择手续费模板" style="width: 100%">
             <el-option v-for="item in feeTemplateOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
@@ -95,19 +95,19 @@
         </el-form-item>
         <el-form-item label="客户名称" prop="username">
           <el-input v-model="editCustomerForm.username" placeholder="请输入客户名称" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否升级成代理" prop="isLevelUp">
           <el-radio-group v-model="editCustomerForm.isLevelUp" :disabled="editCustomerForm.roleId === 5">
             <el-radio :label="1">是</el-radio>
             <el-radio :label="2">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="选择状态" prop="status">
+        <!-- <el-form-item label="选择状态" prop="status">
           <el-radio-group v-model="editCustomerForm.status">
             <el-radio :label="1">正常</el-radio>
             <el-radio :label="2">封禁</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </CustomerListDialog>
 
@@ -658,11 +658,11 @@ const handleEditCustomerSubmit = async () => {
     await editCustomerFormRef.value?.validate()
     await editUserApi({
       user_id: editCustomerUserId.value,
-      fee_setting_id: editCustomerForm.value.feeSettingId,
-      risk_control_id: editCustomerForm.value.riskControlId,
-      username: editCustomerForm.value.username,
+      fee_setting_id: null,
+      risk_control_id: null,
+      username: null,
       is_levelup: editCustomerForm.value.isLevelUp,
-      status: editCustomerForm.value.status,
+      status: null,
     })
     await getCustomerList(userId.value)
     editCustomerVisible.value = false

src/views/agent/user/options.ts

@@ -12,7 +12,7 @@ export const search = [
         valueFormat: 'YYYY-MM-DD',
     },
     // 状态
-    { prop: 'status', label: '状态', type: 'select' as const, placeholder: '请选择状态' },
+    { prop: 'status', label: '状态', type: 'select' as const, placeholder: '请选择状态', width: 100},
 ]
 
 export const tableColumns = [

src/views/profile/agent/index.vue

@@ -13,7 +13,6 @@
           </el-button>
         </template>
         <template #commissionRatio="{ row }">
-          {{ row.commissionRatio }}
           <el-button v-if="row.role_id === 5" type="primary" size="small" @click="handleCommissionRatio(row)"
             v-auth="'agent_editAgent'">
             修改
@@ -587,10 +586,10 @@ const handleEditCustomer = async (row: any) => {
   editCustomerVisible.value = true
   editCustomerUserId.value = row.userId
   editCustomerForm.value = {
-    feeSettingId: row.feeSettingId || '',
-    riskControlId: row.riskControlId || '',
-    username: row.accountName || '',
-    status: row.status === '正常' ? 1 : 2,
+    feeSettingId: row.wallet_capital?.fee_setting_id || '',
+    riskControlId: row.wallet_capital?.risk_control_id || '',
+    username: row.username || row.accountName || '',
+    status: row.status === '正常' ? 1 : row.status === '封禁' ? 2 : row.status,
     roleId: row.role_id,
   }
 }