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

src/apis/modules/activities.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+//获取banner列表
+export const getActiveList = (params) => request.basic.get('/api/v1/active', 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
+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/apis/modules/certifications.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+//获取banner列表
+export const getCertificationsList = (params) => request.basic.get('/api/v1/certifications', 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
+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/locales/lang/zh-CN/menu.js

@@ -83,7 +83,7 @@ export default {
     invoicingFailedList: '开票失败列表',
     invoiceDeliveriesFailed: '寄送失败列表',
     invoiceSuccessList: '已完成',
-    eventCopy: '活动文案',
+    eventCopy: '活动列表',
     activities: '活动管理',
     newConfiguration: '带新配置',
     systemSettings: '短息、支付参数设置',

src/router/routes/activities.js

@@ -18,7 +18,7 @@ export default [
                 name: 'eventCopy',
                 component: 'activities/eventCopy/index.vue',
                  meta: {
-                    title: '活动文案',
+                    title: '活动列表',
                     isMenu: true,
                     keepAlive: true,
                     permission: '*',

src/views/activities/eventCopy/index.vue

@@ -171,18 +171,18 @@ defineOptions({
 })
 
 const columns = [
-    { title: '区域ID', dataIndex: 'hostId' },
+    { title: '活动ID', dataIndex: 'id' },
-    { title: '区域名称', dataIndex: 'hostName' },
+    { title: '标题', dataIndex: 'title' },
-    { title: '区域编码', dataIndex: 'regionId' },
+    { title: '描述', dataIndex: 'description' },
-    { title: '数据中心地址', dataIndex: 'cpu' },
+    { title: '图片地址', dataIndex: 'imgUrl' },
-    { title: '状态', dataIndex: 'memory' },
+    { title: '页面地址', dataIndex: 'pageUrl' },
-    { title: '部署主机数量（主机数量）', dataIndex: 'storage' },
+    { title: '排序', dataIndex: 'order' },
-    { title: '可用计算卡总数', dataIndex: 'ip' },
+    { title: '是否启用', dataIndex: 'is_recommend' },
     { title: '操作', key: 'action', width: 160 },
 ]
-// const { listData, paginationState, loading, showLoading, hideLoading, resetPagination, searchFormData } =
+const { listData, loading, showLoading, hideLoading, paginationState, searchFormData, resetPagination } =
-//     usePagination()
+    usePagination()
-const listData = ref([])
+
 const editDialogRef = ref()
 const searchBarExpand = ref(false)
 const size = ref('default')
@@ -194,22 +194,22 @@ const size = ref('default')
  */
 async function getPageList() {
     try {
-        // showLoading()
+        showLoading()
-        // const { pageSize, current } = paginationState
+        const { pageSize, current } = paginationState
-        // const { code, data } = await apis.common
+        const { code, data } = await apis.activities
-        //     .getPageList({
+            .getActiveList({
-        //         pageSize,
+                pageSize,
-        //         current: current,
+                current: current,
-        //     })
+            })
-        //     .catch(() => {
+            .catch(() => {
-        //         throw new Error()
+                throw new Error()
-        //     })
+            })
-        // hideLoading()
+        hideLoading()
-        // if (config('http.code.success') === code) {
+        if (config('http.code.success') === code) {
-        //     const { records, pagination } = data
+            const { records, pagination } = data
-        //     listData.value = records
+            listData.value = records
-        //     paginationState.total = pagination.total
+            paginationState.total = pagination.total
-        // }
+        }
     } catch (error) {
         // hideLoading()
     }

src/views/certification/certificationList/components/EditDialog.vue

@@ -0,0 +1,158 @@
+<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/certification/certificationList/index.vue

@@ -0,0 +1,211 @@
+<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="'用户姓名'" name="userName">
+                            <a-input :placeholder="'请输入用户姓名'"
+                                v-model:value="searchFormData.userName"></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.certifications
+            .getCertificationsList({
+                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>