Merge branch 'master' of https://gitlab.guxuan.icu/Leo_Ding/GPU_Admin

src/apis/modules/banner.js

@@ -3,11 +3,12 @@ import request from '@/utils/request'
 //获取banner列表
 export const getBannerList = (params) => request.basic.get('/api/v1/banners', params)
 
-//获取单个banner
+//获取单个图片
 export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`)
 //创建banner
 export const createBanner = (data) => request.basic.post('/api/v1/banners', data)
-//更新banner
+
+//编辑banner
 export const updateBanner = (id, data) => request.basic.put(`/api/v1/banners/${id}`, data)
 //删除banner
 export const deleteBanner = (id) => request.basic.delete(`/api/v1/banners/${id}`)

src/router/routes/bannerMgt.js

@@ -1,30 +0,0 @@
-import { SettingOutlined } from '@ant-design/icons-vue'
-
-export default [
-    {
-        path: 'bannerMgt',
-        name: 'bannerMgt',
-        component: 'RouteViewLayout',
-        meta: {
-            icon: 'icon-zhifudingjin',
-            title: '图片管理',
-            isMenu: true,
-            keepAlive: true,
-            permission: '*',
-        },
-        children: [
-            {
-                path: 'bannerList',
-                name: 'bannerList',
-                component: 'bannerMgt/bannerList/index.vue',
-                meta: {
-                    title: '图片列表',
-                    isMenu: true,
-                    keepAlive: true,
-                    permission: '*',
-                },
-            },
-        ],
-    }
-
-]

src/router/routes/index.js

@@ -30,7 +30,6 @@ import withdrawal from './withdrawal'
 import invoice from './invoice'
 import activities from './activities'
 import systemSettings from './systemSettings'
-import bannerMgt from './bannerMgt'
 import platform from './platform'
 export default [
     ...home,
@@ -65,6 +64,5 @@ export default [
     ...invoice,
     ...activities,
     ...systemSettings,
-    ...bannerMgt,
     ...platform,
 ]

src/views/bannerMgt/bannerList/components/EditDialog.vue

@@ -1,158 +0,0 @@
-<template>
-    <a-modal :open="modal.open" :title="modal.title" :width="640" :confirm-loading="modal.confirmLoading"
-        :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel">
-        <a-form ref="formRef" :model="formData" :rules="formRules">
-            <a-card class="mb-8-2">
-                <a-row :gutter="24">
-                    <a-col :span="24">
-                        <a-form-item :label="$t('pages.system.role.form.name')" name="name">
-                            <a-input v-model:value="formData.name"></a-input>
-                        </a-form-item>
-                    </a-col>
-
-                    <a-col :span="24">
-                        <a-form-item :label="$t('pages.system.role.form.sequence')" name="sequence">
-                            <a-input :defaultValue="0" type="number" v-model:value="formData.sequence"></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item :label="$t('pages.system.role.form.status')" name="status">
-                            <a-radio-group v-model:value="formData.status" :options="[
-                                { label: $t('pages.system.role.form.status.enabled'), value: 'enabled' },
-                                { label: $t('pages.system.role.form.status.disabled'), value: 'disabled' },
-                            ]"></a-radio-group>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item :label="'描述'">
-                            <a-textarea v-model:value="formData.description"></a-textarea>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item :label="'上传图片'" name="permissions">
-                            <GxUpload :fileNumber="1" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-card>
-        </a-form>
-    </a-modal>
-</template>
-
-<script setup>
-import { cloneDeep } from 'lodash-es'
-import { message } from 'ant-design-vue'
-import { ref, watch } from 'vue'
-import { config } from '@/config'
-import apis from '@/apis'
-import { useForm, useModal } from '@/hooks'
-import GxUpload from '@/components/GxUpload/index.vue'
-const emit = defineEmits(['ok'])
-import { useI18n } from 'vue-i18n'
-const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
-const { formRecord, formData, formRef, formRules, resetForm } = useForm()
-const { t } = useI18n() // 解构出t方法
-const cancelText = ref(t('button.cancel'))
-const okText = ref(t('button.confirm'))
-formData.value.enabled='enabled'
-formRules.value = {
-    name: { required: true, message: t('pages.system.role.form.name.placeholder') },
-    code: { required: true, message: t('pages.system.role.form.code.placeholder') },
-    status: { required: true, message: t('pages.system.role.form.status.placeholder') },
-}
-
-/**
- * 新建
- */
-function handleCreate() {
-    showModal({
-        type: 'create',
-        title: t('pages.system.role.add'),
-    })
-}
-
-/**
- * 编辑
- */
-async function handleEdit(record = {}) {
-    showModal({
-        type: 'edit',
-        title: t('pages.system.role.edit'),
-    })
-
-    const { data, success } = await apis.role.getRole(record.id).catch()
-    if (!success) {
-        message.error(t('component.message.error.save'))
-        hideModal()
-        return
-    }
-    let menus = []
-    if (data.menus) {
-        for (let item of data.menus) {
-            menus.push(item.menu_id)
-        }
-    }
-    checkedKeys.value = menus
-    formRecord.value = data
-    formData.value = cloneDeep(data)
-}
-
-/**
- * 确定
- */
-function handleOk() {
-    formRef.value
-        .validateFields()
-        .then(async (values) => {
-            try {
-                showLoading()
-                const params = {...values}
-                let result = null
-                switch (modal.value.type) {
-                    case 'create':
-                        result = await apis.banner.createBanner(params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                    case 'edit':
-                        result = await apis.banner.updateBanner(formData.value.id, params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                }
-                hideLoading()
-                if (config('http.code.success') === result?.success) {
-                    hideModal()
-                    emit('ok')
-                }
-            } catch (error) {
-                hideLoading()
-            }
-        })
-        .catch(() => {
-            hideLoading()
-        })
-}
-
-/**
- * 取消
- */
-function handleCancel() {
-    hideModal()
-}
-
-/**
- * 关闭后
- */
-function onAfterClose() {
-    resetForm()
-    hideLoading()
-}
-
-defineExpose({
-    handleCreate,
-    handleEdit,
-})
-</script>
-
-<style lang="less" scoped></style>

src/views/bannerMgt/bannerList/index.vue

@@ -1,211 +0,0 @@
-<template>
-    <x-search-bar class="mb-8-2">
-        <template #default="{ gutter, colSpan }">
-            <a-form :model="searchFormData" layout="inline">
-                <a-row :gutter="gutter">
-                    <a-col v-bind="colSpan">
-                        <a-form-item :label="$t('pages.system.role.form.name')" name="name">
-                            <a-input :placeholder="$t('pages.system.role.form.code.placeholder')"
-                                v-model:value="searchFormData.name"></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col class="align-right" v-bind="colSpan">
-                        <a-space>
-                            <a-button @click="handleResetSearch">{{ $t('button.reset') }}</a-button>
-                            <a-button ghost type="primary" @click="handleSearch">
-                                {{ $t('button.search') }}
-                            </a-button>
-                        </a-space>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </template>
-    </x-search-bar>
-    <a-row :gutter="8" :wrap="false">
-        <a-col flex="auto">
-            <a-card type="flex">
-                <x-action-bar class="mb-8-2">
-                    <a-button v-action="'add'" type="primary" @click="$refs.editDialogRef.handleCreate()">
-                        <template #icon>
-                            <plus-outlined></plus-outlined>
-                        </template>
-                        添加图片
-                    </a-button>
-                </x-action-bar>
-                <a-table :columns="columns" :data-source="listData" :loading="loading" :pagination="paginationState"
-                    :scroll="{ x: 1000 }" @change="onTableChange">
-                    <template #bodyCell="{ column, record }">
-                        <template v-if="'banner_type' === column.key">
-                            <!--状态-->
-                            <a-tag v-if="record.banner_type == 1" color="processing">
-                                首页轮播图
-                            </a-tag>
-                            <!--状态-->
-                            <a-tag v-else color="processing">
-                                营销活动图
-                            </a-tag>
-                        </template>
-
-                        <template v-if="'is_recommend' === column.key">
-                            <!--状态-->
-                            <a-tag v-if="record.banner_type == true" color="processing">
-                                启用
-                            </a-tag>
-                            <!--状态-->
-                            <a-tag v-else color="processing">
-                                禁用
-                            </a-tag>
-                        </template>
-
-
-                        <template v-if="'createAt' === column.key">
-                            {{ formatUtcDateTime(record.created_at) }}
-                        </template>
-
-                        <template v-if="'action' === column.key">
-                            <x-action-button @click="$refs.editDialogRef.handleEdit(record)">
-                                <a-tooltip>
-                                    <template #title> {{ $t('pages.system.role.edit') }}</template>
-                                    <edit-outlined />
-                                </a-tooltip>
-                            </x-action-button>
-                            <x-action-button @click="handleRemove(record)">
-                                <a-tooltip>
-                                    <template #title> {{ $t('pages.system.delete') }}</template>
-                                    <delete-outlined style="color: #ff4d4f" />
-                                </a-tooltip>
-                            </x-action-button>
-                        </template>
-                    </template>
-                </a-table>
-            </a-card>
-        </a-col>
-    </a-row>
-
-    <edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog>
-</template>
-
-<script setup>
-import { message, Modal } from 'ant-design-vue'
-import { ref } from 'vue'
-import apis from '@/apis'
-import { formatUtcDateTime } from '@/utils/util'
-import { config } from '@/config'
-import { statusTypeEnum } from '@/enums/system'
-import { usePagination, useForm } from '@/hooks'
-import EditDialog from './components/EditDialog.vue'
-import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
-import { useI18n } from 'vue-i18n'
-
-defineOptions({
-    name: 'systemRole',
-})
-const { t } = useI18n() // 解构出t方法
-const columns = [
-    { title: '缩略图', dataIndex: 'code', width: 200 },
-    { title: '名称', dataIndex: 'name', width: 150 },
-    { title: '类型', dataIndex: 'banner_type', key: 'banner_type', width: 150 },
-    { title: t('pages.system.role.form.created_at'), key: 'createAt', fixed: 'right', width: 120 },
-    { title: '是否启用', key: 'is_recommend', fixed: 'is_recommend', width: 120 },
-    { title: t('button.action'), key: 'action', fixed: 'right', width: 120 },
-]
-
-const { listData, loading, showLoading, hideLoading, paginationState, searchFormData, resetPagination } =
-    usePagination()
-const { resetForm } = useForm()
-const editDialogRef = ref()
-
-getPageList()
-
-/**
- * 获取用户列表
- * @returns {Promise<void>}
- */
-async function getPageList() {
-    try {
-        showLoading()
-        const { pageSize, current } = paginationState
-        const { data, total } = await apis.banner
-            .getBannerList({
-                pageSize,
-                current: current,
-                ...searchFormData.value,
-            })
-            .catch(() => {
-                throw new Error()
-            })
-        hideLoading()
-        if (data.length > 0) {
-            listData.value = data
-            paginationState.total = total
-        }
-    } catch (error) {
-        hideLoading()
-    }
-}
-
-/**
- * 移除
- */
-function handleRemove({ id }) {
-    Modal.confirm({
-        title: t('pages.system.role.delTip'),
-        content: t('button.confirm'),
-        okText: t('button.confirm'),
-        onOk: () => {
-            return new Promise((resolve, reject) => {
-                ; (async () => {
-                    try {
-                        const { success } = await apis.role.delRole(id).catch(() => {
-                            throw new Error()
-                        })
-                        if (config('http.code.success') === success) {
-                            resolve()
-                            message.success(t('component.message.success.delete'))
-                            await getPageList()
-                        }
-                    } catch (error) {
-                        reject()
-                    }
-                })()
-            })
-        },
-    })
-}
-
-/**
- * 分页
- */
-function onTableChange({ current, pageSize }) {
-    paginationState.current = current
-    paginationState.pageSize = pageSize
-    getPageList()
-}
-
-/**
- * 重置
- */
-function handleResetSearch() {
-    searchFormData.value = {}
-    resetPagination()
-    getPageList()
-}
-
-/**
- * 搜索
- */
-function handleSearch() {
-    resetForm()
-    resetPagination()
-    getPageList()
-}
-
-/**
- * 编辑完成
- */
-async function onOk() {
-    await getPageList()
-}
-</script>
-
-<style lang="less" scoped></style>

src/views/platform/bannerList/components/EditDialog.vue

@@ -23,6 +23,14 @@
                             ]"></a-radio-group>
                         </a-form-item>
                     </a-col>
+                    <a-col :span="24">
+                        <a-form-item :label="'图片类型'" name="status">
+                            <a-radio-group v-model:value="formData.status" :options="[
+                                { label: '轮播图片', value: '1' },
+                                { label: '营销图片', value: '2' },
+                            ]"></a-radio-group>
+                        </a-form-item>
+                    </a-col>
                     <a-col :span="24">
                         <a-form-item :label="'描述'">
                             <a-textarea v-model:value="formData.description"></a-textarea>
@@ -65,9 +73,10 @@ formRules.value = {
  * 新建
  */
 function handleCreate() {
+    console.log('添加handleCreate')
     showModal({
         type: 'create',
-        title: t('pages.system.role.add'),
+        title: '添加图片',
     })
 }
 
@@ -77,10 +86,10 @@ function handleCreate() {
 async function handleEdit(record = {}) {
     showModal({
         type: 'edit',
-        title: t('pages.system.role.edit'),
+        title: '编辑图片',
     })
 
-    const { data, success } = await apis.role.getRole(record.id).catch()
+    const { data, success } = await apis.banner.getBanner(record.id).catch()
     if (!success) {
         message.error(t('component.message.error.save'))
         hideModal()

src/views/platform/bannerList/index.vue

@@ -149,14 +149,14 @@ async function getPageList() {
  */
 function handleRemove({ id }) {
     Modal.confirm({
-        title: t('pages.system.role.delTip'),
+        title: '是否确认删除该图片？',
         content: t('button.confirm'),
         okText: t('button.confirm'),
         onOk: () => {
             return new Promise((resolve, reject) => {
                 ; (async () => {
                     try {
-                        const { success } = await apis.role.delRole(id).catch(() => {
+                        const { success } = await apis.banner.deleteBanner(id).catch(() => {
                             throw new Error()
                         })
                         if (config('http.code.success') === success) {