diff --git a/src/App.vue b/src/App.vue
index 326e883..1fb99c6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,9 @@ import { ElConfigProvider } from 'element-plus'
 import router from './router';
 import zhCn from 'element-plus/es/locale/lang/zh-cn' //引入ElemenetPlus中文
 import myAxios from './api/myAxios';
+
 const isRouterActive = ref(true)
+
 provide('reload', () => {  //页面刷新
   isRouterActive.value = false
   nextTick(() => {
diff --git a/src/api/myAxios.ts b/src/api/myAxios.ts
index 8ad9826..5ff2bfa 100644
--- a/src/api/myAxios.ts
+++ b/src/api/myAxios.ts
@@ -4,11 +4,11 @@ import router from '../router'
 
 const myAxios = axios.create({
     withCredentials:true,
-    baseURL: 'http://localhost:9092/api'
+    // baseURL: 'http://localhost:9092/api'
     // baseURL: 'http://123.249.108.160:8888/api' //测试服务器
     // baseURL: 'http://154.8.193.216:9092/api',  //隋雨霏服务器
     // baseURL: 'http://154.8.193.216:9093/api'  //隋雨霏服务器测试环境
-    // baseURL: 'https://www.carboner.cn:8888/api'
+    baseURL: 'https://www.carboner.cn:8888/api'
 });
 // 添加请求拦截器
 axios.interceptors.request.use(function (config) {
diff --git a/src/layout/components/Aside.vue b/src/layout/components/Aside.vue
index 7d8b5c2..29a2b7e 100644
--- a/src/layout/components/Aside.vue
+++ b/src/layout/components/Aside.vue
@@ -70,6 +70,7 @@ import { defineProps } from 'vue';
 import emitter from '@/utils/emitter'
 import { useRouter } from 'vue-router';
 import {
+  More,
   House,
   User,
   Location,
@@ -91,7 +92,10 @@ import {
   Notification,
   Tickets,
   Money,
-  Odometer
+  Odometer,
+  Notebook,
+  Picture,
+  PictureRounded
 } from "@element-plus/icons-vue";
 defineProps(['send-data'])
 
@@ -130,6 +134,7 @@ onMounted(()=>{
 
 // 创建图标映射表
 const iconComponents = {
+  More,
   House,
   User,
   Location,
@@ -151,7 +156,10 @@ const iconComponents = {
   Notification,
   Tickets,
   Money,
-  Odometer
+  Odometer,
+  Notebook,
+  Picture,
+  PictureRounded
   // 添加其他图标组件映射
 };
 // 过滤掉不需要展示的路由，并调整 layout 的子路由
diff --git a/src/layout/components/DateDrawer.vue b/src/layout/components/DateDrawer.vue
deleted file mode 100644
index 636bdb2..0000000
--- a/src/layout/components/DateDrawer.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-    <div style="margin-bottom: 20px;">选择当天时间段和人数</div>
-    <div v-for="(item,index) in timeArr">
-      <span>选择时间段</span>
-      <!-- <el-time-picker
-      v-model="timePickArr[index]"
-      format='HH:mm'
-      is-range="true"
-      range-separator="到"
-      start-placeholder="开始"
-      end-placeholder="结束"
-      value-format="HH:mm"
-      :style="{ width: '236px' }"
-      @change="saveTime(index)"
-    /> -->
-      <div>
-        <span>最小人数:</span>
-        <el-select v-model="timeArr.minNumber" style="width: 100px" @change="minNum(index)">
-          
-        </el-select>
-        <span>最大人数:</span>
-        <el-select v-model="timeArr.maxNumber" style="width: 100px" @change="maxNum(index)">
-          
-        </el-select>
-        <el-button circle @click="addList(index)"><el-icon>
-            <Plus />
-          </el-icon></el-button>
-        <el-button circle @click="subList(index)" v-if="index > 0"><el-icon>
-            <Minus />
-          </el-icon></el-button>
-      </div>
-    </div>
-    <el-button size="small" @click="printInfo()">
-              打印
-            </el-button>
-</template>
-
-<script setup lang="ts">
-import { ref,onMounted,defineEmits } from 'vue';
-import { ElMessage } from 'element-plus';
-const fatherCom : any = defineProps(['timeObject'])  //接收父组件传过来的值
-const timeArr : any = ref(fatherCom.timeObject)  //把外层去掉，只留时间段数组
-
-onMounted(()=>{
-})
-const saveTime =(index:number)=>{
-}
-const addList =(index:number)=>{}
-const subList =(index:number)=>{}
-const minNum =(index : number)=>{  //最小人数不能大于最大人数
-  if(false) {
-    ElMessage({
-      type: 'warning',
-      message: '最小人数不能大于最大人数'
-    })
-    return;
-  }
-}
-const maxNum =(index : number)=>{
-  if(false) {
-    ElMessage({
-      type: 'warning',
-      message: '最大人数不能小于最小人数'
-    })
-    return;
-  }
-}
-const printInfo =()=>{
-    // console.log('timePickArr-->',timePickArr.value);
-    console.log('timeArr-->',timeArr.value);
-    // console.log(fatherCom);
-    // let tempArr = timeArr.value[0].timeSlot.split("-")
-    // timePickArr.value.push(tempArr)
-    // console.log(timePickArr.value);
-}
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/layout/components/richTextUtil.vue b/src/layout/components/richTextUtil.vue
index 5c747fb..26d4e42 100644
--- a/src/layout/components/richTextUtil.vue
+++ b/src/layout/components/richTextUtil.vue
@@ -21,7 +21,6 @@ const props = defineProps({
   context: String,
   disableRich: Boolean
 })
-// const { context } = toRefs(props)  //结构context让他变为可写
 
 onMounted(() => {
   setTimeout(() => {
@@ -30,7 +29,12 @@ onMounted(() => {
     }
   }, 1500)
 })
-const toolbarConfig = {}
+
+const toolbarConfig = {
+  excludeKeys: [   //去掉富文本部分功能
+      "group-video","uploadVideo","insertVideo","todo","codeBlock","insertImage","code"
+  ]
+}
 
 const editorConfig = {
   placeholder: '请输入内容...',
@@ -40,6 +44,8 @@ const editorConfig = {
 editorConfig.readOnly = props.disableRich   //控制富文本是否启用
 editorConfig.autoFocus = false
 editorConfig.MENU_CONF['uploadImage'] = {
+  allowedFileTypes: ['image/*'],   //限定只能上传图片格式
+  maxFileSize: 1024 * 1024 * 10,   //最大图片10M
   async customUpload(file, insertFn) {
     const res = await myAxios({
       url: '/file/uploadFile',
@@ -52,7 +58,7 @@ editorConfig.MENU_CONF['uploadImage'] = {
         file: file
       }
     })
-    console.log('图片上传返回值--->',res.data)
+    // console.log('图片上传返回值--->',res.data)
     const downloadUrl = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey=';
     insertFn(downloadUrl + res.data.data, res.alt, res.href)
   }
@@ -64,14 +70,14 @@ onBeforeUnmount(() => {
   if (editor == null) return
   editor.destroy()
 })
+
 const handleCreated = (editor) => {
   editorRef.value = editor // 记录 editor 实例，重要！
+  console.log(editor.getAllMenuKeys())
 }
+
 const handleChange = (editor) => {   //当选项改变时触发emit传值
-  // console.log(valueHtml.value)
   emit('richTextContent', valueHtml.value)
-  // emit('disableChange',props.disable)
-  // console.log('html',editor.getHtml());
 }
 </script>
 
diff --git a/src/router/routes.ts b/src/router/routes.ts
index f6ecc95..3ba3fe9 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -247,7 +247,7 @@ export const constantRoute = [
         component: () => import("@/layout/Manage.vue"),
         meta: {
             title: '服装租赁管理',
-            icon: '',
+            icon: 'Money',
             hidden: false
         },
         children: [
@@ -267,7 +267,7 @@ export const constantRoute = [
                 component: () => import("@/views/OutfitLease/LeaseOutfitCenter.vue"),
                 meta: {
                     title: '租赁产品中心',
-                    icon: '',
+                    icon: 'DataAnalysis',
                     hidden: false
                 }
             },
@@ -277,7 +277,7 @@ export const constantRoute = [
                 component: () => import("@/views/OutfitLease/OutfitType.vue"),
                 meta: {
                     title: '服装类别管理',
-                    icon: '',
+                    icon: 'Files',
                     hidden: false
                 }
             },
@@ -287,7 +287,6 @@ export const constantRoute = [
                 component: () => import("@/views/OutfitLease/LeaseOutfitDetail.vue"),
                 meta: {
                     title: '租赁服装详情',
-                    icon: '',
                     hidden: true
                 }
             },
@@ -297,7 +296,7 @@ export const constantRoute = [
                 component: () => import("@/views/OutfitLease/OutfitLeaseOrderCenter.vue"),
                 meta: {
                     title: '租赁订单中心',
-                    icon: '',
+                    icon: 'DataBoard',
                     hidden: false
                 }
             },
@@ -307,7 +306,6 @@ export const constantRoute = [
                 component: () => import("@/views/OutfitLease/LeaseOrderDetail.vue"),
                 meta: {
                     title: '租赁订单详情',
-                    icon: '',
                     hidden: true
                 }
             }
@@ -320,7 +318,7 @@ export const constantRoute = [
         component: () => import("@/layout/Manage.vue"),
         meta: {
             title: '活动资讯管理',
-            icon: '',
+            icon: 'Notebook',
             hidden: false
         },
         children: [
@@ -340,7 +338,7 @@ export const constantRoute = [
                 component: () => import("@/views/ActivityMessageManagement/MessageCenter.vue"),
                 meta: {
                     title: '活动资讯中心',
-                    icon: '',
+                    icon: 'DataAnalysis',
                     hidden: false
                 }
             },
@@ -461,7 +459,7 @@ export const constantRoute = [
         component: () => import("@/layout/Manage.vue"),
         meta: {
             title: '其他管理',
-            icon: '',
+            icon: 'More',
             hidden: false
         },
         children: [
@@ -471,7 +469,7 @@ export const constantRoute = [
                 component: () => import("@/views/OtherManagement/EntityCarouseCenter.vue"),
                 meta: {
                     title: '商城轮播图管理',
-                    icon: '',
+                    icon: 'Picture',
                     hidden: false
                 }
             },
@@ -481,7 +479,7 @@ export const constantRoute = [
                 component: () => import("@/views/OtherManagement/CourseCarouseCenter.vue"),
                 meta: {
                     title: '课程轮播图管理',
-                    icon: '',
+                    icon: 'PictureRounded',
                     hidden: false
                 }
             },
@@ -491,7 +489,7 @@ export const constantRoute = [
                 component: () => import("@/views/OtherManagement/FestivalManagement.vue"),
                 meta: {
                     title: '节日管理',
-                    icon: '',
+                    icon: 'Calendar',
                     hidden: false
                 }
             }
diff --git a/src/utils/formatImgUpload.ts b/src/utils/formatImgUpload.ts
index 87a2e1b..885cab3 100644
--- a/src/utils/formatImgUpload.ts
+++ b/src/utils/formatImgUpload.ts
@@ -1,4 +1,4 @@
 //上传链接
-export const uploadUrl : string = 'http://localhost:9092/api/file/uploadFile'
-// export const uploadUrl : string= 'https://www.carboner.cn:8888/api/file/uploadFile'
+// export const uploadUrl : string = 'http://localhost:9092/api/file/uploadFile'
+export const uploadUrl : string= 'https://www.carboner.cn:8888/api/file/uploadFile'
 export const downloadUrl : string = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey='
diff --git a/src/utils/imgUpload/ImgListUpload.vue b/src/utils/imgUpload/ImgListUpload.vue
index 8232fcd..d2208dc 100644
--- a/src/utils/imgUpload/ImgListUpload.vue
+++ b/src/utils/imgUpload/ImgListUpload.vue
@@ -43,7 +43,7 @@ const compressImage =(file: any)=> {   //图片压缩方法
   // console.log('compressImage',file)
   return new Promise((resolve, reject) => {
     new Compressor(file.file, {
-      quality: 0.3,   //压缩质量，越高文件越大
+      quality: 0.2,   //压缩质量，越高文件越大
       success(result) {
         console.log('res--->',result)
         // 压缩成功后的处理
diff --git a/src/utils/imgUpload/ImgSingleUpload.vue b/src/utils/imgUpload/ImgSingleUpload.vue
index dddb570..0892010 100644
--- a/src/utils/imgUpload/ImgSingleUpload.vue
+++ b/src/utils/imgUpload/ImgSingleUpload.vue
@@ -42,7 +42,7 @@ const compressImage =(file: any)=> {   //图片压缩方法
   // console.log('compressImage',file)
   return new Promise((resolve, reject) => {
     new Compressor(file.file, {
-      quality: 0.3,   //压缩质量，越高文件越大
+      quality: 0.2,   //压缩质量，越高文件越大
       success(result) {
         // console.log('res--->',result)
         // 压缩成功后的处理
diff --git a/src/utils/imgUpload/PreviewImgUpload.vue b/src/utils/imgUpload/PreviewImgUpload.vue
index 94dfe47..94fe0d8 100644
--- a/src/utils/imgUpload/PreviewImgUpload.vue
+++ b/src/utils/imgUpload/PreviewImgUpload.vue
@@ -57,7 +57,7 @@ const compressImage =(file: any)=> {   //图片压缩方法
   // console.log('compressImage',file)
   return new Promise((resolve, reject) => {
     new Compressor(file.file, {
-      quality: 0.3,   //压缩质量，越高文件越大
+      quality: 0.2,   //压缩质量，越高文件越大
       success(result) {
         console.log('res--->',result)
         // 压缩成功后的处理
diff --git a/src/utils/imgUpload/PreviewSingleImgUpload.vue b/src/utils/imgUpload/PreviewSingleImgUpload.vue
index 27a2bcf..fcc081d 100644
--- a/src/utils/imgUpload/PreviewSingleImgUpload.vue
+++ b/src/utils/imgUpload/PreviewSingleImgUpload.vue
@@ -55,7 +55,7 @@ const compressImage =(file: any)=> {   //图片压缩方法
   // console.log('compressImage',file)
   return new Promise((resolve, reject) => {
     new Compressor(file.file, {
-      quality: 0.3,   //压缩质量，越高文件越大
+      quality: 0.2,   //压缩质量，越高文件越大
       success(result) {
         console.log('res--->',result)
         // 压缩成功后的处理
diff --git a/src/views/ActivityMessageManagement/MessageCenter.vue b/src/views/ActivityMessageManagement/MessageCenter.vue
index cc4e666..68aabde 100644
--- a/src/views/ActivityMessageManagement/MessageCenter.vue
+++ b/src/views/ActivityMessageManagement/MessageCenter.vue
@@ -1,73 +1,57 @@
 <template>
-  <!-- 修改前请注释以前的 -->
-  <!-- 搜索 -->
   <div class="table_page">
-  <div>
-    <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="资讯名称"  size="default"
-              v-model="productName"></el-input>
-    <el-button type="primary" @click="" style="margin-right: 10px;" size="default">
-      搜索
-    </el-button>
-    <el-button type="warning" @click="reset" size="default">重置</el-button>
-  </div>
-<!--  批量删除 -->
-<!--  <div style="margin: 15px 0">-->
-<!--    <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"-->
-<!--                   title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>-->
-<!--      <template #reference>-->
-<!--        <el-button style="height: 25px" class="ml-5" type="danger">批量删除-->
-<!--          <el-icon style="margin-left: 5px;">-->
-<!--            <Remove/>-->
-<!--          </el-icon>-->
-<!--        </el-button>-->
-<!--      </template>-->
-<!--    </el-popconfirm>-->
-<!--  </div>-->
-  <!-- 数据展示 -->
-  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
-            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
-            @select="selectChange"
-            :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column prop="id" label="编号" width="80">
-      <template #default="{ $index }">
-        {{ $index + 1 }}
-      </template>
-    </el-table-column>
-    <el-table-column prop="title" label="标题"></el-table-column>
-    <el-table-column prop="image" label="预览图" width="200">
-      <template #default="scope">
-        <div>
-          <img :src="downloadUrl + scope.row.image" alt="" style="height: 50px;">
-        </div>
-      </template>
-    </el-table-column>
-    <el-table-column prop="publishTime" label="发布时间" width="150"></el-table-column>
-    <el-table-column label="操作" width="230px">
-      <template #default="scope">
-        <el-button size="small" @click="ReviseOrView(scope.row , 0)">
-          详情
-        </el-button>
-        <el-button size="small" @click="ReviseOrView(scope.row, 1)">
-          编辑
-        </el-button>
-        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled"
-                       icon-color="red"
-                       title="是否确认删除" @confirm="deleteMessage(scope.row.id)" width=180>
-          <template #reference>
-            <el-button class="ml-5" type="danger">删除</el-button>
-          </template>
-        </el-popconfirm>
-      </template>
-    </el-table-column>
-  </el-table>
-  <!-- 分页器 -->
-  <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
-                   :total="total"/>
-  </div>
+    <div style="margin-bottom: 20px">
+      <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="资讯名称"  size="default"
+                v-model="messageName"></el-input>
+      <el-button type="primary" @click="onSearch(messageName)" style="margin-right: 10px;" size="default">
+        搜索
+      </el-button>
+      <el-button type="warning" @click="reset" size="default">重置</el-button>
+    </div>
+    <!-- 数据展示 -->
+    <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
+              :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+              @select="selectChange"
+              :header-cell-style="{ 'text-align': 'center' }">
+      <el-table-column prop="id" label="编号" width="80">
+        <template #default="{ $index }">
+          {{ $index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="标题"></el-table-column>
+      <el-table-column prop="image" label="预览图" width="200">
+        <template #default="scope">
+          <div>
+            <img :src="downloadUrl + scope.row.image" alt="" style="height: 50px;">
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="publishTime" label="发布时间" width="150"></el-table-column>
+      <el-table-column label="操作" width="230px">
+        <template #default="scope">
+          <el-button size="small" @click="ReviseOrView(scope.row , 0)">
+            详情
+          </el-button>
+          <el-button size="small" @click="ReviseOrView(scope.row, 1)">
+            编辑
+          </el-button>
+          <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled"
+                         icon-color="red"
+                         title="是否确认删除" @confirm="deleteMessage(scope.row.id)" width=180>
+            <template #reference>
+              <el-button class="ml-5" type="danger">删除</el-button>
+            </template>
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页器 -->
+    <div style="padding: 10px 0">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+                     :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+                     :total="total"/>
+    </div>
   </div>
 </template>
 
@@ -87,7 +71,7 @@ const searchParams: any = ref({ //封装分页
   sortField: "id",  //根据ID分类
   sortOrder: "descend" //降序
 })
-const productName = ref('');
+const messageName = ref('');
 const tableData: any = ref([]);  //实体类商品表格
 const reload: any = inject("reload")  //页面重新刷新
 
@@ -167,7 +151,11 @@ const selectChange = (selection: any, row: any) => {   //selction是对象数组
 }
 
 //查询
-const onSearch = (value: string) => {}
+const onSearch = (value: string) => {
+  searchParams.value.title = value
+  searchParams.value.current = 1
+  getMessageList()
+}
 </script>
 
 <style scoped>
diff --git a/src/views/Commodity/MerchandiseCenter.vue b/src/views/Commodity/MerchandiseCenter.vue
index e4fd436..60bfef1 100644
--- a/src/views/Commodity/MerchandiseCenter.vue
+++ b/src/views/Commodity/MerchandiseCenter.vue
@@ -1,95 +1,93 @@
 <template>
-  <!-- 修改前请注释以前的 -->
-  <!-- 搜索 -->
   <div class="table_page">
-  <div>
-    <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"  size="default"
-              v-model="productName"></el-input>
-    <el-button type="primary" @click="onSearch(productName)" style="margin-right: 10px;" size="default">
-      搜索
-    </el-button>
-    <el-select v-model="productType" @change="(event: any) => searchByType(event)" placeholder="商品类别"
-               style="width: 240px;  margin-right: 10px;" size="default" :clearable="true">
-      <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value1"/>
-    </el-select>
-    <el-select v-model="state" placeholder="商品状态" @change="(event: any) => searchByState(event)" size="default"
-               style="width: 240px;  margin-right: 10px;">
-      <el-option label="已上架" value="1"/>
-      <el-option label="已下架" value="0"/>
-    </el-select>
-    <el-button type="warning" @click="reset" size="default">重置</el-button>
-  </div>
-  <div style="margin: 15px 0">
-    <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
-                   title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
-      <template #reference>
-        <el-button style="height: 25px" class="ml-5" type="danger">批量删除
-          <el-icon style="margin-left: 5px;">
-            <Remove/>
-          </el-icon>
-        </el-button>
-      </template>
-    </el-popconfirm>
-  </div>
-  <!-- 数据展示 -->
-  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
-            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
-            @select="selectChange"
-            :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column prop="id" label="商品编号" width="80">
-      <template #default="{ $index }">
-        {{ $index + 1 }}
-      </template>
-    </el-table-column>
-    <el-table-column prop="goodImg" label="商品图片">
-      <template #default="scope">
+    <div>
+      <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"  size="default"
+                v-model="productName"></el-input>
+      <el-button type="primary" @click="onSearch(productName)" style="margin-right: 10px;" size="default">
+        搜索
+      </el-button>
+      <el-select v-model="productType" @change="(event: any) => searchByType(event)" placeholder="商品类别"
+                 style="width: 240px;  margin-right: 10px;" size="default" :clearable="true">
+        <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value1"/>
+      </el-select>
+      <el-select v-model="state" placeholder="商品状态" @change="(event: any) => searchByState(event)" size="default"
+                 style="width: 240px;  margin-right: 10px;">
+        <el-option label="已上架" value="1"/>
+        <el-option label="已下架" value="0"/>
+      </el-select>
+      <el-button type="warning" @click="reset" size="default">重置</el-button>
+    </div>
+    <div style="margin: 15px 0">
+      <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
+                     title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
+        <template #reference>
+          <el-button style="height: 25px" class="ml-5" type="danger">批量删除
+            <el-icon style="margin-left: 5px;">
+              <Remove/>
+            </el-icon>
+          </el-button>
+        </template>
+      </el-popconfirm>
+    </div>
+    <!-- 数据展示 -->
+    <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
+              :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+              @select="selectChange"
+              :header-cell-style="{ 'text-align': 'center' }">
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" label="商品编号" width="80">
+        <template #default="{ $index }">
+          {{ $index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="goodImg" label="商品图片">
+        <template #default="scope">
           <img :src="downloadUrl + scope.row.goodImg.split(';')[0]" alt="" style="height: 50px;">
-      </template>
-    </el-table-column>
-    <el-table-column prop="name" label="商品名称"></el-table-column>
-    <el-table-column prop="price" label="商品价格" width="180">
-      <template #default="scope">
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="商品名称"></el-table-column>
+      <el-table-column prop="price" label="商品价格" width="180">
+        <template #default="scope">
           {{ scope.row.price }} 元
-      </template>
-    </el-table-column>
-    <el-table-column prop="type" label="商品类型"></el-table-column>
-    <el-table-column prop="inventory" label="商品数量"></el-table-column>
-    <el-table-column label="商品状态">
-      <template #default="scope">
+        </template>
+      </el-table-column>
+      <el-table-column prop="type" label="商品类型"></el-table-column>
+      <el-table-column prop="inventory" label="商品数量"></el-table-column>
+      <el-table-column label="商品状态">
+        <template #default="scope">
           <span style="margin-left: 10px" v-if="scope.row.isShelves == 1">上架</span>
           <span style="margin-left: 10px" v-if="scope.row.isShelves == 0">下架</span>
-      </template>
-    </el-table-column>
-    <el-table-column label="操作" width="250px">
-      <template #default="scope">
-        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
-          详情
-        </el-button>
-        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row, 1)">
-          编辑
-        </el-button>
-        <el-button size="small" @click="handleOff(scope.$index, scope.row)">
-          <div v-if="scope.row.isShelves == 1">下架</div>
-          <div v-if="scope.row.isShelves == 0">上架</div>
-        </el-button>
-        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled"
-                       icon-color="red"
-                       title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
-          <template #reference>
-            <el-button class="ml-5" type="danger">删除</el-button>
-          </template>
-        </el-popconfirm>
-      </template>
-    </el-table-column>
-  </el-table>
-  <!-- 分页器 -->
-  <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
-                   :total="total"/>
-  </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="250px">
+        <template #default="scope">
+          <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
+            详情
+          </el-button>
+          <el-button size="small" @click="ReviseOrView(scope.$index, scope.row, 1)">
+            编辑
+          </el-button>
+          <el-button size="small" @click="handleOff(scope.$index, scope.row)">
+            <div v-if="scope.row.isShelves == 1">下架</div>
+            <div v-if="scope.row.isShelves == 0">上架</div>
+          </el-button>
+          <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled"
+                         icon-color="red"
+                         title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
+            <template #reference>
+              <el-button class="ml-5" type="danger">删除</el-button>
+            </template>
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页器 -->
+    <div style="padding: 10px 0">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+                     :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+                     :total="total"/>
+    </div>
   </div>
 </template>
 
@@ -244,7 +242,11 @@ const selectChange = (selection: any, row: any) => {   //selction是对象数组
 }
 
 //查询
-const onSearch = (value: string) => {}
+const onSearch = (value: string) => {
+  searchParams.value.name = value
+  searchParams.value.current = 1
+  getProductList()
+}
 </script>
 
 <style scoped>
diff --git a/src/views/CostumeAppointments/ManagementCenter.vue b/src/views/CostumeAppointments/ManagementCenter.vue
index d9b7a13..adb9278 100644
--- a/src/views/CostumeAppointments/ManagementCenter.vue
+++ b/src/views/CostumeAppointments/ManagementCenter.vue
@@ -15,27 +15,6 @@
     </div>
     <el-button class="ml-5" type="primary" @click="onSearch(productName)" style="height: 30px;">搜索</el-button>
     <el-button type="warning" @click="reset" style="height:30px">重置</el-button>
-<!--    <div style="display: flex; justify-content: center; align-items: center; position: absolute; right: 40px;">-->
-<!--      <el-form-item label="摄影服务" prop="type" style="width: 240px; margin-top: 20px;  margin-right: 20px">-->
-<!--        <template #label>-->
-<!--          <span style="font-size: 16px; line-height: 36px">摄影服务</span>-->
-<!--        </template>-->
-<!--        <el-select v-model="value1" placeholder="选择摄影编号" @change="(event: any) => loadForm1(event)" :disabled="typeSelect" size="large">-->
-<!--          <el-option v-for="item in keysArray" :key="item" :label="item" :value="item" />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="妆造服务" prop="type" style="width: 240px; margin-top: 20px; margin-right: 20px">-->
-<!--        <template #label>-->
-<!--          <span style="font-size: 16px; line-height: 36px">妆造服务</span>-->
-<!--        </template>-->
-<!--        <el-select v-model="value2" placeholder="选择妆造编号" @change="(event: any) => loadForm2(event)" :disabled="typeSelect" size="large">-->
-<!--          <el-option v-for="item in keysArray" :key="item" :label="item" :value="item" />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-
-<!--      <el-button class="ml-5" type="primary" @click="editSpecialProducts" :disabled="isBtnShow1" style="height: 30px;">编辑</el-button>-->
-<!--      <el-button type="success" @click="saveSpecialProducts" :disabled="isBtnShow2" style="height:30px">保存</el-button>-->
-<!--    </div>-->
   </div>
   <div style="margin: 15px 0">
     <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
diff --git a/src/views/Coupons/AddCoupons.vue b/src/views/Coupons/AddCoupons.vue
index a5a46e9..49f8938 100644
--- a/src/views/Coupons/AddCoupons.vue
+++ b/src/views/Coupons/AddCoupons.vue
@@ -1,41 +1,39 @@
 <template>
-  <el-form ref="resetFormData" :model="form" label-width="auto" style="width: 750px" size="large">
-  </el-form>
-  <el-form :model="form" label-width="auto" style="max-width: 600px" size="large">
-    <el-form-item label="优惠券名称">
-      <el-input v-model="form.name" style="width: 200px"/>
-    </el-form-item>
-    <el-form-item label="兑换积分" prop="price">
-      <el-input-number v-model="form.requirePoints" min="0"  :step="1" />
-      <el-text class="mx-1" size="large">积分</el-text>
-    </el-form-item>
-    <el-form-item label="满减价格" prop="standardAmount">
-      <el-input-number v-model="form.standardAmount" min="0.01" :precision="2" :step="1" />
-      <el-text class="mx-1" size="large">元</el-text>
-    </el-form-item>
-    <el-form-item label="优惠价格" prop="conditionAmount">
-      <el-input-number v-model="form.conditionAmount" min="0.01" :precision="2" :step="1" />
-      <el-text class="mx-1" size="large">元</el-text>
-    </el-form-item>
-    <el-form-item label="截至日期">
-      <el-date-picker
-          v-model="form.endTime"
-          type="datetime"
-          placeholder="Pick a Date"
-          format="YYYY-MM-DD hh:mm:ss"
-          value-format="YYYY-MM-DD hh:mm:ss"
-      />
-    </el-form-item>
-    <el-form-item label="简介">
-      <el-input v-model="form.content" type="textarea" maxlength="20" :rows="2"/>
-    </el-form-item>
-    <el-form-item label="使用说明">
-      <el-input v-model="form.description" type="textarea" maxlength="100" :rows="4"/>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="AddCoupon">提交</el-button>
-    </el-form-item>
-  </el-form>
+  <div class="flexCard">
+    <el-card class="form-container" shadow="never" >
+      <el-form ref="resetFormData" :model="form" label-width="auto" style="width: 750px" size="large">
+      </el-form>
+      <el-form :model="form" label-width="auto" style="max-width: 600px" size="large">
+        <el-form-item label="优惠券名称">
+          <el-input v-model="form.name" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="兑换积分" prop="price">
+          <el-input-number v-model="form.requirePoints" min="0"  :step="1" />
+          <el-text class="mx-1" size="large">积分</el-text>
+        </el-form-item>
+        <el-form-item label="满减价格" prop="standardAmount">
+          <el-input-number v-model="form.standardAmount" min="0.01" :precision="2" :step="1" />
+          <el-text class="mx-1" size="large">元</el-text>
+        </el-form-item>
+        <el-form-item label="优惠价格" prop="conditionAmount">
+          <el-input-number v-model="form.conditionAmount" min="0.01" :precision="2" :step="1" />
+          <el-text class="mx-1" size="large">元</el-text>
+        </el-form-item>
+        <el-form-item label="截至日期">
+          <el-date-picker
+              v-model="form.endTime"
+              type="datetime"
+              placeholder="Pick a Date"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD hh:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="AddCoupon" style="margin-left: 160px">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -49,9 +47,7 @@ const form = ref({
   standardAmount:0,//满
   conditionAmount:0,//减
   requirePoints:0,
-  endTime: '',
-  content:'',
-  description:'',
+  endTime: ''
 })
 onMounted(() => {
 
@@ -80,6 +76,14 @@ const AddCoupon = async () => {
 
 
 <style scoped>
-
-
+.flexCard {
+  display: flex;
+  height: 100%;
+  min-width: 800px;
+  margin: 0 auto;
+}
+.form-container {
+  width: 700px;
+  margin: 0 auto;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/Coupons/CouponCenter.vue b/src/views/Coupons/CouponCenter.vue
index e95e624..abe258d 100644
--- a/src/views/Coupons/CouponCenter.vue
+++ b/src/views/Coupons/CouponCenter.vue
@@ -1,60 +1,60 @@
 <template>
-  <!--  搜索-->
-  <div>
-    <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入优惠券名称"
-              v-model="name"></el-input>
-    <el-button class="ml-5" type="primary" @click="load(name)" size="default">搜索</el-button>
-    <el-button type="warning" @click="reset" size="default">重置</el-button>
-  </div>
-  <!--  批量删除-->
-  <div style="margin: 15px 0">
-    <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
-                   title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
-      <template #reference>
-        <el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">
-          <Remove />
-        </el-icon></el-button>
-      </template>
-    </el-popconfirm>
-  </div>
-  <!--  数据展示-->
-  <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
-            :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
-            :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column prop="name" label="优惠券名称"></el-table-column>
-<!--    <el-table-column prop="content" label="简介"></el-table-column>-->
-    <el-table-column prop="standardAmount" label="满减价格"></el-table-column>
-    <el-table-column prop="conditionAmount" label="优惠价格"></el-table-column>
-    <el-table-column prop="requirePoints" label="兑换积分"></el-table-column>
-    <el-table-column prop="endTime" label="截止时间"></el-table-column>
-    <el-table-column prop="status" label="状态"></el-table-column>
-    <el-table-column label="操作" width="200px" >
-      <template #default="scope">
-        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
-          详情
-        </el-button>
-        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row, 1)">
-          编辑
-        </el-button>
-        <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
-                       title="是否确认删除" @confirm="deleteCoupons(scope.row.id)" width=180>
-          <template #reference>
-            <el-button  class="ml-5" type="danger">删除</el-button>
-          </template>
-        </el-popconfirm>
-        <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
-                       title="您确定删除吗？">
-        </el-popconfirm>
-      </template>
-    </el-table-column>
-  </el-table>
-  <!--  分页-->
-  <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
-                   :total="total" />
+  <div class="table_page">
+    <div>
+      <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入优惠券名称"
+                v-model="name"></el-input>
+      <el-button class="ml-5" type="primary" @click="load(name)" size="default">搜索</el-button>
+      <el-button type="warning" @click="reset" size="default">重置</el-button>
+    </div>
+    <!--  批量删除-->
+    <div style="margin: 15px 0">
+      <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
+                     title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
+        <template #reference>
+          <el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">
+            <Remove />
+          </el-icon></el-button>
+        </template>
+      </el-popconfirm>
+    </div>
+    <!--  数据展示-->
+    <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
+              :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+              :header-cell-style="{ 'text-align': 'center' }">
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="name" label="优惠券名称"></el-table-column>
+      <el-table-column prop="standardAmount" label="满减价格"></el-table-column>
+      <el-table-column prop="conditionAmount" label="优惠价格"></el-table-column>
+      <el-table-column prop="requirePoints" label="兑换积分"></el-table-column>
+      <el-table-column prop="endTime" label="截止时间"></el-table-column>
+      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column label="操作" width="200px" >
+        <template #default="scope">
+          <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
+            详情
+          </el-button>
+          <el-button size="small" @click="ReviseOrView(scope.$index, scope.row, 1)">
+            编辑
+          </el-button>
+          <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
+                         title="是否确认删除" @confirm="deleteCoupons(scope.row.id)" width=180>
+            <template #reference>
+              <el-button  class="ml-5" type="danger">删除</el-button>
+            </template>
+          </el-popconfirm>
+          <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+                         title="您确定删除吗？">
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--  分页-->
+    <div style="padding: 10px 0">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+                     :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+                     :total="total" />
+    </div>
   </div>
   <!--  详情，编辑-->
   <el-dialog v-model="DialogVisible" :title="title">
@@ -62,11 +62,6 @@
       <el-form-item label="优惠券名称" style="width: 400px">
         <el-input v-model="editForm.name"></el-input>
       </el-form-item>
-
-      <el-form-item label="简介" style="width: 400px">
-        <el-input v-model="editForm.content" type="textarea" maxlength="20" :rows="2"></el-input>
-      </el-form-item>
-
       <el-form-item label="满减价格">
         <el-input-number v-model="editForm.standardAmount" min="0.01" :precision="2" :step="1" />
         <el-text class="mx-1" size="large">元</el-text>
@@ -92,11 +87,6 @@
             value-format="YYYY-MM-DD hh:mm:ss"
         />
       </el-form-item>
-
-      <el-form-item label="使用说明" style="width: 600px">
-        <el-input v-model="editForm.description" type="textarea" maxlength="100" :rows="4"></el-input>
-      </el-form-item>
-
     </el-form>
     <template #footer >
       <span class="dialog-footer">
@@ -217,12 +207,15 @@ const deleteCoupons = async (index: number) => {
       type: 'success',
       message: '删除成功',
     })
-    getCouponsList()
+    await getCouponsList()
   }
 }
 
 </script>
 
 <style>
-
+.table_page {
+  min-width: 1000px;
+  overflow: auto;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 2086e6f..2cba877 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,26 +1,26 @@
 <template>
-    <div class="wrapper">
-      <div style="margin: 200px auto; background-color: #fff; width: 800px; height: 400px; border-radius: 10px">
-        <div >
-          <img
-              class="image"
-              style="height: 400px;width: 300px;float: left;"
-              src="../img/Login/login_top.png"
-          />
-        </div>
-        <div style="height: 400px;width: 430px;float: left;margin:30px 0 0 40px;">
-          <div style="margin: 20px 0; text-align: center; font-size: 24px"><b>匠承非遗后台管理系统</b></div>
-          <el-form :model="user"  ref="userForm">
-            <el-form-item prop="username">
-              <h2>账号</h2>
-              <el-input size="large" style="margin: 10px 0" :prefix-icon="User" v-model="username"></el-input>
-            </el-form-item>
-            <el-form-item prop="password">
-              <h2>密码</h2>
-              <el-input size="large" style="margin: 10px 0;" :prefix-icon="Lock" show-password v-model="password"></el-input>
-            </el-form-item>
-            <div style="margin: 10px 0; text-align: right">
-              <div  style="display: block;
+  <div class="wrapper">
+    <div style="margin: 200px auto; background-color: #fff; width: 800px; height: 400px; border-radius: 10px">
+      <div >
+        <img
+            class="image"
+            style="height: 400px;width: 300px;float: left;"
+            src="../img/Login/login_top.png"
+        />
+      </div>
+      <div style="height: 400px;width: 430px;float: left;margin:30px 0 0 40px;">
+        <div style="margin: 20px 0; text-align: center; font-size: 24px"><b>匠承非遗后台管理系统</b></div>
+        <el-form :model="user"  ref="userForm">
+          <el-form-item prop="username">
+            <h2>账号</h2>
+            <el-input size="large" style="margin: 10px 0" :prefix-icon="User" v-model="username"></el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <h2>密码</h2>
+            <el-input size="large" style="margin: 10px 0;" :prefix-icon="Lock" show-password v-model="password"></el-input>
+          </el-form-item>
+          <div style="margin: 10px 0; text-align: right">
+            <div  style="display: block;
                     font-size: 15px;
                     width: 80%;
                     margin: 35px  auto 0 auto;
@@ -29,59 +29,77 @@
                     background-color: rgb(172, 115, 82);
                     line-height: 40px;
                     " @click="Login">登录</div>
-            </div>
-          </el-form>
-          <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备2024274839号</a>
-        </div>
+          </div>
+        </el-form>
+
       </div>
     </div>
-  </template>
-  
-  <script setup lang="ts">
-  import { ref } from 'vue'
-  import { ElMessage } from 'element-plus'
-  import { SuccessInfo, ErrorInfo, WarnInfo, CommInfo  } from '@/utils/messageInfo';
-  import {useRouter} from 'vue-router'
-  import myAxios from '@/api/myAxios';
-  import { userStore } from '../store/userStore';
-  import { User , Lock} from '@element-plus/icons-vue'
+    <div class="RecordNumber">
+      <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备2024274839号</a>
+    </div>
+  </div>
+</template>
 
-  const user = ref({})
-  const username = ref('')
-  const password = ref('')
-  const router = useRouter()
-  const store = userStore()
- 
+<script setup lang="ts">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { SuccessInfo, ErrorInfo, WarnInfo, CommInfo  } from '@/utils/messageInfo';
+import {useRouter} from 'vue-router'
+import myAxios from '@/api/myAxios';
+import { userStore } from '../store/userStore';
+import { User , Lock} from '@element-plus/icons-vue'
 
-  const Login = async ()=>{
-    if(username.value === '' || password.value === '') {
-      ErrorInfo('检查账号或密码是否成功填写')
-      return;
-    }
-    const res: any = await myAxios.post("/user/login",{
-      userAccount: username.value,
-      userPassword: password.value
-    })
-    // console.log(res.data)
-    if(res.data.code === 1 && res ?.data) {
-      SuccessInfo('登陆成功')
-      //将用户信息放入pinia
-      await store.getLoginUser(res.data.data)
-      //跳转仪表盘
-      await router.replace('/DashBoard')
-    } else {
-      WarnInfo(res.data.message)
-    return;  //空返回结束函数
-    }
+const user = ref({})
+const username = ref('')
+const password = ref('')
+const router = useRouter()
+const store = userStore()
+
+
+const Login = async ()=>{
+  if(username.value === '' || password.value === '') {
+    ErrorInfo('检查账号或密码是否成功填写')
+    return;
   }
-  </script>
-  
-  <style scoped>
-    .wrapper{
-      height: 100vh;
-      background-image:url(https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FzGMkHxQk-login.png);
-      background-size: 100% 100%;
-      background-repeat: no-repeat;
-      overflow: hidden;
-    }
-  </style>
\ No newline at end of file
+  const res: any = await myAxios.post("/user/login",{
+    userAccount: username.value,
+    userPassword: password.value
+  })
+  // console.log(res.data)
+  if(res.data.code === 1 && res ?.data) {
+    SuccessInfo('登陆成功')
+    //将用户信息放入pinia
+    await store.getLoginUser(res.data.data)
+    //跳转仪表盘
+    await router.replace('/DashBoard')
+  } else {
+    WarnInfo(res.data.message)
+    return;  //空返回结束函数
+  }
+}
+</script>
+
+<style scoped>
+.wrapper{
+  height: 100vh;
+  background-image:url(https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FzGMkHxQk-login.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  overflow: auto;
+}
+
+a {
+  text-decoration: none;
+  color: #cccccc;
+}
+
+a:link a:visited {
+  color: #cccccc;
+}
+
+.RecordNumber {
+  /*height: 100px;*/
+  text-align: center;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/OutfitLease/AddOutfit.vue b/src/views/OutfitLease/AddOutfit.vue
index 97ba9d4..e2776f3 100644
--- a/src/views/OutfitLease/AddOutfit.vue
+++ b/src/views/OutfitLease/AddOutfit.vue
@@ -99,6 +99,7 @@ const onSubmit = async () => {
     richText: form.value.richText,
     isShelves: form.value.isShelves ? 1 : 0
   })
+  console.log('后端--->',res.data)
   if (res.data.code === 1) {
     SuccessInfo('提交成功')
     form.value = {}
diff --git a/src/views/OutfitLease/LeaseOutfitCenter.vue b/src/views/OutfitLease/LeaseOutfitCenter.vue
index 7198bc8..f1a1dd8 100644
--- a/src/views/OutfitLease/LeaseOutfitCenter.vue
+++ b/src/views/OutfitLease/LeaseOutfitCenter.vue
@@ -1,6 +1,4 @@
 <template>
-  <!-- 修改前请注释以前的 -->
-  <!-- 搜索 -->
   <div class="table_page">
     <div>
       <el-input style="width: 240px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入服装名称"  size="default"
@@ -10,7 +8,7 @@
       </el-button>
       <el-select v-model="outfitType" @change="(event: any) => searchByType(event)" placeholder="服装类别"
                  style="width: 240px;  margin-right: 10px;" size="default" :clearable="true">
-<!--        <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"/>-->
+        <el-option v-for="(item,index) in typeList" :key="index" :label="item.label" :value="item.value"/>
       </el-select>
       <el-select v-model="state" placeholder="服装状态" @change="(event: any) => searchByState(event)" size="default"
                  style="width: 240px;  margin-right: 10px;">
@@ -164,7 +162,7 @@ const getOutfitList = async () => {
 }
 const getTypeList = async () => {
   const res = await myAxios.post('/clothesCategory/list/web', {})  //获取商品列表
-  // console.log('类别--->',res.data)
+  console.log('类别--->',res.data)
   for (let key in res.data.data) {     //循环赋值
     typeList.value[key] = {
       value: res.data.data[key].id,
@@ -175,7 +173,7 @@ const getTypeList = async () => {
 }
 
 const searchByType = (event: any) => { //通过类别搜索
-  searchParams.value.type = event
+  searchParams.value.categoryId = event
   searchParams.value.current = 1
   getOutfitList()
 }
@@ -268,7 +266,11 @@ const selectChange = (selection: any, row: any) => {   //selction是对象数组
 }
 
 //查询
-const onSearch = (value: string) => {}
+const onSearch = (value: string) => {
+  searchParams.value.name = value
+  searchParams.value.current = 1
+  getOutfitList()
+}
 </script>
 
 <style scoped>
diff --git a/src/views/ServiceType/ProductCenter.vue b/src/views/ServiceType/ProductCenter.vue
index 4987777..4022f1c 100644
--- a/src/views/ServiceType/ProductCenter.vue
+++ b/src/views/ServiceType/ProductCenter.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="table_page">
   <div style="display: flex; align-items: center">
-    <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入课程名称"
+    <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入课程名称" size="large"
       v-model="productName"></el-input>
     <div>
       <el-form-item label="" style="width: 200px; margin: 3px 10px 0 0;display: inline-block;">
diff --git a/src/views/User/UserManagement.vue b/src/views/User/UserManagement.vue
index 377cf79..da85a32 100644
--- a/src/views/User/UserManagement.vue
+++ b/src/views/User/UserManagement.vue
@@ -1,39 +1,41 @@
 <template>
-  <div style="margin: 10px 0">
-    <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入用户名"
-      v-model="username"></el-input>
-    <el-button class="ml-5" type="primary" @click="onSearch(username)" size="default">搜索</el-button>
-    <el-button type="warning" @click="reset" size="default">重置</el-button>
-  </div>
-  <el-table :data="tableData" border stripe header-cell-class-name="headerBg" :cell-style="{ textAlign: 'center' }"
-    @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column prop="id" label="序号" width="50">
-      <template #default="{ $index }">
-        {{ $index + 1 }}
-      </template>
-    </el-table-column>
-    <el-table-column prop="userName" label="用户昵称"></el-table-column>
-    <el-table-column prop="userAvatar" label="头像">
-      <template #default="scope"><img :src="downloadUrl + scope.row.userAvatar" alt="" style="height: 50px;"></template>
-    </el-table-column>
-    <el-table-column prop="userRole" label="身份">
-      <template #default="scope">
-        {{ scope.row.userRole === 'boss' ? '管理员' : '小程序用户' }}
-      </template>
-    </el-table-column>
-    <el-table-column label="操作">
-      <template #default="scope">
-        <el-button size="small" @click="checkDetail(scope.row,0)">详情</el-button>
-        <el-button size="small" type="primary" @click="checkDetail(scope.row,1)">编辑</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-  <!-- 分页查询 -->
-  <div style="padding: 10px 0">
-    <el-pagination :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[2, 5, 10, 20]"
-      @size-change="handleSizeChange" @current-change="handleCurrentChange" :small="null" background
-      layout="total, sizes, prev, pager, next, jumper" :total="total" />
+  <div class="table_page">
+    <div style="margin: 10px 0">
+      <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入用户名"
+                v-model="username"></el-input>
+      <el-button class="ml-5" type="primary" @click="onSearch(username)" size="default">搜索</el-button>
+      <el-button type="warning" @click="reset" size="default">重置</el-button>
+    </div>
+    <el-table :data="tableData" border stripe header-cell-class-name="headerBg" :cell-style="{ textAlign: 'center' }"
+              @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" label="序号" width="50">
+        <template #default="{ $index }">
+          {{ $index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="userName" label="用户昵称"></el-table-column>
+      <el-table-column prop="userAvatar" label="头像">
+        <template #default="scope"><img :src="downloadUrl + scope.row.userAvatar" alt="" style="height: 50px;"></template>
+      </el-table-column>
+      <el-table-column prop="userRole" label="身份">
+        <template #default="scope">
+          {{ scope.row.userRole === 'boss' ? '管理员' : '小程序用户' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button size="small" @click="checkDetail(scope.row,0)">详情</el-button>
+          <el-button size="small" type="primary" @click="checkDetail(scope.row,1)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页查询 -->
+    <div style="padding: 10px 0">
+      <el-pagination :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[2, 5, 10, 20]"
+                     @size-change="handleSizeChange" @current-change="handleCurrentChange" :small="null" background
+                     layout="total, sizes, prev, pager, next, jumper" :total="total" />
+    </div>
   </div>
 </template>
 
@@ -123,4 +125,8 @@ const checkDetail = (obj: any, flag : any) => {   //查看详情方法
 .headerBg {
   background-color: #eee !important;
 }
+.table_page {
+  min-width: 800px;
+  overflow: auto;
+}
 </style>
\ No newline at end of file