From e298d960e7fe4480078999fd9e54ec00cb60e2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 16 Sep 2024 14:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=EF=BC=9AisAdmin=3Dtrue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   8 +-
 src/api/cms/mpOfficialMenu/index.ts           | 106 +++++++
 src/api/cms/mpOfficialMenu/model/index.ts     |  37 +++
 src/layout/components/header-tools.vue        |  10 +-
 .../components/mpOfficialMenuEdit.vue         | 228 +++++++++++++++
 .../cms/mpOfficialMenu/components/search.vue  |  42 +++
 src/views/cms/mpOfficialMenu/index.vue        | 263 ++++++++++++++++++
 src/views/passport/login/index.vue            |   3 +-
 8 files changed, 686 insertions(+), 11 deletions(-)
 create mode 100644 src/api/cms/mpOfficialMenu/index.ts
 create mode 100644 src/api/cms/mpOfficialMenu/model/index.ts
 create mode 100644 src/views/cms/mpOfficialMenu/components/mpOfficialMenuEdit.vue
 create mode 100644 src/views/cms/mpOfficialMenu/components/search.vue
 create mode 100644 src/views/cms/mpOfficialMenu/index.vue

diff --git a/.env.development b/.env.development
index 013ec41..a61fa6b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
-#VITE_SERVER_URL=https://server.gxwebsoft.com/api
+VITE_SERVER_URL=https://server.gxwebsoft.com/api
 VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
-#VITE_API_URL=https://modules.gxwebsoft.com/api
+VITE_API_URL=https://modules.gxwebsoft.com/api
 
 
-VITE_SERVER_URL=http://127.0.0.1:9090/api
-VITE_API_URL=http://127.0.0.1:9001/api
+#VITE_SERVER_URL=http://127.0.0.1:9090/api
+#VITE_API_URL=http://127.0.0.1:9001/api
 #VITE_THINK_URL=http://127.0.0.1:9099/api
 #/booking/bookingItem
diff --git a/src/api/cms/mpOfficialMenu/index.ts b/src/api/cms/mpOfficialMenu/index.ts
new file mode 100644
index 0000000..9210cc3
--- /dev/null
+++ b/src/api/cms/mpOfficialMenu/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { MpOfficialMenu, MpOfficialMenuParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询小程序端菜单
+ */
+export async function pageMpOfficialMenu(params: MpOfficialMenuParam) {
+  const res = await request.get<ApiResult<PageResult<MpOfficialMenu>>>(
+    MODULES_API_URL + '/cms/mp-official-menu/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询小程序端菜单列表
+ */
+export async function listMpOfficialMenu(params?: MpOfficialMenuParam) {
+  const res = await request.get<ApiResult<MpOfficialMenu[]>>(
+    MODULES_API_URL + '/cms/mp-official-menu',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加小程序端菜单
+ */
+export async function addMpOfficialMenu(data: MpOfficialMenu) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/mp-official-menu',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改小程序端菜单
+ */
+export async function updateMpOfficialMenu(data: MpOfficialMenu) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/mp-official-menu',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除小程序端菜单
+ */
+export async function removeMpOfficialMenu(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/mp-official-menu/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除小程序端菜单
+ */
+export async function removeBatchMpOfficialMenu(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/mp-official-menu/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询小程序端菜单
+ */
+export async function getMpOfficialMenu(id: number) {
+  const res = await request.get<ApiResult<MpOfficialMenu>>(
+    MODULES_API_URL + '/cms/mp-official-menu/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/cms/mpOfficialMenu/model/index.ts b/src/api/cms/mpOfficialMenu/model/index.ts
new file mode 100644
index 0000000..dc4cd02
--- /dev/null
+++ b/src/api/cms/mpOfficialMenu/model/index.ts
@@ -0,0 +1,37 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 小程序端菜单
+ */
+export interface MpOfficialMenu {
+  // ID
+  id?: number;
+  // 上级id, 0是顶级
+  parentId?: number;
+  // 菜单名称
+  name?: string;
+  // 类型
+  type?: string;
+  // 菜单值
+  key?: string;
+  // 用户ID
+  userId?: number;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0正常, 1冻结
+  status?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 小程序端菜单搜索条件
+ */
+export interface MpOfficialMenuParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue
index d77db79..612efc8 100644
--- a/src/layout/components/header-tools.vue
+++ b/src/layout/components/header-tools.vue
@@ -117,11 +117,11 @@
                 </div>
               </a-menu-item>
               <a-menu-divider />
-              <a-menu-item key="skin" v-if="loginUser.username == 'admin'">
-                <div class="ele-cell">
-                  <div class="ele-cell-content"> 偏好设置 </div>
-                </div>
-              </a-menu-item>
+              <!--              <a-menu-item key="skin" v-if="loginUser.username == 'admin'">-->
+              <!--                <div class="ele-cell">-->
+              <!--                  <div class="ele-cell-content"> 偏好设置 </div>-->
+              <!--                </div>-->
+              <!--              </a-menu-item>-->
               <a-menu-divider />
               <a-menu-item key="system" v-if="loginUser.username == 'admin'">
                 <div class="ele-cell">
diff --git a/src/views/cms/mpOfficialMenu/components/mpOfficialMenuEdit.vue b/src/views/cms/mpOfficialMenu/components/mpOfficialMenuEdit.vue
new file mode 100644
index 0000000..39c0d9e
--- /dev/null
+++ b/src/views/cms/mpOfficialMenu/components/mpOfficialMenuEdit.vue
@@ -0,0 +1,228 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑小程序端菜单' : '添加小程序端菜单'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="上级id, 0是顶级" name="parentId">
+        <a-input
+          allow-clear
+          placeholder="请输入上级id, 0是顶级"
+          v-model:value="form.parentId"
+        />
+      </a-form-item>
+      <a-form-item label="菜单名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入菜单名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="类型" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入类型"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="菜单值" name="key">
+        <a-input
+          allow-clear
+          placeholder="请输入菜单值"
+          v-model:value="form.key"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1冻结" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addMpOfficialMenu, updateMpOfficialMenu } from '@/api/cms/mpOfficialMenu';
+  import { MpOfficialMenu } from '@/api/cms/mpOfficialMenu/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: MpOfficialMenu | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<MpOfficialMenu>({
+    id: undefined,
+    parentId: undefined,
+    name: undefined,
+    type: undefined,
+    key: undefined,
+    userId: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    mpOfficialMenuId: undefined,
+    mpOfficialMenuName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    mpOfficialMenuName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写小程序端菜单名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateMpOfficialMenu : addMpOfficialMenu;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/cms/mpOfficialMenu/components/search.vue b/src/views/cms/mpOfficialMenu/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/cms/mpOfficialMenu/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/cms/mpOfficialMenu/index.vue b/src/views/cms/mpOfficialMenu/index.vue
new file mode 100644
index 0000000..55c7674
--- /dev/null
+++ b/src/views/cms/mpOfficialMenu/index.vue
@@ -0,0 +1,263 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="mpOfficialMenuId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <MpOfficialMenuEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import MpOfficialMenuEdit from './components/mpOfficialMenuEdit.vue';
+  import { pageMpOfficialMenu, removeMpOfficialMenu, removeBatchMpOfficialMenu } from '@/api/cms/mpOfficialMenu';
+  import type { MpOfficialMenu, MpOfficialMenuParam } from '@/api/cms/mpOfficialMenu/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<MpOfficialMenu[]>([]);
+  // 当前编辑数据
+  const current = ref<MpOfficialMenu | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageMpOfficialMenu({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '上级id, 0是顶级',
+      dataIndex: 'parentId',
+      key: 'parentId',
+      align: 'center',
+    },
+    {
+      title: '菜单名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '菜单值',
+      dataIndex: 'key',
+      key: 'key',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '排序(数字越小越靠前)',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '状态, 0正常, 1冻结',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: MpOfficialMenuParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: MpOfficialMenu) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: MpOfficialMenu) => {
+    const hide = message.loading('请求中..', 0);
+    removeMpOfficialMenu(row.mpOfficialMenuId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchMpOfficialMenu(selection.value.map((d) => d.mpOfficialMenuId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: MpOfficialMenu) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'MpOfficialMenu'
+  };
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/passport/login/index.vue b/src/views/passport/login/index.vue
index 2459a81..ad91603 100644
--- a/src/views/passport/login/index.vue
+++ b/src/views/passport/login/index.vue
@@ -242,8 +242,7 @@
     password: '',
     code: '',
     smsCode: '',
-    remember: true,
-    isAdmin: true
+    remember: true
   });
 
   // 验证码 base64 数据