文章，租户，商品调整

src/api/contentCenter/types.ts

@@ -69,6 +69,7 @@ export interface CategoryVO {
   /**
    * 流程分类ID
    */
+  url: string;
   categoryId: string | number;
   mediaUrl: string;
   description: string;

src/api/set/messageindex.ts

@@ -6,21 +6,21 @@ import request from '@/utils/request';
 export const listlist = (query?: LeaveQuery): AxiosPromise => {
   return request({
     url: '/system/message/list',
-    method: 'post',
+    method: 'get',
-    data: query
+    params: query
   });
 };
 //删除模板
 export const deltemplate = (query?: string): AxiosPromise => {
   return request({
-    url: `/system/message/template/${query}`,
+    url: `/im/message/template/${query}`,
     method: 'delete'
   });
 };
 //查看详情模板
 export const getnotice = (query?: string): AxiosPromise => {
   return request({
-    url: `/system/message/template/${query}`,
+    url: `/im/message/template/${query}`,
     method: 'get'
   });
 };
@@ -30,8 +30,8 @@ export const getnotice = (query?: string): AxiosPromise => {
  */
 export const updateCategory = (data: seachookOV) => {
   return request({
-    url: '/system/message/template',
+    url: '/im/message/template/list',
-    method: 'put',
+    method: 'post',
     data: data
   });
 };
@@ -52,18 +52,18 @@ export const listAdd = (query?: LeaveListVO): AxiosPromise => {
     data: query
   });
 };
-//获取账号管理列表
+//获取模板列表
 export const listtemplate = (query?: AccountQuery): AxiosPromise => {
   return request({
-    url: '/system/message/template/list',
+    url: '/im/message/template/page',
-    method: 'POST',
+    method: 'post',
     data: query
   });
 };
 //添加模板
 export const templateAdd = (query?: paramsaccountOV): AxiosPromise => {
   return request({
-    url: '/system/message/template',
+    url: '/im/message/template/add',
     method: 'post',
     data: query
   });

src/api/set/messagetype.ts

@@ -32,9 +32,9 @@ export interface optionListItem {
 export interface AccountQuery {
   current: number;
   size: number;
-  templateName: string;
+  name: string;
   templatecode: string;
-  templateType: string;
+  type: string;
   status: string;
 }
 export interface LeaveQuery {
@@ -75,26 +75,32 @@ export interface LeaveListVO {
 export interface AccountOV {
   id: string | number;
   status: string;
-  templateCode: string;
+  content: string;
-  templateContent: string;
   templateName: string;
   templateType: string;
 }
 export interface paramsaccountOV {
-  templateType: string;
+  type: string;
-  templateCode: string;
+  name: string;
-  templateName: string;
+  content: string;
-  templateContent: string;
   title: string;
+  ext: string;
+  description: string;
+  action: string;
+  params: string;
 }
 export interface seachookOV {
   createBy: string;
   createTime: string;
   id: string;
+  ext: string;
+  description: string;
+  action: string;
+  params: string;
   status: string;
-  templateContent: string;
+  content: string;
-  templateName: string;
+  name: string;
-  templateType: string;
+  type: string;
   title: string;
   updateBy: string;
   updateTime: string;

src/api/system/article/index.ts

@@ -6,7 +6,7 @@ import request from '@/utils/request';
 // 查询文章列表
 export function listPost(query: PostQuery): AxiosPromise<PostVO[]> {
   return request({
-    url: '/content/article/page',
+    url: '/cms/article/page',
     method: 'post',
     data: query
   });
@@ -14,7 +14,7 @@ export function listPost(query: PostQuery): AxiosPromise<PostVO[]> {
 // 查询文章列表tree
 export function listCategory(query: any): AxiosPromise<PostVO[]> {
   return request({
-    url: '/content/article/category/tree',
+    url: '/cms/article/category/tree',
     method: 'post',
     data: query
   });
@@ -22,7 +22,7 @@ export function listCategory(query: any): AxiosPromise<PostVO[]> {
 // 查询文章详细
 export function getPost(postId: string | number): AxiosPromise<PostVO> {
   return request({
-    url: '/content/article/' + postId,
+    url: '/cms/article/' + postId,
     method: 'get'
   });
 }
@@ -42,7 +42,7 @@ export function optionselect(deptId?: number | string, postIds?: (number | strin
 // 新增文章
 export function addPost(data: PostForm) {
   return request({
-    url: '/content/article/add',
+    url: '/cms/article/add',
     method: 'post',
     data: data
   });
@@ -51,7 +51,7 @@ export function addPost(data: PostForm) {
 // 修改文章
 export function updatePost(data: PostForm) {
   return request({
-    url: '/content/article/update',
+    url: '/cms/article/update',
     method: 'post',
     data: data
   });
@@ -60,7 +60,7 @@ export function updatePost(data: PostForm) {
 // 删除文章
 export function delPost(postId: string | number | (string | number)[]) {
   return request({
-    url: '/content/article/' + postId,
+    url: '/cms/article/' + postId,
     method: 'delete'
   });
 }

src/api/system/category/index.ts

@@ -6,7 +6,7 @@ import request from '@/utils/request';
 // 查询文章分类列表
 export function listPost(query: PostQuery | any): AxiosPromise {
   return request({
-    url: '/content/article/category/tree',
+    url: '/cms/article/category/tree',
     method: 'post',
     data: query
   });
@@ -15,7 +15,7 @@ export function listPost(query: PostQuery | any): AxiosPromise {
 // 查询文章详细
 export function getPost(postId: string | number): AxiosPromise<PostVO> {
   return request({
-    url: '/content/article/category/' + postId,
+    url: '/cms/article/category/' + postId,
     method: 'get'
   });
 }
@@ -35,7 +35,7 @@ export function optionselect(deptId?: number | string, postIds?: (number | strin
 // 新增分类
 export function addPost(data: PostForm) {
   return request({
-    url: '/content/article/category/add',
+    url: '/cms/article/category/add',
     method: 'post',
     data: data
   });
@@ -44,7 +44,7 @@ export function addPost(data: PostForm) {
 // 修改岗位
 export function updatePost(data: PostForm) {
   return request({
-    url: '/content/article/update',
+    url: '/cms/article/update',
     method: 'post',
     data: data
   });
@@ -53,7 +53,7 @@ export function updatePost(data: PostForm) {
 // 删除
 export function delPost(postId: string | number | (string | number)[]) {
   return request({
-    url: '/content/article/category/' + postId,
+    url: '/cms/article/category/' + postId,
     method: 'delete'
   });
 }

src/api/system/tenant/index.ts

@@ -11,6 +11,39 @@ export function listTenant(query: any): AxiosPromise<TenantVO[]> {
     data: query
   });
 }
+
+// 修改默认租户
+export function updateSte(id: any): AxiosPromise<TenantVO[]> {
+  return request({
+    url: `/system/tenant/list` + id,
+    method: 'post'
+  });
+}
+
+// 提交
+export function getTenantSub(id: any): AxiosPromise<TenantVO[]> {
+  return request({
+    url: '/system/tenant/submitSign/' + id,
+    method: 'post'
+  });
+}
+// 确认审核提交的状态
+export function auditSubmit(id: any): AxiosPromise<TenantVO[]> {
+  return request({
+    url: '/system/tenant/confirmedSign/' + id,
+    method: 'post'
+  });
+}
+
+//审核提交的签约
+export function auditTenant(data: any) {
+  return request({
+    url: '/system/tenant/reviewSubmitted',
+    method: 'post',
+    data: data
+  });
+}
+
 // 获取比例套餐分成下拉表
 export function getlistDivide(): AxiosPromise<TenantVO[]> {
   return request({

src/api/system/user/types.ts

@@ -1,5 +1,5 @@
-import { RoleVO } from '@/api/system/role/types';
 import { PostVO } from '@/api/system/post/types';
+import { RoleVO } from '@/api/system/role/types';
 
 /**
  * 用户信息
@@ -55,6 +55,7 @@ export interface UserVO extends BaseEntity {
  */
 export interface UserForm {
   id?: string;
+  syncMemberFlag: boolean;
   userId?: string;
   deptId?: number;
   userName: string;

src/api/workflow/category/index.ts

@@ -18,7 +18,7 @@ export interface QueryChildOV {
 export const listCategory = (query?: CategoryQuery): AxiosPromise<CategoryVO[]> => {
   return request({
     // url: '/workflow/category/list',old
-    url: '/video/list',
+    url: '/cms/vlog/page',
     method: 'post',
     data: query
   });
@@ -31,7 +31,7 @@ export const listCategory = (query?: CategoryQuery): AxiosPromise<CategoryVO[]>
  */
 export const updateaudit = (data?: Formaget) => {
   return request({
-    url: `/video/audit?vlogId=${data.vlogId}&reason=${data.reason}&status=${data.status}`,
+    url: `/cms/video/audit?vlogId=${data.vlogId}&reason=${data.reason}&status=${data.status}`,
     method: 'post'
   });
 };
@@ -42,7 +42,7 @@ export const updateaudit = (data?: Formaget) => {
  */
 export const getcommentlist = (data?: QueryParamOV) => {
   return request({
-    url: `/comment/list`,
+    url: `/cms/comment/list`,
     method: 'post',
     data
   });
@@ -55,7 +55,7 @@ export const getcommentlist = (data?: QueryParamOV) => {
  */
 export const getchildList = (data?: QueryChildOV) => {
   return request({
-    url: `/comment/childList?fatherCommentId=${data.fatherCommentId}&current=${data.current}&size=${data.size}`,
+    url: `/cms/comment/childList?fatherCommentId=${data.fatherCommentId}&current=${data.current}&size=${data.size}`,
     method: 'get'
   });
 };
@@ -75,7 +75,7 @@ export const gerdetail = (data?: string) => {
  */
 export const deldetail = (data?: string) => {
   return request({
-    url: `/comment/delete?commentId=${data}`,
+    url: `/cms/comment/delete?commentId=${data}`,
     method: 'post'
   });
 };
@@ -85,18 +85,18 @@ export const deldetail = (data?: string) => {
  */
 export const deloffline = (data?: string) => {
   return request({
-    url: `comment/offline?commentId=${data}`,
+    url: `/cms/comment/offline?commentId=${data}`,
     method: 'post'
   });
 };
 
 /**
- * 视频通过和反驳
+ * 视频删除
  * @param vlogId 视频id
  */
 export const updateaforbid = (vlogId?: string) => {
   return request({
-    url: `/video/forbid`,
+    url: `/cms/video/forbid`,
     method: 'post',
     data: { fileIds: vlogId, operation: 'forbid' }
   });

src/layout/components/Navbar.vue

@@ -20,7 +20,13 @@
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
-
+        <el-button :style="{ margin: '10px' }" @click="isStae = true">设置默认租户</el-button>
+        <el-dialog title="设置默认租户" v-model="isStae" width="500px" append-to-body>
+          <div v-for="item in tenantList" :key="item.tenantId" :style="{ display: 'flex', justifyItems: 'space-between', width: '100%' }">
+            <div class="flex align-center width" v-if="item.companyName">{{ item.companyName }}</div>
+            <el-button :style="{ margin: '10px' }" @click="issteFun(item.tenantId)" v-if="item.companyName">{{ '设置为默认租户' }}</el-button>
+          </div>
+        </el-dialog>
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">
           <div class="right-menu-item hover-effect" @click="openSearchMenu">
@@ -42,7 +48,7 @@
             </el-popover>
           </div>
         </el-tooltip>
-<!--        <el-tooltip content="Github" effect="dark" placement="bottom">
+        <!--        <el-tooltip content="Github" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
@@ -94,7 +100,7 @@ import { useUserStore } from '@/store/modules/user';
 import { useSettingsStore } from '@/store/modules/settings';
 import { useNoticeStore } from '@/store/modules/notice';
 import { getTenantList } from '@/api/login';
-import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
+import { dynamicClear, dynamicTenant, updateSte } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
 import router from '@/router';
@@ -117,7 +123,7 @@ const dynamic = ref(false);
 const tenantEnabled = ref(true);
 // 搜索菜单
 const searchMenuRef = ref<InstanceType<typeof SearchMenu>>();
-
+const isStae = ref(false);
 const openSearchMenu = () => {
   searchMenuRef.value?.openSearch();
 };
@@ -134,7 +140,10 @@ const dynamicTenantEvent = async (tenantId: string) => {
     await proxy?.$tab.refreshPage();
   }
 };
-
+//改变租户默认
+const issteFun = async (id: string) => {
+  const res = await updateSte(id);
+};
 const dynamicClearEvent = async () => {
   await dynamicClear();
   dynamic.value = false;
@@ -218,7 +227,9 @@ watch(
 .align-center {
   align-items: center;
 }
-
+.width {
+  width: 50%;
+}
 .navbar {
   height: 50px;
   overflow: hidden;

src/router/index.ts

@@ -230,38 +230,6 @@ export const dynamicRoutes: RouteRecordRaw[] = [
       }
     ]
   },
-  // {
-  //   path: '/videoManage',
-  //   component: Layout,
-  //   hidden: true,
-  //   permissions: ['system:user:edit'],
-  //   children: [
-  //     {
-  //       path: 'video',
-  //       component: () => import('@/views/contentManage/video/index.vue'),
-  //       name: 'video',
-  //       meta: { title: '视频列表', icon: 'dashboard', affix: true }
-  //     },
-  //     {
-  //       path: 'videocomment',
-  //       component: () => import('@/views/contentManage/videocomment/index.vue'),
-  //       name: 'videocomment',
-  //       meta: { title: '视频评论', icon: 'dashboard', affix: true }
-  //     },
-  //     {
-  //       path: 'report',
-  //       component: () => import('@/views/contentManage/report/index.vue'),
-  //       name: 'report',
-  //       meta: { title: '举报', icon: 'dashboard', affix: true }
-  //     }
-  //     // {
-  //     //   path: 'detail',
-  //     //   component: () => import('@/views/contentManage/videodetails/index.vue'),
-  //     //   name: 'Videodetails',
-  //     //   meta: { title: '视频详情', icon: 'dashboard', affix: true }
-  //     // }
-  //   ]
-  // },
   {
     path: '/notice',
     component: Layout,

src/views/contentManage/video/index.vue

@@ -5,8 +5,8 @@
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
           <el-form-item label="排序" prop="status">
             <el-select v-model="queryParams.column" placeholder="排序" clearable>
-              <el-option label="审核状态" value="reason">审核状态</el-option>
+              <el-option label="审核状态" value="status">审核状态</el-option>
-              <el-option label="评论" value="commentCounts">评论</el-option>
+              <el-option label="评论" value="commentsCounts">评论</el-option>
               <el-option label="点赞" value="likeCounts">点赞</el-option>
             </el-select>
           </el-form-item>
@@ -31,11 +31,7 @@
           </el-form-item>
           <el-form-item label="审核状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable>
-              <el-option label="待审核" value="0"></el-option>
+              <el-option v-for="item in feedbackstatus" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-              <el-option label="通过" value="1"></el-option>
-              <el-option label="不通过" value="2"></el-option>
-              <el-option label="等待复审" value="3"></el-option>
-              <el-option label="删除" value="4"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -57,25 +53,26 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <!-- <el-table-column label="视频id" prop="fileId" align="center" width="100" /> -->
-        <el-table-column label="名称" prop="nickname" align="center" width="100" />
+        <el-table-column label="名称" prop="nickname" align="center" width="130" />
         <el-table-column label="手机号" prop="mobile" align="center" width="100" />
-        <el-table-column label="审核状态" prop="reason" align="center" width="100">
+        <el-table-column label="审核状态" prop="status" align="center" width="100">
           <template #default="{ row }">
-            {{ isfun(row.reason) }}
+            {{ isfun(row.status) }}
           </template>
         </el-table-column>
+        <el-table-column label="原因" prop="reason" align="center" width="100" />
         <el-table-column label="内容" prop="title" align="center" width="100" />
         <el-table-column label="宽" prop="width" align="center" width="100" />
         <el-table-column label="高" prop="height" align="center" width="100" />
-        <el-table-column label="评论数量" prop="commentCounts" align="center" width="100" />
+        <el-table-column label="评论数量" prop="commentsCounts" align="center" width="100" />
         <el-table-column label="点赞数量" prop="likeCounts" align="center" width="100" />
         <el-table-column label="封面图片" align="center" width="200">
           <template #default="{ row }">
-            <img alt="封面图片" style="max-width: 20%; max-height: 20%" :src="row.coverUrl" />
+            <img alt="封面图片" style="max-width: 20%; max-height: 20%" :src="row.firstFrameImg" />
           </template>
         </el-table-column>
         <el-table-column label="时间" align="center" prop="createTime" width="180" />
-        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" fixed="right" width="180" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
               <el-button link type="primary" @click="handleAdd(scope.row)" v-hasPermi="['workflow:video:add']">查看</el-button>
@@ -93,15 +90,15 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <div v-if="shouldShowVideo" class="video-container">
         <video controls width="80%">
-          <source :src="object.mediaUrl" type="video/mp4" />
+          <source :src="object.url" type="video/mp4" />
           您的浏览器不支持播放该视频。
         </video>
       </div>
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button v-if="isfun1(object.reason)" :loading="buttonLoading" type="primary" @click="submitForm">通 过</el-button>
+          <el-button v-if="isfun1(object.status)" :loading="buttonLoading" type="primary" @click="submitForm">通 过</el-button>
-          <el-button v-if="isfun1(object.reason)" type="danger" @click="showRefuteDialog = true">反 驳</el-button>
+          <el-button v-if="isfun1(object.status)" type="danger" @click="showRefuteDialog = true">反 驳</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -125,7 +122,8 @@
 <script setup name="Category" lang="ts">
 import { listCategory, updateaudit, updateaforbid, gerdetail, deldetail } from '@/api/workflow/category';
 import { CategoryVO, CategoryQuery, CategoryForm, Formaget, CommentsVO, likeVO, fansListVO } from '@/api/contentCenter/types';
-// import { reactive, ref } from 'vue';
+import { getDictionaryByKey } from '@/utils/dict';
+import { log } from 'node:console';
 type CategoryOption = {
   categoryId: number;
   children?: CategoryOption[];
@@ -156,7 +154,7 @@ const dateRange = ref([]);
 const submitRefute = async () => {
   // 这里可以添加提交反驳原因的逻辑，例如调用 API
   console.log('提交的反驳原因:', refuteReason.value);
-  const data: Formaget = { vlogId: object.value.file_id, status: 2, reason: refuteReason.value };
+  const data: Formaget = { vlogId: object.value.fileId, status: 2, reason: refuteReason.value };
   const res = await updateaudit(data);
   if (res.code === 200) {
     ElMessage({
@@ -168,55 +166,28 @@ const submitRefute = async () => {
     refuteReason.value = '';
   }
 };
+const feedbackstatus = ref([]);
+
+const getByKey = async () => {
+  const orderStatustype = await getDictionaryByKey('cms_video_status');
+  feedbackstatus.value = orderStatustype;
+};
 const isfun = (status: string) => {
-  if (status == 'Terror') {
+  const sta = feedbackstatus.value.filter((item) => item.value == status)[0]?.label;
-    return '不通过';
+  return sta;
-  }
-  if (status == 'Polity') {
-    return '不通过';
-  }
-  if (status == 'Illegal') {
-    return '不通过';
-  }
-  if (status == 'Abuse') {
-    return '不通过';
-  }
-  if (status == 'Moan') {
-    return '不通过';
-  }
-  if (status == 'Porn') {
-    return '不通过';
-  }
-  if (status == 'Ad') {
-    return '不通过';
-  } else {
-    return status;
-  }
 };
 const isfun1 = (status: string) => {
-  if (status == 'Terror') {
+  if (status == '0') {
-    return false;
-  }
-  if (status == 'Polity') {
-    return false;
-  }
-  if (status == 'Illegal') {
-    return false;
-  }
-  if (status == 'Abuse') {
-    return false;
-  }
-  if (status == 'Moan') {
-    return false;
-  }
-  if (status == 'Porn') {
-    return false;
-  }
-  if (status == 'Ad') {
-    return false;
-  } else {
     return true;
   }
+  if (status == '2') {
+    return true;
+  }
+  if (status == '3') {
+    return true;
+  } else {
+    return false;
+  }
 };
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -303,15 +274,6 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  // debugger
-  // queryParams.value = {
-  //   mobile: undefined,
-  //   startTime: undefined,
-  //   endTime: undefined,
-  //   status: undefined,
-  //   asc: undefined,
-  //   column: undefined
-  // };
   queryParams.value.mobile = undefined;
   queryParams.value.startTime = undefined;
   queryParams.value.endTime = undefined;
@@ -319,15 +281,8 @@ const resetQuery = () => {
   queryParams.value.asc = undefined;
   queryParams.value.column = undefined;
   dateRange.value = [];
-  // queryFormRef.value?.resetFields();
   handleQuery();
 };
-//点赞列表
-const likedUsers = ref<likeVO[]>([]);
-//粉丝列表
-const fansList = ref<fansListVO[]>([]);
-//评论列表
-const comments = ref<CommentsVO[]>([]);
 /** 查看详情按钮操作 */
 const handleAdd = async (row?: CategoryVO) => {
   nextTick(() => {
@@ -340,56 +295,7 @@ const handleAdd = async (row?: CategoryVO) => {
       dialog.title = '视频查看';
     });
   });
-  // const res = await gerdetail(row.fileId);
-  // if (res.code == 200) {
-  //   comments.value = res.data.comments;
-  //   likedUsers.value = res.data.likedUsers;
-  //   fansList.value = res.data.fansList;
-  // }
 };
-//删除详情评论
-const delshow = (id: string) => {
-  ElMessageBox.confirm('是否确认删除', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(async () => {
-    const res = await deldetail(id);
-    if (res.code == 200) {
-      cancel();
-      getList();
-    }
-  });
-};
-/** 修改按钮操作 */
-const handleUpdate = async (row: CategoryVO) => {};
-
-/** 展开/折叠操作 */
-// const handleToggleExpandAll = () => {
-//   isExpandAll.value = !isExpandAll.value;
-//   toggleExpandAll(categoryList.value, isExpandAll.value);
-// };
-
-/** 展开/折叠操作 */
-// const toggleExpandAll = (data: CategoryVO[], status: boolean) => {
-//   data.forEach((item) => {
-//     categoryTableRef.value?.toggleRowExpansion(item, status);
-//     if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
-//   });
-// };
-
-// /** 修改按钮操作 */
-// const handleUpdate = async (row: CategoryVO) => {
-//   await getTreeselect();
-//   if (row != null) {
-//     form.value.parentId = row.parentId;
-//   }
-//   const res = await getCategory(row.categoryId);
-//   reset();
-//   Object.assign(form.value, res.data);
-//   dialog.visible = true;
-//   dialog.title = '修改流程分类';
-// };
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -456,6 +362,7 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getByKey();
   getList();
 });
 </script>

src/views/contentManage/videodetails/index.vue

@@ -1,418 +0,0 @@
-<template>
-  <div class="p-2">
-    <!-- <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="search">
-        <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-          <el-form-item label="类型" prop="status">
-            <el-select v-model="queryParams.type" placeholder="类型" clearable>
-              <el-option value="1">评论</el-option>
-              <el-option value="2">点赞</el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="评论内容" prop="categoryName">
-            <el-input v-model="queryParams.categoryName" placeholder="请输入视频名称" clearable @keyup.enter="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>
-      </div>
-    </transition> -->
-
-    <el-card shadow="never">
-      <!-- <template #header>
-        <el-row :gutter="10" class="mt30">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['workflow:video:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template> -->
-      <el-table
-        ref="categoryTableRef"
-        v-loading="loading"
-        :data="categoryList"
-        row-key="categoryId"
-        border
-        :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-        <el-table-column label="名称" prop="nickname" align="center" width="100" />
-        <el-table-column label="手机号" prop="mobile" align="center" width="100" />
-        <!-- <el-table-column label="状态"  prop="status"  align="center" width="100"> -->
-        <!-- <template #default="{ row }">
-
-          </template>
-        </el-table-column> -->
-        <el-table-column label="内容" prop="title" align="center" width="100" />
-        <el-table-column label="宽" prop="width" align="center" width="100" />
-        <el-table-column label="高" prop="height" align="center" width="100" />
-        <!-- <el-table-column label="文件类型" prop="type" align="center" width="160" />
-        <el-table-column label="媒体类型" prop="category" align="center" width="160" /> -->
-        <el-table-column label="评论数量" sortable prop="commentCounts" align="center" width="100" />
-        <el-table-column label="点赞数量" sortable prop="likeCounts" align="center" width="100" />
-        <!-- <el-table-column label="粉丝数量" prop="fansCounts" align="center" width="100" /> -->
-        <el-table-column label="封面图片" align="center" width="200">
-          <template #default="{ row }">
-            <img alt="封面图片" style="max-width: 50%; max-height: 50%" :src="row.coverUrl" />
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="文件创建时间" align="center" prop="createTime" width="180" />
-        <el-table-column label="文件更新时间" align="center" prop="updateTime" width="180" /> -->
-        <!-- <el-table-column label="文件过期时间" align="center" prop="expireTime" width="180" /> -->
-        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" @click="handleAdd(scope.row)" v-hasPermi="['workflow:video:add']">查看</el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['workflow:video:remove']">删除</el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block">
-        <el-pagination @current-change="handleCurrentChange" layout="total, prev, pager, next" :total="total"> </el-pagination>
-      </div>
-    </el-card>
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <div v-if="shouldShowVideo" class="video-container">
-        <video controls width="80%">
-          <source :src="object.mediaUrl" type="video/mp4" />
-          您的浏览器不支持播放该视频。
-        </video>
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">通 过</el-button> -->
-          <!-- <el-button type="danger" @click="showRefuteDialog = true">反 驳</el-button> -->
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <!-- <el-dialog v-model="showRefuteDialog" title="输入反驳原因">
-      <el-form>
-        <el-form-item label="反驳原因">
-          <el-input v-model="refuteReason" type="textarea" :rows="4"></el-input>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="showRefuteDialog = false">取消</el-button>
-          <el-button type="primary" @click="submitRefute">确定</el-button>
-        </span>
-      </template>
-    </el-dialog> -->
-  </div>
-</template>
-
-<script setup name="Category" lang="ts">
-import { listCategory, updateaudit, updateaforbid, gerdetail, deldetail } from '@/api/workflow/category';
-import { CategoryVO, CategoryQuery, CategoryForm, Formaget, CommentsVO, likeVO, fansListVO } from '@/api/contentCenter/types';
-// import { reactive, ref } from 'vue';
-import { useRoute } from 'vue-router';
-type CategoryOption = {
-  categoryId: number;
-  categoryName: string;
-  children?: CategoryOption[];
-};
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const categoryList = ref<CategoryVO[]>([]);
-const object = ref<CategoryVO>();
-const categoryOptions = ref<CategoryOption[]>([]);
-const buttonLoading = ref(false);
-const showSearch = ref(true);
-const isExpandAll = ref(true);
-const loading = ref(false);
-const shouldShowVideo = ref(false);
-const queryFormRef = ref<ElFormInstance>();
-const categoryFormRef = ref<ElFormInstance>();
-const categoryTableRef = ref<ElTableInstance>();
-const total = ref<number>(0);
-const isstates = ref<number>(1);
-// 控制弹出框显示隐藏
-const showRefuteDialog = ref(false);
-// 存储反驳原因
-const refuteReason = ref('');
-const route = useRoute(); // 获取当前路由信息
-const memberId = ref(route.query.memberId as string); // 获取 memberId 参数
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: CategoryForm = {
-  categoryId: undefined,
-  categoryName: '',
-  parentId: undefined,
-  orderNum: 0,
-  type: 1
-};
-
-const data = reactive<PageData<CategoryForm, CategoryQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    categoryName: undefined,
-    current: 1,
-    size: 20,
-    memberId: memberId.value
-  },
-  rules: {
-    categoryId: [{ required: true, message: '流程分类ID不能为空', trigger: 'blur' }],
-    parentId: [{ required: true, message: '请选择上级分类', trigger: 'change' }],
-    categoryName: [{ required: true, message: '请输入分类名称', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询流程分类列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listCategory(queryParams.value);
-  // const data = proxy?.handleTree<CategoryVO>(res.data, 'categoryId', 'parentId');
-  if (res.status == 200) {
-    categoryList.value = res.data.records;
-    total.value = res.data.total;
-    loading.value = false;
-  }
-};
-
-const handleCurrentChange = (val: number) => {
-  console.log(`当前页: ${val}`);
-  queryParams.value.current = val;
-  getList();
-};
-/** 查询流程分类下拉树结构 */
-// const getTreeselect = async () => {
-//   const res = await listCategory();
-//   categoryOptions.value = [];
-//   // 处理树形数据
-//   const data = proxy?.handleTree<CategoryOption>(res.data, 'categoryId', 'parentId');
-//   if (data) {
-//     categoryOptions.value = data; // 将处理后的树形数据赋值
-//   }
-// };
-
-// 取消按钮
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-// 表单重置
-const reset = () => {
-  form.value = { ...initFormData };
-  categoryFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-//点赞列表
-const likedUsers = ref<likeVO[]>([]);
-//粉丝列表
-const fansList = ref<fansListVO[]>([]);
-//评论列表
-const comments = ref<CommentsVO[]>([]);
-/** 查看详情按钮操作 */
-const handleAdd = async (row?: CategoryVO) => {
-  nextTick(() => {
-    object.value = JSON.parse(JSON.stringify(row));
-    shouldShowVideo.value = false;
-    // 强制视频元素重新渲染
-    nextTick(() => {
-      shouldShowVideo.value = true;
-      dialog.visible = true;
-      dialog.title = '视频查看';
-    });
-  });
-  const res = await gerdetail(row.fileId);
-  if (res.status == 200) {
-    comments.value = res.data.comments;
-    likedUsers.value = res.data.likedUsers;
-    fansList.value = res.data.fansList;
-  }
-};
-//删除详情评论
-const delshow = (id: string) => {
-  ElMessageBox.confirm('是否确认删除', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(async () => {
-    const res = await deldetail(id);
-    if (res.status == 200) {
-      cancel();
-      getList();
-    }
-  });
-};
-/** 修改按钮操作 */
-const handleUpdate = async (row: CategoryVO) => {};
-
-/** 展开/折叠操作 */
-// const handleToggleExpandAll = () => {
-//   isExpandAll.value = !isExpandAll.value;
-//   toggleExpandAll(categoryList.value, isExpandAll.value);
-// };
-
-/** 展开/折叠操作 */
-// const toggleExpandAll = (data: CategoryVO[], status: boolean) => {
-//   data.forEach((item) => {
-//     categoryTableRef.value?.toggleRowExpansion(item, status);
-//     if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
-//   });
-// };
-
-// /** 修改按钮操作 */
-// const handleUpdate = async (row: CategoryVO) => {
-//   await getTreeselect();
-//   if (row != null) {
-//     form.value.parentId = row.parentId;
-//   }
-//   const res = await getCategory(row.categoryId);
-//   reset();
-//   Object.assign(form.value, res.data);
-//   dialog.visible = true;
-//   dialog.title = '修改流程分类';
-// };
-
-/** 提交按钮 */
-const submitForm = () => {
-  ElMessageBox.confirm('是否通过？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
-    .then(async () => {
-      const data: Formaget = { vlogId: object.value.fileId, status: 1, reason: refuteReason.value };
-      const res = await updateaudit(data);
-      if (res.status == 200) {
-        ElMessage({
-          message: '操作成功',
-          type: 'success'
-        });
-        dialog.visible = false;
-        getList();
-      } else {
-        ElMessage({
-          message: res.msg,
-          type: 'error'
-        });
-      }
-    })
-    .catch(() => {
-      // 用户点击取消
-      console.log('用户取消操作');
-    });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row: CategoryVO) => {
-  ElMessageBox.confirm('是否确认删除', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(async () => {
-    const res = await updateaforbid(row.fileId);
-    if (res.status == 200) {
-      ElMessage({
-        message: '删除成功',
-        type: 'success'
-      });
-      getList();
-    } else {
-      ElMessage({
-        message: res.msg,
-        type: 'error'
-      });
-    }
-  });
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'contentManage/video/export',
-    {
-      ...queryParams.value
-    },
-    `video_${new Date().getTime()}.xlsx`
-  );
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.video-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-.video-container .video {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-.video-info {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  margin-top: 10px;
-  font-size: 20px;
-  font-weight: bold;
-  & > div {
-    cursor: pointer;
-  }
-}
-.comment-list {
-  width: 100%;
-}
-.comment-item {
-  display: flex;
-  width: 100%;
-  .comment-avatar {
-    padding: 10px;
-  }
-  .comment-content {
-    padding: 10px;
-    width: 100%;
-    .comment-header {
-      width: 100%;
-      display: flex;
-      justify-content: space-between;
-      .comment-name {
-        color: rgb(145, 145, 145);
-      }
-    }
-
-    .comment-text {
-      display: flex;
-      width: 100%;
-      justify-content: space-between;
-      .el-button {
-        width: 50px;
-        height: 20px;
-      }
-    }
-  }
-}
-</style>

src/views/oms/aftersale/index.vue

@@ -44,7 +44,7 @@
         <el-table v-loading="loading" border :data="omsAftersaleList" @selection-change="handleSelectionChange">
           <!--      <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="售后单号" prop="id" width="180" align="center" />
-          <el-table-column label="申请状态" prop="aftersaleStatus" width="80" align="center">
+          <el-table-column label="申请状态" prop="aftersaleStatus" width="110" align="center">
             <template v-slot="scope">
               <el-tag effect="plain" size="default" :type="getAftersaleStatusTag(scope.row)">{{ getAftersaleStatusText(scope.row) }} </el-tag>
             </template>
@@ -220,7 +220,8 @@ export default {
         logList: null,
         open: false,
         loading: false
-      }
+      },
+      dataList:[]
     };
   },
   created() {

src/views/oms/order/index.vue

@@ -71,25 +71,25 @@
     </el-card>
     <el-card shadow="hover">
       <el-table v-loading="loading" :data="omsOrderList" border cell-class-name="my-cell">
-        <el-table-column label="推广人信息&买家信息" width="156">
+        <el-table-column label="推广人信息&买家信息" width="156" align="center">
           <template v-slot="scope">
             <div>{{ scope.row.memberNickname }}</div>
             <div>{{ scope.row.memberPhoneEncrypted }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="卖家信息" width="116">
+        <el-table-column label="卖家信息" width="116" align="center">
           <template v-slot="scope">
             <div>{{ scope.row.tenantContactName }}</div>
             <div>{{ scope.row.tenantContactPhone }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="核销码" width="130">
+        <el-table-column label="核销码" width="180" align="center">
           <template v-slot="scope">
             {{ scope.row.code }}
             <!--          <el-image :src="scope.row.code" style="width: 100px; height: 100px" />-->
           </template>
         </el-table-column>
-        <el-table-column label="商品规格" prop="productList" width="280">
+        <el-table-column label="商品规格" prop="productList" width="280" align="center">
           <template v-slot="scope">
             <div v-for="item in scope.row.productList" class="product-container">
               <el-popover placement="right" trigger="hover">
@@ -111,7 +111,7 @@
           </template>
         </el-table-column>
         <!--      <el-table-column label="分佣信息" prop="couponAmount" width="80"> </el-table-column>-->
-        <el-table-column label="订单类型" prop="couponAmount" width="100">
+        <el-table-column label="订单类型" prop="couponAmount" width="100" align="center">
           <template v-slot="scope">
             <!-- <el-tag type="primary"> -->
             {{ getEmulistLabelById(scope.row.type, orderTypeMap) }}
@@ -126,8 +126,8 @@
             </el-link> -->
           </template>
         </el-table-column>
-        <el-table-column label="订单编号" prop="orderSn" width="80"> </el-table-column>
+        <el-table-column label="订单编号" prop="orderSn" width="80" align="center"> </el-table-column>
-        <el-table-column label="订单状态" prop="status" width="160">
+        <el-table-column label="订单状态" prop="status" width="160" align="center">
           <template v-slot="scope">
             <div>
               <!-- <el-tag style="margin-right: 10px"> -->
@@ -141,14 +141,14 @@
             <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="退款状态" prop="aftersaleStatus" width="100">
+        <el-table-column label="退款状态" prop="aftersaleStatus" width="100" align="center">
           <template v-slot="scope">
             <!-- <el-tag type="primary"> -->
             {{ getEmulistLabelById(scope.row.aftersaleStatus, tuiStatusMapList) }}
             <!-- </el-tag> -->
           </template>
         </el-table-column>
-        <el-table-column label="核销状态" prop="status" width="100">
+        <el-table-column label="核销状态" prop="status" width="100" align="center">
           <template v-slot="scope">
             {{ getEmulistLabelById(scope.row.status, orderWithdrawMap) }}
           </template>
@@ -173,7 +173,7 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column label="备注留言" prop="note" width="160">
+        <el-table-column label="备注留言" prop="note" width="160" align="center">
           <template v-slot="scope">
             <div>
               <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
@@ -184,19 +184,19 @@
             <div v-if="scope.row.note">{{ scope.row.note }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间/支付时间" prop="payTime" width="140">
+        <el-table-column label="下单时间/支付时间" prop="payTime" width="140" align="center">
           <template v-slot="scope">
             <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单</div>
             <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付</div>
           </template>
         </el-table-column>
-        <el-table-column label="优惠券" prop="couponAmount" width="80">
+        <el-table-column label="优惠券" prop="couponAmount" width="80" align="center">
           <template v-slot="scope">
             <div v-if="scope.row.couponAmount">￥{{ scope.row.couponAmount }}</div>
             <div v-else>无</div>
           </template>
         </el-table-column>
-        <el-table-column label="合计" prop="totalAmount" width="140">
+        <el-table-column label="合计" prop="totalAmount" width="140" align="center">
           <template v-slot="scope">
             <div>
               <span>总数： </span>

src/views/set/account.vue

@@ -5,21 +5,16 @@
       <div v-show="showSearch" class="search">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
           <el-form-item label="模板名称" prop="phone">
-            <el-input v-model="queryParams.templateName" placeholder="请输入模板名称" clearable @keyup.enter="handleQuery" />
+            <el-input v-model="queryParams.name" placeholder="请输入模板名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <!-- <el-form-item label="模板编号" prop="phone">
-            <el-input v-model="queryParams.templatecode" placeholder="请输入模板编码" clearable @keyup.enter="handleQuery" />
-          </el-form-item> -->
           <el-form-item label="类型" prop="phone">
-            <el-select v-model="queryParams.templateType" placeholder="请选择类型">
+            <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
-              <el-option label="通知" value="0" />
+              <el-option v-for="item in getStaList" :label="item.label" :value="item.value" :key="item.value" />
-              <el-option label="公告" value="1" />
             </el-select>
           </el-form-item>
           <el-form-item label="状态" prop="phone">
-            <el-select v-model="queryParams.status" placeholder="请选择类型">
+            <el-select v-model="queryParams.status" placeholder="请选择类型" clearable>
-              <el-option label="停用" value="1" />
+              <el-option v-for="item in signList" :label="item.label" :value="item.value" :key="item.value" />
-              <el-option label="正常" value="0" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -47,25 +42,24 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <el-table-column label="id" prop="id" align="center" width="180" />
-        <el-table-column label="模板名称" prop="templateName" align="center" width="150" />
+        <el-table-column label="模板名称" prop="name" align="center" width="150" />
-        <!-- <el-table-column label="模板名称" prop="templateName" align="center" width="150" /> -->
+        <el-table-column label="模版类型" prop="type" align="center" width="150">
-        <el-table-column label="模版类型" prop="templateType" align="center" width="150">
           <template #default="{ row }">
-            {{ row.templateType == 1 ? '公告' : '通知' }}
+            {{ row.type == 1 ? '通知' : '公告' }}
           </template>
         </el-table-column>
         <el-table-column label="状态" prop="status" align="center" width="150">
           <template #default="{ row }">
-            {{ row.status == 1 ? '停用' : '正常' }}
+            {{ row.status == 0 ? '正常' : '关闭' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="seachfun(scope.row.id)">查看</el-button>
+              <el-button link type="primary" v-hasPermi="['workflow:video:search']" @click="seachfun(scope.row.id)">查看</el-button>
             </el-tooltip>
             <el-tooltip content="编辑" placement="top">
-              <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="updatefun(scope.row.id)">编辑</el-button>
+              <el-button link type="primary" v-hasPermi="['workflow:video:edit']" @click="updatefun(scope.row.id)">编辑</el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="deltemplatefun(scope.row.id)">删除</el-button>
@@ -80,19 +74,32 @@
     <el-dialog v-model="showRefuteDialog" title="创建消息模板">
       <el-form :model="dataparams" :rules="rules">
         <el-form-item label="模板类型">
-          <el-select v-model="dataparams.templateType" placeholder="请选择类型">
+          <el-select v-model="dataparams.type" placeholder="请选择类型">
-            <el-option label="通知" value="0" />
+            <el-option v-for="item in getStaList" :label="item.label" :value="item.value" :key="item.value" />
-            <el-option label="公告" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模板场景">
+          <el-select v-model="dataparams.action" placeholder="请选择场景">
+            <el-option v-for="item in getAction" :label="item.label" :value="item.value" :key="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板名称">
-          <el-input v-model="dataparams.templateName" placeholder="模板名称" />
+          <el-input v-model="dataparams.name" placeholder="模板名称" />
+        </el-form-item>
+        <el-form-item label="模板参数">
+          <el-input v-model="dataparams.params" placeholder="模板参数" />
         </el-form-item>
         <el-form-item label="模板标题">
           <el-input v-model="dataparams.title" placeholder="模板标题" />
         </el-form-item>
+        <el-form-item label="模板描述">
+          <el-input v-model="dataparams.description" placeholder="模板描述" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
         <el-form-item label="模板内容">
-          <el-input v-model="dataparams.templateContent" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+          <el-input v-model="dataparams.content" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="扩展字段">
+          <el-input v-model="dataparams.ext" placeholder="扩展字段" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -104,38 +111,64 @@
     <el-dialog v-model="seachookDialog" title="查看消息模板">
       <el-form :model="seachook" :rules="rules">
         <el-form-item label="模板类型">
-          <el-select v-model="seachook.templateType" placeholder="请选择类型" disabled>
+          <el-select v-model="seachook.type" placeholder="请选择类型" disabled>
-            <el-option label="通知" value="0" />
+            <el-option v-for="item in getStaList" :label="item.label" :value="item.value" :key="item.value" />
-            <el-option label="公告" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模板场景">
+          <el-select v-model="seachook.action" placeholder="请选择场景" disabled>
+            <el-option v-for="item in getAction" :label="item.label" :value="item.value" :key="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板名称">
-          <el-input v-model="seachook.templateName" placeholder="模板名称" disabled />
+          <el-input v-model="seachook.name" placeholder="模板名称" disabled />
+        </el-form-item>
+        <el-form-item label="模板参数">
+          <el-input v-model="seachook.params" placeholder="模板参数" disabled />
         </el-form-item>
         <el-form-item label="模板标题">
           <el-input v-model="seachook.title" placeholder="模板标题" disabled />
         </el-form-item>
+        <el-form-item label="模板描述">
+          <el-input v-model="seachook.description" placeholder="模板描述" type="textarea" disabled :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
         <el-form-item label="模板内容">
-          <el-input v-model="seachook.templateContent" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" disabled />
+          <el-input v-model="seachook.content" placeholder="模板内容" type="textarea" disabled :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="扩展字段">
+          <el-input v-model="seachook.ext" placeholder="扩展字段" disabled />
         </el-form-item>
       </el-form>
     </el-dialog>
     <el-dialog v-model="updatedialog" title="修改消息模板">
       <el-form :model="updatahook" :rules="rules">
         <el-form-item label="模板类型">
-          <el-select v-model="updatahook.templateType" placeholder="请选择类型">
+          <el-select v-model="updatahook.type" placeholder="请选择类型">
-            <el-option label="通知" value="0" />
+            <el-option v-for="item in getStaList" :label="item.label" :value="item.value" :key="item.value" />
-            <el-option label="公告" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模板场景">
+          <el-select v-model="updatahook.action" placeholder="请选择场景">
+            <el-option v-for="item in getAction" :label="item.label" :value="item.value" :key="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板名称">
-          <el-input v-model="updatahook.templateName" placeholder="模板名称" />
+          <el-input v-model="updatahook.name" placeholder="模板名称" />
+        </el-form-item>
+        <el-form-item label="模板参数">
+          <el-input v-model="updatahook.params" placeholder="模板参数" />
         </el-form-item>
         <el-form-item label="模板标题">
           <el-input v-model="updatahook.title" placeholder="模板标题" />
         </el-form-item>
+        <el-form-item label="模板描述">
+          <el-input v-model="updatahook.description" placeholder="模板描述" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
         <el-form-item label="模板内容">
-          <el-input v-model="updatahook.templateContent" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+          <el-input v-model="updatahook.content" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="扩展字段">
+          <el-input v-model="updatahook.ext" placeholder="扩展字段" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -148,6 +181,7 @@
 </template>
 
 <script setup name="Leave" lang="ts">
+import { getDictionaryByKey } from '@/utils/dict';
 import { listtemplate, templateAdd, deltemplate, getnotice, updateCategory } from '@/api/set/messageindex';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const showSearch = ref(true);
@@ -158,9 +192,9 @@ const data = reactive<PageData<LeaveForm, AccountQuery>>({
   queryParams: {
     current: 1,
     size: 10,
-    templateName: undefined,
+    name: undefined,
     templatecode: undefined,
-    templateType: undefined,
+    type: undefined,
     status: undefined
   },
   rules: {}
@@ -192,18 +226,20 @@ const deltemplatefun = async (row: string) => {
   });
 };
 const dataparams = ref<paramsaccountOV>({
-  templateType: null,
+  type: null,
-  templateCode: null,
+  name: null,
-  templateName: null,
+  content: null,
-  templateContent: null,
+  title: null,
-  title: null
+  ext: null,
+  description: null,
+  action: null,
+  params: null
 });
 
 const rules = reactive({
   templateType: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-  templateCode: [{ required: true, message: '请输入备注内容', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入内容', trigger: 'blur' }],
-  templateName: [{ required: true, message: '请输入内容', trigger: 'blur' }],
+  content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
-  templateContent: [{ required: true, message: '请输入内容', trigger: 'blur' }],
   title: [{ required: true, message: '请输入标题内容', trigger: 'blur' }]
 });
 const handleQuery = () => {
@@ -211,9 +247,9 @@ const handleQuery = () => {
 };
 const resetQuery = () => {
   queryParams.value = {
-    templateType: undefined,
+    type: undefined,
     status: undefined,
-    templateName: undefined,
+    name: undefined,
     templatecode: undefined,
     current: 1,
     size: 10
@@ -227,12 +263,16 @@ const seachook = ref<seachookOV>({
   createTime: null,
   id: null,
   status: null,
-  templateContent: null,
+  content: null,
-  templateName: null,
+  name: null,
-  templateType: null,
+  type: null,
   title: null,
   updateBy: null,
-  updateTime: null
+  updateTime: null,
+  ext: null,
+  description: null,
+  action: null,
+  params: null
 });
 
 const seachfun = async (id?: string) => {
@@ -249,9 +289,9 @@ const updatahook = ref<seachookOV>({
   createTime: null,
   id: null,
   status: null,
-  templateContent: null,
+  content: null,
-  templateName: null,
+  name: null,
-  templateType: null,
+  type: null,
   title: null,
   updateBy: null,
   updateTime: null
@@ -270,22 +310,37 @@ const clickupdate = async () => {
     getlist();
   }
 };
+const signList = ref([]);
+const getStaList = ref([]);
+const getAction = ref([]);
+const getByKey = async () => {
+  const value1 = await getDictionaryByKey('sys_notice_status');
+  const value2 = await getDictionaryByKey('sys_notice_type');
+  const value3 = await getDictionaryByKey('im_message_action');
+  signList.value = value1;
+  getStaList.value = value2;
+  getAction.value = value3;
+};
 //新增
 const cilcikgAdd = async () => {
   const res = await templateAdd(dataparams.value);
   if (res.code == 200) {
     showRefuteDialog.value = false;
     dataparams.value = {
-      templateType: null,
+      type: null,
-      templateCode: null,
+      name: null,
-      templateName: null,
+      content: null,
-      templateContent: null,
+      title: null,
-      title: null
+      ext: null,
+      description: null,
+      action: null,
+      params: null
     };
     getlist();
   }
 };
 onMounted(() => {
+  getByKey();
   getlist();
 });
 </script>

src/views/set/message.vue

@@ -186,7 +186,7 @@ const getlist = async () => {
     total.value = res.data.total;
   }
 };
-const islofun = (e) => {
+const islofun = (e: any) => {
   dataparams.value.logmess = e;
   fncode.value = '';
   dataparams.value.sendScope = null;

src/views/system/category/index.vue

@@ -58,8 +58,6 @@
 <script setup name="Post" lang="ts">
 import { listPost, getPost, updatePost, addPost, delPost } from '@/api/system/category';
 import { PostVO, PostForm, PostQuery } from '@/api/system/category/types';
-import { DeptVO } from '@/api/system/dept/types';
-import api from '@/api/system/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));

src/views/system/tenant/index.vue

@@ -81,48 +81,53 @@
           </template>
         </el-table-column>
         <el-table-column label="邀请人" align="center" prop="inviteUserName" />
-
-        <!-- <el-table-column label="联系人" align="center" prop="contactUserName" />
-        <el-table-column label="联系电话" align="center" prop="contactPhone" />
-        <el-table-column label="身份证号" align="center" prop="idCard" />
-        <el-table-column label="银行卡号" align="center" prop="bankCard" />
-        <el-table-column label="社会信用代码" align="center" prop="licenseNumber" min-width="100" />
-        <el-table-column label="营业执照" align="center" prop="businessLicense" />
-        <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
-          <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column> -->
         <el-table-column label="签约状态" align="center" prop="signStatus">
           <template #default="scope">
             {{ signList.filter((item) => item.value == scope.row.signStatus)[0]?.label }}
           </template>
         </el-table-column>
-        <el-table-column label="租户状态" align="center" prop="status">
+        <el-table-column label="不通过理由" align="center" prop="failureReason">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+            {{ scope.row.failureReason || '-' }}
           </template>
         </el-table-column>
-        <el-table-column width="180" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+
+        <el-table-column label="租户状态" align="center" prop="status">
+          <template #default="scope">
+            <!-- 0启用 1停用 -->
+            {{ scope.row.status == 0 ? '启用' : '停用' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="580" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button v-hasPermi="['system:tenant:seach']" link type="primary" @click="funseach(scope.row, true)">
+              <el-button v-hasPermi="['system:tenant:seach']" link type="primary" @click="funseach(scope.row, true)"> 查看 </el-button>
-                <el-icon><Search /></el-icon>
-              </el-button>
             </el-tooltip>
             <el-tooltip content="封禁记录" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="User" @click="showTenantBannedInfoModal(scope.row, true)">
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" @click="showTenantBannedInfoModal(scope.row, true)">
+                封禁记录
               </el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" @click="handleUpdate(scope.row)"> 修改</el-button>
+            </el-tooltip>
+            <el-tooltip content="提交" placement="top">
+              <el-button v-hasPermi="['system:tenant:submit']" link type="primary" @click="handleTl(scope.row)"> 提交 </el-button>
+            </el-tooltip>
+            <el-tooltip content="审核" placement="top">
+              <el-button v-hasPermi="['system:tenant:review']" link type="primary" @click="handleSh(scope.row)"> 审核 </el-button>
+            </el-tooltip>
+            <el-tooltip content="确认审核" placement="top">
+              <el-button v-hasPermi="['system:tenant:confirm']" link type="primary" @click="handleSubmit(scope.row)"> 确认审核 </el-button>
+            </el-tooltip>
+            <el-tooltip content="切换租户状态" placement="top">
+              <el-button v-hasPermi="['system:tenant:status']" link type="primary" @click="handleStatusChange(scope.row)"> 切换租户状态 </el-button>
             </el-tooltip>
             <el-tooltip content="同步套餐" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" @click="handleSyncTenantPackage(scope.row)"> 同步套餐 </el-button>
-              </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -133,16 +138,6 @@
     <!--租户封禁记录-->
     <el-dialog title="店铺封禁信息" v-model="tenantBannedInfoModalVisible" width="900px" append-to-body>
       <el-table v-loading="tenantBannedInfoTableLoading" :data="tenantBannedInfo.data" border empty-text="暂无数据">
-        <!--        <el-table-column label="手机号" prop="phone" width="150">
-          <template v-slot="scope">
-            {{ userBannedInfo.record.nickname }}
-          </template>
-        </el-table-column>
-        <el-table-column label="昵称" prop="nickname" width="150">
-          <template v-slot="scope">
-            {{ userBannedInfo.record.nickname }}
-          </template>
-        </el-table-column>-->
         <el-table-column label="封禁原因" prop="reason">
           <template v-slot="scope">
             {{ getEmulistLabelById(scope.row.reason, tenantForbiddenReasonMap) }}
@@ -384,7 +379,6 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="分成比例" prop="splitRatio">
-                <!-- <el-input v-model="form.splitRatio" type="text" placeholder="请输入分成比例" /> -->
                 <el-select v-model="form.splitRatio" placeholder="请选择分成比例">
                   <el-option v-for="item in fnall" :key="item.id" :label="item.templateName" :value="item.id" />
                 </el-select>
@@ -405,13 +399,6 @@
                 <oss-image-upload v-model="form.contractAttachment" :limit="1"> </oss-image-upload>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="签约状态" prop="signStatus" align="left" v-if="form.id">
-                <el-select v-model="form.signStatus" placeholder="请选择签约状态" clearable>
-                  <el-option v-for="(item, index) in signList" :key="index" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
           </el-row>
         </div>
       </el-form>
@@ -649,7 +636,10 @@ import {
   changeTenantStatus,
   syncTenantPackage,
   syncTenantDict,
-  getTenantBannelList
+  getTenantBannelList,
+  getTenantSub,
+  auditTenant,
+  auditSubmit
 } from '@/api/system/tenant';
 
 import { listUmsMember } from '@/api/ums/member';
@@ -734,6 +724,50 @@ const parseJsonString = (data) => {
     return [];
   }
 };
+const handleTl = async (row) => {
+  try {
+    await ElMessageBox.confirm('确定要执行提交操作吗？', '确认提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+    // 用户确认后执行操作
+    const res = await getTenantSub(row.tenantId);
+    // 根据返回结果处理
+    if (res.code == 200) {
+      ElMessage.success('操作成功');
+      // 这里可以添加刷新列表等操作
+      getList();
+    } else {
+      ElMessage.error(res.msg || '操作失败');
+    }
+  } catch (error) {
+    // 用户取消操作
+    console.log('用户取消了操作');
+  }
+};
+const handleSubmit = async (row) => {
+  try {
+    await ElMessageBox.confirm('确认审核通过的签约', '确认提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+    // 用户确认后执行操作
+    const res = await auditSubmit(row.tenantId);
+    // 根据返回结果处理
+    if (res.code == 200) {
+      ElMessage.success('操作成功');
+      // 这里可以添加刷新列表等操作
+      getList();
+    } else {
+      ElMessage.error(res.msg || '操作失败');
+    }
+  } catch (error) {
+    // 用户取消操作
+    console.log('用户取消了操作');
+  }
+};
 const managefun = (data: any) => {
   const dataArray = data.split(',');
   console.log(typeof dataArray);
@@ -920,13 +954,15 @@ const getList = async () => {
 
 // 租户套餐状态修改
 const handleStatusChange = async (row: TenantVO) => {
-  const text = row.status === '0' ? '启用' : '停用';
+  // 0启用 1停用
+  const text = row.status === '0' ? '停用' : '启用';
   try {
     await proxy?.$modal.confirm('确认要"' + text + '""' + row.companyName + '"租户吗？');
-    await changeTenantStatus(row.id, row.tenantId, row.status);
+    await changeTenantStatus(row.id, row.tenantId, row.status == '0' ? '1' : '0');
     proxy?.$modal.msgSuccess(text + '成功');
+    getList(); // 刷新列表
   } catch {
-    row.status = row.status === '0' ? '1' : '0';
+    getList(); // 刷新列表
   }
 };
 // 展示账户封禁记录弹框
@@ -965,7 +1001,56 @@ const getBannedReasonEmu = async () => {
   tenantForbiddenUnitMap.value = reasonMap1;
   tenantForbiddenReasonMap.value = reasonMap2;
 };
-
+const handleSh = (row) => {
+  ElMessageBox.confirm('请选择审核结果', '审核确认', {
+    confirmButtonText: '通过',
+    cancelButtonText: '不通过',
+    distinguishCancelAndClose: true,
+    type: 'warning'
+  })
+    .then(() => {
+      // 点击"通过"按钮
+      return auditTenant({
+        tenantId: row.tenantId,
+        isPass: true
+      });
+    })
+    .then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('审核通过');
+        getList(); // 刷新列表
+      } else {
+        ElMessage.error(res.msg || '审核失败');
+      }
+    })
+    .catch((action) => {
+      if (action === 'cancel') {
+        // 点击"不通过"按钮才弹出输入框
+        ElMessageBox.prompt('请输入不通过原因', '审核不通过', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          inputPattern: /^[\s\S]+$/,
+          inputErrorMessage: '必须填写不通过原因',
+          type: 'error'
+        })
+          .then(({ value }) => {
+            return auditTenant({
+              tenantId: row.tenantId,
+              isPass: false, // 不通过
+              failureReason: value
+            });
+          })
+          .then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('操作成功');
+              getList(); // 刷新列表
+            } else {
+              ElMessage.error(res.msg || '操作失败');
+            }
+          });
+      }
+    });
+};
 // 取消按钮
 const cancel = () => {
   reset();

src/views/system/user/index.vue

@@ -243,6 +243,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="28">
+            <el-form-item label="绑定会员" prop="syncMemberFlag">
+              <el-radio-group v-model="form.syncMemberFlag">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -367,7 +377,8 @@ const initFormData: UserForm = {
   status: '0',
   remark: '',
   postIds: [],
-  roleIds: []
+  roleIds: [],
+  syncMemberFlag: true
 };
 
 const initData: PageData<UserForm, UserQuery> = {
@@ -409,6 +420,7 @@ const initData: PageData<UserForm, UserQuery> = {
         trigger: ['blur', 'change']
       }
     ],
+    syncMemberFlag: [{ required: true, message: '请选择是否绑定会员', trigger: 'blur' }],
     phonenumber: [
       {
         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,

src/views/ums/member/index.vue

@@ -107,7 +107,7 @@
               <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="220">
+          <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="500">
             <template v-slot="scope">
               <el-button size="small" text type="primary" @click="showUserAccountModal(scope.row)">账户数据</el-button>
               <el-button size="small" text type="primary" @click="showUserBankCardInfoModal(scope.row, true)">银行卡 </el-button>
@@ -116,8 +116,8 @@
               <el-button size="small" text type="primary" @click="handleUserDelete(scope.row)">删除 </el-button>
               <el-button size="small" text type="primary" @click="showUserBannedInfoModal(scope.row, true)">封禁记录 </el-button>
               <el-button size="small" text type="primary" @click="showUserLoginInfoModal(scope.row, true)">登录记录 </el-button>
-              <el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button>
               <el-button size="small" text type="primary" @click="showChargeInfoModal(scope.row, true)">充值记录 </el-button>
+              <el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button>
             </template>
           </el-table-column>
         </el-table>