This commit is contained in:
weipengfei 2024-06-29 18:25:41 +08:00
parent 3c411f831e
commit 0b66dbf1ef
8 changed files with 380 additions and 6 deletions

View File

@ -2,9 +2,9 @@ NODE_ENV = 'production'
# Base API # Base API
# # 测试域名 # # 测试域名
VITE_NOW_TYPE = 'dist/admin' # VITE_NOW_TYPE = 'dist/admin'
VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn' # VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
# 正式域名 # 正式域名
# VITE_NOW_TYPE = 'build/admin' VITE_NOW_TYPE = 'build/admin'
# VITE_APP_BASE_URL='https://multi-store.lihaink.cn' VITE_APP_BASE_URL='https://multi-store.lihaink.cn'

26
src/api/user_ship.ts Normal file
View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 会员类型列表
export function apiUserShipLists(params: any) {
return request.get({ url: '/user_ship/usership/lists', params })
}
// 添加会员类型
export function apiUserShipAdd(params: any) {
return request.post({ url: '/user_ship/usership/add', params })
}
// 编辑会员类型
export function apiUserShipEdit(params: any) {
return request.post({ url: '/user_ship/usership/edit', params })
}
// 删除会员类型
export function apiUserShipDelete(params: any) {
return request.post({ url: '/user_ship/usership/delete', params })
}
// 会员类型详情
export function apiUserShipDetail(params: any) {
return request.get({ url: '/user_ship/usership/detail', params })
}

View File

@ -45,6 +45,7 @@
<div v-if="row.product?.length > 3" style="text-align: left">...</div> <div v-if="row.product?.length > 3" style="text-align: left">...</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="门店" prop="store_name" show-overflow-tooltip />
<el-table-column label="用户" prop="nickname" show-overflow-tooltip /> <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
<el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip /> <el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip />
<el-table-column label="订单状态" prop="status_name"> <el-table-column label="订单状态" prop="status_name">

View File

@ -11,7 +11,7 @@
<el-select v-model="queryParams.uid" filterable remote reserve-keyword placeholder="输入用户名称搜索" <el-select v-model="queryParams.uid" filterable remote reserve-keyword placeholder="输入用户名称搜索"
remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px" remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
@change="resetPage"> @change="resetPage">
<el-option v-for="item in userList" :key="item.id" :label="`${item.nickname} (ID:${item.id})`" :value="item.id" /> <el-option v-for="item in userList" :key="item.id" :label="`${item.real_name || item.nickname} (ID:${item.id})`" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单id" prop="oid"> <el-form-item label="订单id" prop="oid">

View File

@ -32,7 +32,7 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="" prop="label_id" show-overflow-tooltip /> <el-table-column label="ID" prop="label_id" width="100" />
<el-table-column label="标签名称" prop="label_name" show-overflow-tooltip /> <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">

View File

@ -0,0 +1,91 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
title="详情"
:async="true"
width="550px"
:cancelButtonText="false"
:confirmButtonText="false"
>
<el-form ref="formRef" :model="formData" label-width="90px">
<el-form-item label="会员名称" prop="title">
<el-input v-model="formData.title" clearable placeholder="请输入会员名称" :readonly="true"/>
</el-form-item>
<el-form-item label="充值金额" prop="limit">
<el-input v-model="formData.limit" clearable placeholder="请输入充值金额" :readonly="true"/>
</el-form-item>
<el-form-item label="排序倒序" prop="sort">
<el-input v-model="formData.sort" clearable placeholder="请输入排序倒序" :readonly="true"/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="userShipDETAILS">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiUserShipAdd, apiUserShipEdit, apiUserShipDetail } from '@/api/user_ship'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const formData = reactive({
id: '',
title: '',
limit: '',
sort: '',
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiUserShipDetail({
id: row.id
})
setFormData(data)
}
//
const open = () => {
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -0,0 +1,127 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="会员名称" prop="title">
<el-input v-model="formData.title" clearable placeholder="请输入会员名称" :readonly="false"/>
</el-form-item>
<el-form-item label="充值金额" prop="limit">
<el-input v-model="formData.limit" clearable placeholder="请输入充值金额" :readonly="false"/>
</el-form-item>
<el-form-item label="排序倒序" prop="sort">
<el-input v-model="formData.sort" clearable placeholder="请输入排序倒序" :readonly="false"/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="userShipEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiUserShipAdd, apiUserShipEdit, apiUserShipDetail } from '@/api/user_ship'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑会员类型' : '新增会员类型'
})
//
const formData = reactive({
id: '',
title: '',
limit: '',
sort: '',
})
//
const formRules = reactive<any>({
title: [{
required: true,
message: '请输入会员名称',
trigger: ['blur']
}],
limit: [{
required: true,
message: '请输入充值金额',
trigger: ['blur']
}],
sort: [{
required: true,
message: '请输入排序倒序',
trigger: ['blur']
}]
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiUserShipDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiUserShipEdit(data)
: await apiUserShipAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -0,0 +1,129 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="会员名称" prop="title">
<el-input class="w-[280px]" v-model="queryParams.title" @keydown.enter="resetPage" @clear="resetPage" clearable placeholder="请输入会员名称" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['user_ship.user_ship/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['user_ship.user_ship/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="ID" prop="id" show-overflow-tooltip />
<el-table-column label="会员名称" prop="title" show-overflow-tooltip />
<el-table-column label="折扣" prop="discount" show-overflow-tooltip />
<el-table-column label="充值金额" prop="limit" show-overflow-tooltip />
<el-table-column label="排序倒序" prop="sort" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['user_ship.user_ship/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['user_ship.user_ship/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="userShipLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiUserShipLists, apiUserShipDelete } from '@/api/user_ship'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
title: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiUserShipLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiUserShipDelete({ id })
getLists()
}
getLists()
</script>