32
This commit is contained in:
parent
e615859f9a
commit
8153fc14ed
|
|
@ -1512,7 +1512,12 @@ public class UserBusinessService : IUserBusinessService
|
||||||
var usersQuery = _dbContext.Users.AsNoTracking();
|
var usersQuery = _dbContext.Users.AsNoTracking();
|
||||||
|
|
||||||
// 应用过滤条件
|
// 应用过滤条件
|
||||||
if (query.UserId.HasValue)
|
// UserIdStr 实际上是前端传的 UID(用户唯一标识字符串),需要匹配 Uid 字段
|
||||||
|
if (!string.IsNullOrWhiteSpace(query.UserIdStr))
|
||||||
|
{
|
||||||
|
usersQuery = usersQuery.Where(u => u.Uid == query.UserIdStr.Trim());
|
||||||
|
}
|
||||||
|
else if (query.UserId.HasValue)
|
||||||
{
|
{
|
||||||
usersQuery = usersQuery.Where(u => u.Id == query.UserId.Value);
|
usersQuery = usersQuery.Where(u => u.Id == query.UserId.Value);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -286,17 +286,17 @@
|
||||||
<template v-if="formData.isAutoXiajia === 1">
|
<template v-if="formData.isAutoXiajia === 1">
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架利润值(%)">
|
<el-form-item label="下架利润值(%)">
|
||||||
<el-input-number v-model="formData.xiajiaLirun" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaLirun" :min="0" :max="100" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架抽数阈值">
|
<el-form-item label="下架抽数阈值">
|
||||||
<el-input-number v-model="formData.xiajiaAutoCoushu" :min="0" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaAutoCoushu" :min="0" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架金额">
|
<el-form-item label="下架金额">
|
||||||
<el-input-number v-model="formData.xiajiaJine" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaJine" :min="0" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -296,17 +296,17 @@
|
||||||
<template v-if="formData.isAutoXiajia === 1">
|
<template v-if="formData.isAutoXiajia === 1">
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架利润值(%)">
|
<el-form-item label="下架利润值(%)">
|
||||||
<el-input-number v-model="formData.xiajiaLirun" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaLirun" :min="0" :max="100" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架抽数阈值">
|
<el-form-item label="下架抽数阈值">
|
||||||
<el-input-number v-model="formData.xiajiaAutoCoushu" :min="0" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaAutoCoushu" :min="0" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="下架金额">
|
<el-form-item label="下架金额">
|
||||||
<el-input-number v-model="formData.xiajiaJine" style="width: 100%" />
|
<el-input-number v-model="formData.xiajiaJine" :min="0" style="width: 100%; min-width: 120px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -88,8 +88,8 @@
|
||||||
<!-- 奖品分类 -->
|
<!-- 奖品分类 -->
|
||||||
<el-table-column label="分类" width="80" align="center">
|
<el-table-column label="分类" width="80" align="center">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-tag :type="getCategoryTagType(row.type)" size="small">
|
<el-tag :type="getCategoryTagType(row.goodsType)" size="small">
|
||||||
{{ getCategoryLabel(row.type) }}
|
{{ getCategoryLabel(row.goodsType) }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user