root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:1a0cfaac2bf51128f276fb3705f5cea465ca35c4
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
..
compare: root:1ca6b87037fbf1327ad3f9174bfed6e17c0e6b17
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

No commits in common. "1a0cfaac2bf51128f276fb3705f5cea465ca35c4" and "1ca6b87037fbf1327ad3f9174bfed6e17c0e6b17" have entirely different histories.
1a0cfaac2b ... 1ca6b87037

4 changed files with 89 additions and 85 deletions
Show Stats Expand all files Collapse all files

2
yudao-admin-vue3/src/utils/dict.ts
View File

@ -221,8 +221,6 @@ export enum DICT_TYPE {
PAID_MEMBER_USER_PAID = 'paid_member_user_paid', //付费会员支付状态 PAID_MEMBER_USER_PAID = 'paid_member_user_paid', //付费会员支付状态
MEMBER_USER_PAID = 'member_user_paid', //会员支付状态
MEMBER_USER_PAY_TYPE = 'member_user_pay_type',// 会员记录支付方式 MEMBER_USER_PAY_TYPE = 'member_user_pay_type',// 会员记录支付方式
// ========== MALL - 商品模块 ========== // ========== MALL - 商品模块 ==========

16
yudao-admin-vue3/src/views/infra/file/index.vue
View File

@ -5,23 +5,22 @@
<!-- 菜单区域 --> <!-- 菜单区域 -->
<div class="menu-area"> <div class="menu-area">
<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;"> <el-button type="primary" plain @click="createType">
<Icon icon="ep:plus" class="mr-5px" /> 新增分类 <Icon icon="ep:plus" class="mr-5px" /> 新增分类
</el-button> </el-button>
<el-menu :default-active="targetMenuId" style="width:182px"> <el-menu :default-active="targetMenuId">
<el-menu-item :index="targetMenuId" :key="targetMenuId" @click="clickMenu(targetMenuId)"> <el-menu-item :index="targetMenuId" :key="targetMenuId" @click="clickMenu(targetMenuId)">
全部类型 全部类型
</el-menu-item> </el-menu-item>
<el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value" <el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value"
@click="clickMenu(item.value)"> @click="clickMenu(item.value)">
{{ item.label }} {{ item.label }}
<el-icon style="margin-left: 60px;width: 10px;" @mouseover="showActions = item.value" <el-icon style="margin-left: 40px;" @mouseover="showActions = item.value"
@mouseleave="showActions = null"> @mouseleave="showActions = null">
<MoreFilled /> <MoreFilled />
<div v-if="showActions === item.value" class="action-buttons"> <div v-if="showActions === item.value" class="action-buttons">
<el-button size="small" @click.stop="editItem(item.id,item.label)">编辑</el-button> <el-button size="small" @click.stop="editItem(item.id,item.label)">编辑</el-button>
<br />
<el-button size="small" @click.stop="deleteItem(item.id)">删除</el-button> <el-button size="small" @click.stop="deleteItem(item.id)">删除</el-button>
</div> </div>
</el-icon> </el-icon>
@ -356,10 +355,9 @@
} }
.menu-area { .menu-area {
padding: 25px;
background-color: white; width: 200px;
width: 180px; height: 100vh;
height: 1000px;
/* 固定高度 */ /* 固定高度 */
overflow-y: hidden; overflow-y: hidden;
/* 禁止滚动 */ /* 禁止滚动 */

111
yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue
View File

@ -3,10 +3,10 @@
<div class="flex-container"> <div class="flex-container">
<!-- 菜单区域 --> <!-- 菜单区域 -->
<div class="menu-area"> <div class="menu-area">
<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;"> <el-button type="primary" plain @click="createType">
<Icon icon="ep:plus" class="mr-5px" /> 新增分类 <Icon icon="ep:plus" class="mr-5px" /> 新增分类
</el-button> </el-button>
<el-menu :default-active="targetMenuId" style="width:183px"> <el-menu :default-active="targetMenuId">
<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value" <el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value"
@click="clickMenu(item.value)">{{item.label}}</el-menu-item> @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
</el-menu> </el-menu>
@ -79,11 +79,11 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap> </ContentWrap>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</div> </div>
</div> </div>
@ -94,20 +94,26 @@
<Dialog v-model="dialogVisible" :title="dialogTitle"> <Dialog v-model="dialogVisible" :title="dialogTitle">
<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px"> <el-form
ref="formRef"
v-loading="formLoading"
:model="formData"
:rules="formRules"
label-width="80px"
>
<el-form-item label="数据标签" prop="label"> <el-form-item label="数据标签" prop="label">
<el-input v-model="formData.label" placeholder="请输入数据标签" /> <el-input v-model="formData.label" placeholder="请输入数据标签" />
</el-form-item> </el-form-item>
<el-form-item label="显示排序" prop="sort"> <el-form-item label="显示排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" controls-position="right" /> <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
</template> </template>
</Dialog> </Dialog>
@ -127,19 +133,19 @@
const dialogTitle = ref('新增分类') // 弹窗的标题 const dialogTitle = ref('新增分类') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
sort: undefined, sort: undefined,
label: '', label: '',
value: '', value: '',
dictType: '', dictType: '',
// status: CommonStatusEnum.ENABLE, // status: CommonStatusEnum.ENABLE,
colorType: '', colorType: '',
cssClass: '', cssClass: '',
remark: '' remark: ''
}) })
const formRules = reactive({ const formRules = reactive({
label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }], label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }], sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
}) })
/** 客服话术 列表 */ /** 客服话术 列表 */
@ -175,32 +181,32 @@
} }
//新增分类 //新增分类
const createType = () => { const createType = () =>{
dialogVisible.value = true dialogVisible.value = true
} }
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => { const submitForm = async () => {
// 校验表单 // 校验表单
if (!formRef) return if (!formRef) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
// 提交请求 // 提交请求
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as DictDataApi.DictDataVO const data = formData.value as DictDataApi.DictDataVO
await DictDataApi.createType(data) await DictDataApi.createType(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
dialogVisible.value = false dialogVisible.value = false
// 发送操作成功的事件 // 发送操作成功的事件
emit('success') emit('success')
queryParams.type = targetMenuId.value queryParams.type = targetMenuId.value
getList() getList()
getHuaShuTypeList() getHuaShuTypeList()
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
@ -278,10 +284,9 @@
} }
.menu-area { .menu-area {
padding: 25px;
background-color: white; width: 200px;
width: 180px; height: 100vh;
height: 1000px;
/* 固定高度 */ /* 固定高度 */
overflow-y: hidden; overflow-y: hidden;
/* 禁止滚动 */ /* 禁止滚动 */

27
yudao-admin-vue3/src/views/member/memberuser/index.vue
View File

@ -9,6 +9,13 @@
label-width="68px" label-width="68px"
> >
<el-form-item label="会员类型" prop="payMemberType"> <el-form-item label="会员类型" prop="payMemberType">
<!-- <el-input-->
<!-- v-model="queryParams.payMemberType"-->
<!-- placeholder="请输入用户会员类型"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<el-select v-model ="queryParams.payMemberType" placeholder="请选择会员类型" @keyup.enter="handleQuery" class="!w-240px"> <el-select v-model ="queryParams.payMemberType" placeholder="请选择会员类型" @keyup.enter="handleQuery" class="!w-240px">
<el-option v-for ="item in cardlist" <el-option v-for ="item in cardlist"
:key="item.id" :key="item.id"
@ -17,6 +24,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付方式" prop="payType"> <el-form-item label="支付方式" prop="payType">
<!-- <el-input-->
<!-- v-model="queryParams.payType"-->
<!-- placeholder="请输入支付方式"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<el-select v-model="queryParams.payType" class="!w-240px" clearable placeholder="请选择状态"> <el-select v-model="queryParams.payType" class="!w-240px" clearable placeholder="请选择状态">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_USER_PAY_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_USER_PAY_TYPE)"
@ -26,16 +40,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付状态" prop="paid">
<el-select v-model="queryParams.paid" class="!w-240px" clearable placeholder="请选择状态">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.PAID_MEMBER_USER_PAID)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="支付时间" prop="payTime"> <el-form-item label="支付时间" prop="payTime">
<el-date-picker <el-date-picker
v-model="queryParams.payTime" v-model="queryParams.payTime"
@ -72,7 +76,7 @@
<el-table-column label="会员类型" align="center" prop="payMemberType" /> <el-table-column label="会员类型" align="center" prop="payMemberType" />
<el-table-column label="是否支付" align="center" prop="paid"> <el-table-column label="是否支付" align="center" prop="paid">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MEMBER_USER_PAID" :value="scope.row.paid"/> <dict-tag :type="DICT_TYPE.PAID_MEMBER_USER_PAID" :value="scope.row.paid"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="有效期限(天)" align="center" prop="deadlineDay" /> <el-table-column label="有效期限(天)" align="center" prop="deadlineDay" />
@ -159,7 +163,6 @@ const getList = async () => {
loading.value = true loading.value = true
try { try {
const data = await PaidMemberUserApi.getPaidMemberUserPage(queryParams) const data = await PaidMemberUserApi.getPaidMemberUserPage(queryParams)
console.log("query：",queryParams)
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {