From 811a1ee6520790361743f502ee9c2e53748648c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Sun, 26 Dec 2021 12:56:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(advert):=20=E5=B9=BF=E5=91=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sms/advert.ts                     |  65 +++++
 src/components/TreeSelect/index.vue       |  40 +--
 src/views/sms/advert/index.vue            | 314 ++++++++++++++++++++++
 src/views/system/menu/components/Perm.vue |  14 +-
 src/views/system/role/components/Role.vue |  19 +-
 5 files changed, 419 insertions(+), 33 deletions(-)
 create mode 100644 src/api/sms/advert.ts
 create mode 100644 src/views/sms/advert/index.vue

diff --git a/src/api/sms/advert.ts b/src/api/sms/advert.ts
new file mode 100644
index 00000000..c6dde44f
--- /dev/null
+++ b/src/api/sms/advert.ts
@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+/**
+ * 获取广告分页列表
+ *
+ * @param queryParams
+ */
+export function listAdvertsWithPage(queryParams: object) {
+    return request({
+        url: '/mall-sms/api/v1/adverts',
+        method: 'get',
+        params: queryParams
+    })
+}
+
+/**
+ * 获取广告详情
+ *
+ * @param id
+ */
+export function getAdvertDetail(id:number) {
+    return request({
+        url: '/mall-sms/api/v1/adverts/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 添加广告
+ *
+ * @param data
+ */
+export function addAdvert(data: object) {
+    return request({
+        url: '/mall-sms/api/v1/adverts',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 修改广告
+ *
+ * @param id
+ * @param data
+ */
+export function updateAdvert(id: number, data: object) {
+    return request({
+        url: '/mall-sms/api/v1/adverts/' + id,
+        method: 'put',
+        data: data
+    })
+}
+
+/**
+ * 删除广告
+ *
+ * @param ids
+ */
+export function deleteAdverts(ids:string) {
+    return request({
+        url: '/mall-sms/api/v1/adverts/' + ids,
+        method: 'delete'
+    })
+}
diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue
index 14039840..5d135a29 100644
--- a/src/components/TreeSelect/index.vue
+++ b/src/components/TreeSelect/index.vue
@@ -16,8 +16,8 @@
             ref="selectTree"
             :accordion="accordion"
             :data="options"
-            :props="state.props"
-            :node-key="state.props.value"
+            :props="props.props"
+            :node-key="props.props.value"
             :expand-on-click-node="false"
             :default-expanded-keys="defaultExpandedKey"
             :filter-node-method="filterNode"
@@ -29,10 +29,11 @@
 </template>
 
 <script setup>
-import {defineEmits, ref, getCurrentInstance ,nextTick,onMounted,computed,watch} from "vue";
-const { proxy } = getCurrentInstance();
+import {defineEmits, ref, getCurrentInstance, nextTick, onMounted, computed, watch} from "vue";
 
-const state = defineProps({
+const {proxy} = getCurrentInstance();
+
+const props = defineProps({
   /* 配置项 */
   props: {
     type: Object,
@@ -44,24 +45,22 @@ const state = defineProps({
       }
     }
   },
-  /* 自动收起 */
+  // 自动收起
   accordion: {
     type: Boolean,
     default: () => {
       return false
     }
   },
-  /**当前双向数据绑定的值 */
+  // 双向数据绑定的值
   value: {
     type: [String, Number],
     default: ''
   },
-  /**当前的数据 */
   options: {
     type: Array,
     default: () => []
   },
-  /**输入框内部的文字 */
   placeholder: {
     type: String,
     default: ''
@@ -71,7 +70,7 @@ const state = defineProps({
 const emit = defineEmits(['update:value']);
 
 const valueId = computed({
-  get: () => state.value,
+  get: () => props.value,
   set: (val) => {
     emit('update:value', val)
   }
@@ -82,38 +81,43 @@ const defaultExpandedKey = ref([]);
 function initHandle() {
   nextTick(() => {
     const selectedValue = valueId.value;
-    if(selectedValue !== null && typeof (selectedValue) !== "undefined"){
+    if (selectedValue !== null && typeof (selectedValue) !== "undefined") {
       const node = proxy.$refs.selectTree.getNode(selectedValue)
       if (node) {
-        valueTitle.value = node.data[state.props.label]
+        valueTitle.value = node.data[props.props.label]
         proxy.$refs.selectTree.setCurrentKey(selectedValue) // 设置默认选中
         defaultExpandedKey.value = [selectedValue] // 设置默认展开
-      }else{
+      } else {
         clearHandle()
       }
     }
   })
 }
+
 function handleNodeClick(node) {
-  valueTitle.value = node[state.props.label]
-  valueId.value = node[state.props.value];
+  valueTitle.value = node[props.props.label]
+  valueId.value = node[props.props.value];
   defaultExpandedKey.value = [];
   proxy.$refs.treeSelect.blur()
   selectFilterData('')
 }
+
 function selectFilterData(val) {
   proxy.$refs.selectTree.filter(val)
 }
+
 function filterNode(value, data) {
   if (!value) return true
-  return data[state.props['label']].indexOf(value) !== -1
+  return data[props.props['label']].indexOf(value) !== -1
 }
+
 function clearHandle() {
   valueTitle.value = ''
   valueId.value = ''
   defaultExpandedKey.value = [];
   clearSelected()
 }
+
 function clearSelected() {
   const allNode = document.querySelectorAll('#tree-option .el-tree-node')
   allNode.forEach((element) => element.classList.remove('is-current'))
@@ -139,7 +143,7 @@ watch(valueId, () => {
   font-weight: normal;
 }
 
-ul li  .el-tree .el-tree-node__content {
+ul li .el-tree .el-tree-node__content {
   height: auto;
   padding: 0 20px;
   box-sizing: border-box;
@@ -148,7 +152,7 @@ ul li  .el-tree .el-tree-node__content {
 :deep(.el-tree-node__content:hover),
 :deep(.el-tree-node__content:active),
 :deep(.is-current > div:first-child),
-:deep( .el-tree-node__content:focus ){
+:deep( .el-tree-node__content:focus ) {
   background-color: mix(#fff, #409EFF, 90%);
   color: #409EFF;
 }
diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue
new file mode 100644
index 00000000..d60ad525
--- /dev/null
+++ b/src/views/sms/advert/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索表单 -->
+    <el-form
+        ref="queryForm"
+        :model="queryParams"
+        :inline="true"
+        size="mini"
+    >
+      <el-form-item>
+        <el-button type="success" :icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="danger" :icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-form-item>
+
+      <el-form-item>
+        <el-input
+            v-model="queryParams.name"
+            placeholder="广告名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+        ref="dataTable"
+        v-loading="loading"
+        :data="pageList"
+        @selection-change="handleSelectionChange"
+        border
+    >
+      <el-table-column type="selection" min-width="5" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="title" label="广告标题" min-width="10"/>
+      <el-table-column label="广告图片" min-width="10">
+        <template #default="scope">
+          <el-popover
+              placement="right"
+              title=""
+              trigger="hover">
+            <img :src="scope.row.picUrl"/>
+            <img slot="reference"
+                 :src="scope.row.picUrl"
+                 :alt="scope.row.picUrl"
+                 style="max-height: 60px;max-width: 60px"
+            >
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="beginDate" label="开始时间" min-width="10"/>
+      <el-table-column prop="endTime" label="到期时间" min-width="10"/>
+      <el-table-column prop="status" label="状态" min-width="6">
+        <template #default="scope">
+          <el-tag v-if="scope.row.status===1" type="success" size="mini">开启</el-tag>
+          <el-tag v-else type="info" size="mini">关闭</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" min-width="6"/>
+      <el-table-column label="操作" align="center" min-width="10" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+              type="primary"
+              :icon="Edit"
+              size="mini"
+              circle
+              plain
+              @click.stop="handleUpdate(scope.row)"
+          />
+          <el-button
+              type="danger"
+              :icon="Delete"
+              size="mini"
+              circle
+              plain
+              @click.stop="handleDelete(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页工具条 -->
+    <pagination
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="handleQuery"
+    />
+
+    <!-- 表单弹窗 -->
+    <el-dialog
+        :title="dialog.title"
+        v-model="dialog.visible"
+        width="700px"
+    >
+      <el-form
+          ref="dataForm"
+          :model="formData"
+          :rules="rules"
+          label-width="100px"
+      >
+        <el-form-item label="广告标题" required prop="title">
+          <el-input v-model="formData.title"/>
+        </el-form-item>
+
+        <el-form-item label="有效期" required prop="beginTime">
+          <el-date-picker
+              v-model="formData.beginTime"
+              value-format="yyyy-MM-dd"
+              placeholder="开始日期"
+          />
+          ~
+          <el-date-picker
+              v-model="formData.endTime"
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"
+          />
+        </el-form-item>
+
+        <el-form-item label="广告图片" prop="picUrl">
+          <single-upload v-model="formData.picUrl"/>
+        </el-form-item>
+
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="formData.sort" style="width: 200px"/>
+        </el-form-item>
+
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">开启</el-radio>
+            <el-radio :label="0">关闭</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="跳转链接" prop="url">
+          <el-input v-model="formData.url"/>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark"/>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {listAdvertsWithPage, getAdvertDetail, updateAdvert, addAdvert, deleteAdverts} from '@/api/sms/advert'
+import SingleUpload from "@/components/Upload/SingleUpload.vue";
+import {onMounted, reactive, ref, toRefs, unref} from "vue";
+import {ElForm, ElMessage, ElMessageBox} from "element-plus";
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+
+const dataForm = ref(ElForm)  // 属性名必须和元素的ref属性值一致
+
+const state = reactive({
+  loading: true,
+  // 选中ID数组
+  ids: [],
+  // 非单个禁用
+  single: true,
+  // 非多个禁用
+  multiple: true,
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    title: undefined
+  },
+  pageList: [],
+  total: 0,
+  dialog: {
+    title: '',
+    visible: false
+  },
+  formData: {
+    id: undefined,
+    title: '',
+    picUrl: '',
+    beginTime: undefined,
+    endTime: undefined,
+    status: 1,
+    sort: 100,
+    url: undefined,
+    remark: undefined
+  },
+  rules: {
+    name: [
+      {required: true, message: '请输入广告名称', trigger: 'blur'}
+    ],
+    pic: [
+      {required: true, message: '请上传广告图片', trigger: 'blur'}
+    ]
+  }
+})
+
+const {loading, single, multiple, queryParams, pageList, total, dialog, formData, rules} = toRefs(state)
+
+function handleQuery() {
+  state.loading = true
+  listAdvertsWithPage(state.queryParams).then(response => {
+    const {data, total} = response as any
+    state.pageList = data
+    state.total = total
+    state.loading = false
+  })
+}
+
+function resetQuery() {
+  state.queryParams = {
+    pageNum: 1,
+    pageSize: 10,
+    title: undefined
+  }
+  handleQuery()
+}
+
+function handleSelectionChange(selection: any) {
+  state.ids = selection.map((item: any) => item.id)
+  state.single = selection.length !== 1
+  state.multiple = !selection.length
+}
+
+function handleAdd() {
+  resetForm()
+  state.dialog = {
+    title: '添加广告',
+    visible: true
+  }
+}
+
+function handleUpdate(row: any) {
+  resetForm()
+  state.dialog = {
+    title: '修改广告',
+    visible: true,
+  }
+  const advertId = row.id || state.ids
+  getAdvertDetail(advertId).then((response) => {
+    state.formData = response.data
+  })
+}
+
+function submitForm() {
+  const form = unref(dataForm)
+  form.validate((valid: any) => {
+    if (valid) {
+      if (state.formData.id) {
+        updateAdvert(state.formData.id as any, state.formData).then(response => {
+          ElMessage.success('修改成功')
+          state.dialog.visible = false
+          handleQuery()
+        })
+      } else {
+        addAdvert(state.formData).then(response => {
+          ElMessage.success('新增成功')
+          state.dialog.visible = false
+          handleQuery()
+        })
+      }
+    }
+  })
+}
+
+function resetForm() {
+  state.formData = {
+    id: undefined,
+    title: '',
+    picUrl: '',
+    beginTime: undefined,
+    endTime: undefined,
+    status: 1,
+    sort: 100,
+    url: undefined,
+    remark: undefined
+  }
+}
+
+function cancel() {
+  resetForm()
+  state.dialog.visible = false
+}
+
+function handleDelete(row: any) {
+  const ids = [row.id || state.ids].join(',')
+  ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteAdverts(ids).then(() => {
+      ElMessage.success('删除成功')
+      handleQuery()
+    })
+  }).catch(() =>
+      ElMessage.info('已取消删除')
+  )
+}
+
+onMounted(() => {
+  handleQuery()
+})
+
+</script>
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index 73c6babb..0d8293cd 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -145,7 +145,7 @@ const {proxy}: any = getCurrentInstance();
 const props = defineProps({
   menuId: {
     type: String,
-    default: undefined
+    default: ''
   },
   menuName: {
     type: String,
@@ -158,7 +158,6 @@ watch(() => props.menuId as any, (newVal, oldVal) => {
   handleQuery()
 })
 
-
 const state = reactive({
   loading: true,
   // 选中ID数组
@@ -182,9 +181,9 @@ const state = reactive({
   formData: {
     id: undefined,
     name: undefined,
-    urlPerm: undefined,
-    btnPerm: undefined,
-    menuId: undefined
+    urlPerm: '',
+    btnPerm: '',
+    menuId: ''
   },
   rules: {
     name: [
@@ -332,8 +331,9 @@ function resetForm() {
   state.formData = {
     id: undefined,
     name: undefined,
-    urlPerm: undefined,
-    btnPerm: undefined
+    urlPerm: '',
+    btnPerm: '',
+    menuId: ''
   }
 }
 
diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue
index 538e9a0c..03202eb3 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/system/role/components/Role.vue
@@ -1,11 +1,11 @@
 <template>
-  <div>
+  <div class="role-container">
     <!-- 搜索表单 -->
     <el-form
         ref="queryForm"
         :model="queryParams"
-        size="mini"
         :inline="true"
+        size="mini"
     >
       <el-form-item>
         <el-button type="success" :icon="Plus" @click="handleAdd">新增</el-button>
@@ -29,14 +29,14 @@
 
     <!-- 数据表格 -->
     <el-table
-        ref="roleTable"
+        ref="dataTable"
         v-loading="loading"
         :data="pageList"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
-        border
         highlight-current-row
         size="mini"
+        border
     >
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="角色名称" prop="name"/>
@@ -118,14 +118,11 @@
 <script setup lang="ts">
 import {listRolesWithPage, updateRole, getRoleDetail, addRole, deleteRoles} from '@/api/system/role'
 import {defineEmits, defineProps, onMounted, reactive, ref, toRefs, unref} from "vue"
-import {add, del, detail, update} from "@api/system/client";
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
 import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
 
 const emit = defineEmits(['roleClick'])
-
 const dataForm = ref(ElForm)  // 属性名必须和元素的ref属性值一致
-
 const state = reactive({
   loading: true,
   // 选中ID数组
@@ -162,7 +159,7 @@ const state = reactive({
   }
 })
 
-const {loading,single, multiple, queryParams, pageList, total, dialog, formData, rules} = toRefs(state)
+const {loading, single, multiple, queryParams, pageList, total, dialog, formData, rules} = toRefs(state)
 
 function handleQuery() {
   emit('roleClick', {})
@@ -271,3 +268,9 @@ onMounted(() => {
 })
 
 </script>
+
+<style lang="scss" scoped>
+.role-container {
+  width: 100%;
+}
+</style>
\ No newline at end of file