最新版本代码提交

src/api/table.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getList(data) {
   return request({
-    url: '/wagoo/1.1/get/order_details',
+    url: '/get/order_details',
     method: 'post',
     data,
   })
@@ -10,7 +10,7 @@ export function getList(data) {
 
 export function  goodsListList(data) {
   return request({
-    url: '/wagoo/1.1/get/membership_instances',
+    url: '/get/membership_instances',
     method: 'post',
     data,
   })
@@ -18,7 +18,7 @@ export function  goodsListList(data) {
 
 export function  walletList(data) {
   return request({
-    url: '/wagoo/1.1/get/wallet_instances',
+    url: '/get/wallet_instances',
     method: 'post',
     data,
   })
@@ -26,7 +26,55 @@ export function  walletList(data) {
 
 export function archiveList(data) {
   return request({
-    url: '/wagoo/1.1/get/pets',
+    url: '/get/pets',
+    method: 'post',
+    data,
+  })
+}
+
+export function commentList(data) {
+  return request({
+    url: '/get/comments_info',
+    method: 'post',
+    data,
+  })
+}
+
+export function messageList(data) {
+  return request({
+    url: '/get/notice',
+    method: 'post',
+    data,
+  })
+}
+
+export function couponList(data) {
+  return request({
+    url: '/get/coupons',
+    method: 'post',
+    data,
+  })
+}
+
+export function couponPackage(data) {
+  return request({
+    url: '/coupon/package',
+    method: 'post',
+    data,
+  })
+}
+
+export function unreadOtice(data) {
+  return request({
+    url: '/unread_notice',
+    method: 'post',
+    data,
+  })
+}
+
+export function markNotice(data) {
+  return request({
+    url: '/update/notice',
     method: 'post',
     data,
   })
@@ -34,9 +82,11 @@ export function archiveList(data) {
 
 
 
+
+
 export function  recordList(data) {
   return request({
-    url: '/wagoo/1.1/get/delivery',
+    url: '/get/delivery',
     method: 'post',
     data,
   })
@@ -44,7 +94,7 @@ export function  recordList(data) {
 
 export function  couponstList(data) {
   return request({
-    url: '/wagoo/1.1/get/coupons',
+    url: '/get/coupons',
     method: 'post',
     data,
   })
@@ -52,7 +102,7 @@ export function  couponstList(data) {
 
 export function  additional(data) {
   return request({
-    url: '/wagoo/1.1/get/additional_services',
+    url: '/get/additional_services',
     method: 'post',
     data,
   })
@@ -61,7 +111,7 @@ export function  additional(data) {
 
 export function distributeEdit(data) {
   return request({
-    url: '/wagoo/1.1/delivery/coupons',
+    url: '/delivery/coupons',
     method: 'post',
     data,
   })
@@ -69,7 +119,15 @@ export function distributeEdit(data) {
 
 export function exportUserOperateAdmin(data, headers) {
   return request({
-    url: '/wagoo/1.1/download/order_details',
+    url: '/download/order_details',
+    method: 'get',
+    data: data,
+  })
+}
+
+export function exportUserMembership(data, headers) {
+  return request({
+    url: '/download/membership_instances',
     method: 'get',
     data: data,
   })
@@ -77,7 +135,7 @@ export function exportUserOperateAdmin(data, headers) {
 
 export function doEdit(data) {
   return request({
-    url: '/wagoo/1.1/update/order_details',
+    url: '/update/order_details',
     method: 'post',
     data,
   })
@@ -85,12 +143,38 @@ export function doEdit(data) {
 
 export function additionalEdit(data) {
   return request({
-    url: '/wagoo/1.1/update/additional_services',
+    url: '/update/additional_services',
     method: 'post',
     data,
   })
 }
 
+export function addPackage(data) {
+  return request({
+    url: '/add/package',
+    method: 'post',
+    data,
+  })
+}
+
+export function editPackage(data) {
+  return request({
+    url: '/edit/package',
+    method: 'post',
+    data,
+  })
+}
+
+export function deletePackage(data) {
+  return request({
+    url: '/delete/package',
+    method: 'post',
+    data,
+  })
+}
+
+
+
 
 export function doDelete(data) {
   return request({

src/api/user.js

@@ -8,7 +8,14 @@ export async function login(data) {
   // }
 
   return request({
-    url: '/wagoo/1.1/admin/login',
+    url: '/admin/login',
+    method: 'post',
+    data,
+  })
+}
+export function  members(data) {
+  return request({
+    url: '/daily/new_membership_number',
     method: 'post',
     data,
   })
@@ -16,7 +23,7 @@ export async function login(data) {
 
 export function getUserInfo(accessToken) {
   return request({
-    url: '/wagoo/1.1/get/user_info',
+    url: '/get/user_info',
     method: 'post',
     data: {
       [tokenName]: accessToken,
@@ -26,7 +33,7 @@ export function getUserInfo(accessToken) {
 
 export function logout() {
   return request({
-    url: '/wagoo/1.1/admin/logout',
+    url: '/admin/logout',
     method: 'post',
   })
 }

src/config/net.config.js

@@ -3,7 +3,11 @@
  **/
 const network = {
   // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server，当然你也可以选择自己配置成需要的接口地址
-  baseURL: process.env.NODE_ENV === 'development' ? 'console2.wagoo.pet/' : 'console2.wagoo.pet/',
+  // 生产环境
+  // baseURL: process.env.NODE_ENV === 'development' ? 'https://console2api.wagoo.pet/' : 'https://console2api.wagoo.pet/',  
+  // 测试环境
+  baseURL: process.env.NODE_ENV === 'development' ? 'https://dev.wagoo.pet/wagoo/1.1/' : 'https://dev.wagoo.pet/wagoo/1.1/',
+
   //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
   contentType: 'application/json;charset=UTF-8',
   //消息框消失时间

src/layouts/components/VabTabs/index.vue

@@ -9,13 +9,62 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dropdown @command="handleCommand">
+    <el-dropdown >
-      <span style="cursor: pointer">
+      <div @mouseenter="handleMouseEnter">
-        更多操作
+        <i class="el-icon-message-solid el-icon--right"></i>
-        <i class="el-icon-arrow-down el-icon--right"></i>
+      <span style="cursor: pointer;" >
+        消息
       </span>
+      <span style="color:red;">({{messageList.length + total }})</span>
+      </div>
       <el-dropdown-menu slot="dropdown" class="tabs-more">
-        <el-dropdown-item command="closeOtherstabs">
+        <div style="display: flex;justify-content: center;margin-top:20px;">
+       <h3 class="message">
+           消息通知
+     </h3>
+      <span style="color:red;">({{ messageList.length + total }})</span>
+        </div>
+
+          <div class="allmark" @click="allRead" v-if="messageList.length + total != 0 ">
+        <p class="y">全部已读</p>
+           <!-- <img class="gg" alt="" src="@/assets/g.png"  /> -->
+      </div>
+
+          <div class="order" v-for="(item, index) in list"
+            :key="item.id">
+      <div :class="[ markIndex2 == index? ' order-item' : 'order-item2'  ]" @mouseenter="marklist2(item,index)" @mouseleave="handleMouseLeave">
+        <div class="tick">
+            <div class="time">
+       {{item.created_at}}
+      </div>
+        <div class="mark" v-if="markIndex2 == index" @click="markRead(item)">
+        <p class="y">标记已读</p>
+           <img class="gg" alt="" src="@/assets/g.png"  />
+      </div>
+        </div>
+      <div class="od-item2">
+       {{item.content}}
+      </div>
+      </div>
+     </div>
+     <div class="order" v-for="(item, index) in messageList"
+            :key="index">
+      <div :class="[ markIndex == index? ' order-item' : 'order-item2'  ]" @mouseenter="marklist(item,index)" @mouseleave="handleMouseLeave2">
+        <div class="tick">
+            <div class="time">
+       {{item.date}}
+      </div>
+        <div class="mark" v-if="markIndex == index" @click="markRead2(item)">
+        <p class="y">标记已读</p>
+           <img class="gg" alt="" src="@/assets/g.png"  />
+      </div>
+        </div>
+      <div class="od-item2">
+       {{item.content}}
+      </div>
+      </div>
+     </div>
+        <!-- <el-dropdown-item command="closeOtherstabs">
           <vab-icon :icon="['fas', 'times-circle']" />
           关闭其他
         </el-dropdown-item>
@@ -30,7 +79,7 @@
         <el-dropdown-item command="closeAlltabs">
           <vab-icon :icon="['fas', 'ban']"></vab-icon>
           关闭全部
-        </el-dropdown-item>
+        </el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
   </div>
@@ -39,13 +88,23 @@
 <script>
   import path from 'path'
   import { mapGetters } from 'vuex'
+  import { unreadOtice,markNotice } from '@/api/table'
+  
 
   export default {
     name: 'VabTabs',
     data() {
       return {
+        list:[],
+        total:'',
         affixtabs: [],
         tabActive: '',
+        markIndex:-1,
+        markIndex2:-1,
+        mark:false,
+         messages: [],
+      ws: null,
+      messageList:[]
       }
     },
 
@@ -71,10 +130,119 @@
         immediate: true,
       },
     },
+    created(){
+ this.connect();
+ this.fetchData()
+ 
+    },
     mounted() {
       //console.log(this.visitedRoutes);
     },
     methods: {
+        async fetchData() {
+        this.listLoading = true
+        const { data, total } = await unreadOtice(this.queryForm)
+        this.list = data
+        console.log( this.list,'--')
+        this.total = total
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 500)
+      },
+         connect() {
+      this.ws = new WebSocket('wss://dev.wagoo.pet/wagoo/1.1/ws/admin'); // 确保使用wss（加密的WebSocket）或ws（非加密的WebSocket）
+      this.ws.onopen = this.onOpen;
+      this.ws.onmessage = this.onMessage;
+      this.ws.onerror = this.onError;
+      this.ws.onclose = this.onClose;
+    },
+    onOpen() {
+      console.log('已经链接到服务');
+      setTimeout(() => {
+         this.ws.send('Hello Server!');
+        }, 500)
+       
+    },
+    onMessage(event) {
+      // console.log(event,'--')
+      this.messageList.push(JSON.parse(event.data))
+       this.messageList.reverse()
+      console.log( this.messageList,'什么东东')
+      // console.log( this.messageList,'???')
+      // const message = JSON.parse(event.data);
+      // this.messages.push(message); // 更新消息列表
+    },
+    onError(event) {
+      console.error('WebSocket连接出错:', event);
+    },
+    onClose(event) {
+      console.log('WebSocket连接已关闭', event);
+
+      this.connect()
+      // 可以在这里重新连接，例如使用setTimeout或setInterval
+    },
+    disconnect() {
+      if (this.ws) {
+        this.ws.close();
+      }
+    },
+  beforeDestroy() {
+    this.disconnect(); // 组件销毁时关闭WebSocket连接
+  },
+async  markRead(it){
+  const queryForm = {
+    id:it.id
+  }
+   const res = await markNotice(queryForm)
+   if(res.code === 200){
+    this.fetchData()
+   }
+    // console.log(it,'??')
+
+  },
+
+   async  allRead(){
+     this.messageList = []
+     const queryForm = {
+    id:'0'
+  }
+      const res = await markNotice(queryForm)
+       if(res.code === 200){
+    this.fetchData()
+   }
+  },
+  async  markRead2(it){
+    console.log(it,'?')
+  const queryForm = {
+    id:it.id
+  }
+   const res = await markNotice(queryForm)
+    if(res.code === 200){
+    this.fetchData()
+   }
+    // console.log(it,'??')
+
+  },
+      marklist(item,index){
+        this.markIndex = index
+//  console.log( item);
+      },
+       marklist2(item,index){
+        this.markIndex2 = index
+//  console.log( item);
+      },
+      handleMouseLeave2(){
+ this.markIndex = -1
+      },
+      handleMouseLeave(){
+        // console.log(111)
+  this.markIndex2 = -1
+      },
+     handleMouseEnter(event) {
+      // this.fetchData()
+      // console.log('鼠标移入事件被触发', event);
+      // 在这里编写你的处理代码
+    },
       async handleTabRemove(tabActive) {
         let view
         this.visitedRoutes.forEach((item, index) => {
@@ -361,6 +529,7 @@
             }
 
             &:hover {
+              
               color: rgba(255, 255, 255, 0.95);
               background: $base-color-default;
               border-color: $base-color-default;
@@ -429,6 +598,138 @@
 
 <style lang="scss">
   .tabs-more {
+    border-radius:15px;
+      width: 550px;
+      height: 550px;
+      position: relative;
+       overflow: auto;
+          .allmark{
+          font-size: 12px;
+          padding: 0 10px;
+          position: absolute;
+          right: 10px;
+          top: 20px;
+          // width: 60px;
+          height: 30px;
+        border: 1px solid #ccc;
+        font-weight: 600;
+        border-radius: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .gg{
+          width: 15px;
+          height: 15px;
+        }
+        }
+      .message{
+        display: flex;
+        justify-content: center;
+        margin: 0;
+        // display: inline-block;
+      }
+      .order{
+        padding:0 20px 0 20px;
+       
+        .od-item{
+          color:#9B939A;
+          margin-top: 30px;
+
+        }
+        .order-item{
+          border-radius: 5px;
+          margin-top: 10px;
+          background: #fbf9f9;
+          height: 50px;
+          padding: 5px;
+          position: relative;
+          .tick{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .mark{
+              position: absolute;
+              right: 10px;
+              top: 10px;
+          font-size: 12px;
+          padding: 0 10px;
+          // width: 60px;
+          height: 30px;
+        border: 1px solid #ccc;
+        font-weight: 600;
+        border-radius: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .gg{
+          width: 15px;
+          height: 15px;
+          margin-left: 4px;
+        }
+        }
+          .time{
+          display: flex;
+          justify-content: center;
+          font-size: 12px;
+           color:#887a86;
+        }
+
+          }
+         
+        .od-item2{
+          color:#353535;
+          margin-top: 10px;
+        }
+        
+
+        }
+         .order-item2{
+          margin-top: 10px;
+          height: 50px;
+          padding: 5px;
+          position: relative;
+          .tick{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .mark{
+          font-size: 12px;
+          padding: 0 10px;
+          position: absolute;
+          right: 10px;
+          top: 10px;
+          // width: 60px;
+          height: 30px;
+        border: 1px solid #ccc;
+        font-weight: 600;
+        border-radius: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .gg{
+          width: 15px;
+          height: 15px;
+        }
+        }
+          .time{
+          display: flex;
+          justify-content: center;
+          font-size: 12px;
+           color:#887a86;
+        }
+
+          }
+         
+        .od-item2{
+          color:#353535;
+          margin-top: 10px;
+        }
+        
+
+        }
+       
+      }
+   
     .el-dropdown-menu__item {
       padding: 8px 20px;
       font-size: 14px;

src/main.js

@@ -12,6 +12,10 @@ import { printLayoutsInfo } from '@/utils/printInfo'
  */
 
 // 检测环境变量或默认使用mock
+// 生产环境
+// const useMock = process.env.VUE_APP_MOCK_ENABLE === 'true' || process.env.NODE_ENV === 'development'
+
+// 测试环境
 const useMock = process.env.VUE_APP_MOCK_ENABLE === 'true' || process.env.NODE_ENV === 'production'
 if (useMock) {
   // 使用动态import替代require

src/router/index.js

@@ -53,6 +53,27 @@ export const asyncRoutes = [
       },
     ],
   },
+  {
+    path: '/message',
+    component: Layout,
+    redirect: 'noRedirect',
+    name: 'Message',
+    meta: {
+      title: '消息管理',
+      icon: 'comment-dots',
+      permissions: ['admin'],
+    },
+    children: [
+      {
+        path: 'record',
+        name: 'Record',
+        component: () => import('@/views/message/index'),
+        meta: {
+          title: '消息列表',
+        },
+      },
+    ],
+  },
 
   /* {
     path: "/test",
@@ -340,10 +361,31 @@ export const asyncRoutes = [
           title: '档案管理',
         },
       },
+    ],
+  },
+   {
+    path: '/coupon',
+    component: Layout,
+    redirect: 'noRedirect',
+    name: 'Coupon',
+    meta: {
+      title: '券管理',
+      icon: 'cog',
+      permissions: ['admin'],
+    },
+    children: [
+       {
+        path: 'couponlist',
+        name: 'Couponlist',
+        component: () => import('@/views/Coupon/couponlist/index'),
+        meta: {
+          title: '券包管理',
+        },
+      },
        {
         path: 'distribute',
         name: 'Distribute',
-        component: () => import('@/views/mall/distribute/index'),
+        component: () => import('@/views/Coupon/distribute/index'),
         meta: {
           title: '派券管理',
         },
@@ -351,7 +393,7 @@ export const asyncRoutes = [
       {
         path: 'record',
         name: 'Record',
-        component: () => import('@/views/mall/record/index'),
+        component: () => import('@/views/Coupon/record/index'),
         meta: {
           title: '派券记录',
         },
@@ -359,6 +401,37 @@ export const asyncRoutes = [
       
     ],
   },
+  {
+    path: '/comment',
+    component: Layout,
+    redirect: 'noRedirect',
+    name: 'Comment',
+    meta: {
+      title: '评论管理',
+      icon: 'comment-dots',
+      permissions: ['admin'],
+    },
+    children: [
+      {
+        path: 'record',
+        name: 'Record',
+        component: () => import('@/views/comment/index'),
+        meta: {
+          title: '评论列表',
+        },
+      },
+        {
+        path: '',
+        name: '',
+        component: () => import('@/views/comment/index'),
+        meta: {
+          title: '',
+        },
+      },
+      
+    ],
+  },
+  
   // {
   //   path: '/error',
   //   component: EmptyLayout,

src/utils/request.js

@@ -148,6 +148,7 @@ instance.interceptors.response.use(
 
     const { response, message } = error
     if (response && response.data) {
+      
       const { status, data } = response
       handleCode(status, data.msg || message || '未知错误')
       return Promise.reject(error)

src/views/comment/components/TableEdit.vue

@@ -0,0 +1,109 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+       <template v-if="form.status == '2' ">
+      <el-form-item label="车辆ID" prop="车辆ID">
+        <el-input v-model.trim="form.车辆ID" autocomplete="off" />
+      </el-form-item>
+      <el-form-item label="小哇ID" prop="小哇ID">
+        <el-input v-model.trim="form.小哇ID" autocomplete="off" />
+      </el-form-item>
+       <el-form-item label="时段ID" prop="时段ID">
+        <el-input v-model.trim="form.时段ID" autocomplete="off" />
+      </el-form-item>
+          <el-form-item label="预约日期" prop="预约日期">
+             <el-date-picker
+      v-model="form.预约日期"
+      style="width:350px;"
+      type="date"
+      value-format="yyyy-MM-dd"
+      placeholder="选择日期">
+    </el-date-picker>
+        <!-- <el-input v-model.trim="form.预约日期" autocomplete="off" /> -->
+      </el-form-item>
+       </template>
+         <el-form-item v-else label="订单状态" prop="订单状态">
+             <el-select v-model="form.订单状态" placeholder="请选择">
+             <el-option
+               v-for="item in options"
+               :key="item.value"
+               :label="item.label"
+               :value="item.value">
+             </el-option>
+           </el-select>
+      </el-form-item>
+    </el-form>
+     
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit } from '@/api/table'
+
+  export default {
+    name: 'TableEdit',
+    data() {
+      return {
+          options: [{
+          value: '已支付',
+          label: '已支付'
+        },
+        ],
+        form: {
+          title: '',
+          author: '',
+          smallWow:'',
+          time:'',
+          author:''
+        },
+        rules: {
+          车辆ID: [{ required: true, trigger: 'blur', message: '请输入车辆ID' }],
+            小哇ID: [{ required: true, trigger: 'blur', message: '请输入小哇ID' }],
+             时段ID: [{ required: true, trigger: 'blur', message: '请输入时段ID' }],
+          预约日期: [{ required: true, trigger: 'blur', message: '请选择时间' }],
+          订单状态: [{ required: true, trigger: 'blur', message: '请选择状态' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    created() {},
+    methods: {
+      showEdit(row) {
+        if (!row) {
+          this.title = '添加'
+        } else {
+          this.title = '编辑'
+          this.form = Object.assign({}, row)
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        // this.$refs['form'].resetFields()
+        // this.form = this.$options.data().form
+        this.dialogFormVisible = false
+        // this.$emit('fetch-data')
+      },
+      save() {
+        // console.log(this.form,'--=')
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            const { msg } = await doEdit(this.form)
+            this.$baseMessage(msg, 'success')
+            this.$refs['form'].resetFields()
+            this.$parent.fetchData();
+            this.dialogFormVisible = false
+            this.form = this.$options.data().form
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>
+

src/views/comment/index.vue

@@ -0,0 +1,289 @@
+<template>
+  <div class="table-container">
+    
+    <!-- <vab-page-header description="功能强大的数据表格组件，支持排序、分页、搜索等功能" :icon="['fas', 'table']" title="表格管理" /> -->
+    <el-row>
+  <el-col :span="22">
+     <el-form ref="form"  :inline="true" :model="queryForm" @submit.native.prevent>
+       <el-form-item label="查询时间" >
+            <el-date-picker
+               v-model="queryForm.time"
+                 unlink-panels
+                value-format="yyyy-MM-dd"
+               type="daterange"
+               range-separator="-"
+               start-placeholder="开始日期"
+               end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+            ></el-date-picker>
+         </el-form-item>
+           </el-form>
+  </el-col>
+     <el-form ref="form" style="maigin-left:50px;"  :inline="true" :model="queryForm" @submit.native.prevent>
+          <!-- <el-form-item>
+            <el-input v-model="queryForm.status_Inquiry" placeholder="输入手机号或订单号查询" />
+          </el-form-item> -->
+          
+          <el-form-item>
+            <el-button icon="el-icon-search" native-type="submit" type="primary" @click="handleQuery">查询</el-button>
+          </el-form-item>
+           </el-form>
+</el-row>
+
+    <el-table
+      ref="tableSort"
+      v-loading="listLoading"
+      :data="list"
+      :element-loading-text="elementLoadingText"
+      :height="height"
+      @selection-change="setSelectRows"
+      @sort-change="tableSortChange"
+    >
+      <el-table-column  type="selection" width="55" />
+      <!-- <el-table-column label="序号"  width="95">
+        <template #default="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
+       <el-table-column align="center" width="100" label="用户ID" prop="用户ID"  />
+         <el-table-column align="center" width="100" label="管家ID" prop="管家ID"  />
+           <el-table-column align="center" width="100" label="管家名称" prop="管家名称"  />
+         <el-table-column align="center"  width="160" label="昵称" prop="昵称"  />
+       <el-table-column align="center" width="100" label="用户头像" prop="用户头像">
+         <template slot-scope="scope">
+          <img v-if="scope.row.用户头像" :src="scope.row.用户头像" alt="图片" style="width: 30px; height: 30px;">
+        </template>
+          </el-table-column>
+      <el-table-column  align="center" width="100" label="评论ID" prop="评论ID"  />
+      <el-table-column  align="center" width="100" label="订单ID" prop="订单ID"  />
+       <el-table-column  align="center" width="180" label="订单号" prop="订单号"  />
+      <el-table-column  align="center" width="100" label="星级" prop="星级"  />
+        <el-table-column align="center"  width="160" label="评论内容" prop="评论内容"  />
+        <el-table-column align="center"  width="200" label="评论图片" prop="评论图片"  >
+         <template    slot-scope="scope" >
+          <div style="display: flex;overflow:auto;">
+              <div v-for="(image, index) in scope.row.评论图片" :key="index" >
+        <img v-if="image" :src="image" alt="图片" @click="previewImage(image)" style="width: 50px; height: 50px;margin-left:10px;">
+      </div>
+          </div>
+        </template>
+          </el-table-column>
+        <el-table-column align="center"  width="160" label="评论时间" prop="评论时间"  />
+       
+      <!-- <el-table-column label="头像" >
+        <template #default="{ row }">
+          <el-image v-if="imgShow" :preview-src-list="imageList" :src="row.img" />
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="点击量" prop="pageViews"  sortable /> -->
+      <!-- <el-table-column label="状态" >
+        <template #default="{ row }">
+          <el-tooltip class="item" :content="row.status" effect="dark" placement="top-start">
+            <el-tag :type="row.status | statusFilter">
+              {{ row.status }}
+            </el-tag>
+          </el-tooltip>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="时间" prop="datetime"  width="200" /> -->
+      <!-- <el-table-column label="操作"  fixed="right" width="60px">
+        <template #default="{ row }">
+          <el-button v-if="row.订单状态 == '已派单' || row.订单状态 == '已支付'  " type="text" @click="handleEdit(row)">编辑</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <table-edit ref="edit" />
+  </div>
+</template>
+
+<script>
+  import { doDelete, commentList } from '@/api/table'
+  import TableEdit from './components/TableEdit'
+  import VabPageHeader from '@/components/VabPageHeader'
+
+  export default {
+    name: 'ComprehensiveTable',
+    components: {
+      TableEdit,
+      VabPageHeader,
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'gray',
+          deleted: 'danger',
+        }
+        return statusMap[status]
+      },
+    },
+    data() {
+      return {
+           pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        imgShow: true,
+        list: [],
+        imageList: [],
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        background: true,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 20,
+          title: '',
+        },
+        timeOutID: null,
+      }
+    },
+    computed: {
+      height() {
+        return this.$baseTableHeight()
+      },
+    },
+    created() {
+      this.fetchData()
+    },
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    mounted() {},
+    methods: {
+      previewImage(url) {
+        
+      // 方法1: 使用window.open在新标签页中打开图片
+      window.open(url, '_blank');
+      
+      // 方法2: 使用Vue的Modal组件（例如使用Element UI的Dialog）
+      // this.$refs.imageModal.showImage(url);
+    },
+      tableSortChange() {
+        const imageList = []
+        this.$refs.tableSort.tableData.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+      },
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleAdd() {
+        this.$refs['edit'].showEdit()
+      },
+      handleEdit(row) {
+        console.log(row,'---')
+        this.$refs['edit'].showEdit(row)
+      },
+      handleDelete(row) {
+        if (row.id) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await doDelete({ ids: row.id })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } else {
+          if (this.selectRows.length > 0) {
+            const ids = this.selectRows.map((item) => item.id).join()
+            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+              const { msg } = await doDelete({ ids: ids })
+              this.$baseMessage(msg, 'success')
+              this.fetchData()
+            })
+          } else {
+            this.$baseMessage('未选中任何行', 'error')
+            return false
+          }
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      handleQuery() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data, total } = await commentList(this.queryForm)
+        this.list = data
+        const imageList = []
+        data.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+        this.total = total
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 500)
+      },
+      testMessage() {
+        this.$baseMessage('test1', 'success')
+      },
+      testALert() {
+        this.$baseAlert('11')
+        this.$baseAlert('11', '自定义标题', () => {
+          /* 可以写回调; */
+        })
+        this.$baseAlert('11', null, () => {
+          /* 可以写回调; */
+        })
+      },
+      testConfirm() {
+        this.$baseConfirm(
+          '你确定要执行该操作?',
+          null,
+          () => {
+            /* 可以写回调; */
+          },
+          () => {
+            /* 可以写回调; */
+          }
+        )
+      },
+      testNotify() {
+        this.$baseNotify('测试消息提示', 'test', 'success', 'bottom-right')
+      },
+    },
+  }
+</script>

src/views/coupon/couponlist/components/TableEdit.vue

@@ -0,0 +1,215 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+       <template>
+  <el-row>
+  <el-col :span="12">
+   <el-form-item label="券包名称" prop="券包名称">
+        <el-input :disabled="ids" v-model.trim="form.券包名称" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+  </el-row>
+   <el-row>
+   <el-col :span="12">
+   <el-form-item label="券包价格" prop="券包价格">
+        <el-input :disabled="ids" v-model.trim="form.券包价格" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+  </el-row>
+  <el-row>
+  <el-col :span="2">
+   <el-form-item label="券1" prop="券1">
+        <!-- <el-input v-model.trim="form.券包名称" autocomplete="off" /> -->
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券ID" prop="券ID">
+        <el-input :disabled="ids" v-model="form.package1.券ID" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券有效期" prop="券的有效期限">
+        <el-input :disabled="ids" v-model="form.package1.券的有效期限" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+  </el-row>
+   <el-row>
+     <el-col :span="2">
+   <el-form-item label="券2" prop="券2">
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券ID" prop="券ID">
+        <el-input :disabled="ids" v-model="form.package2.券ID" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券有效期" prop="券的有效期限">
+        <el-input :disabled="ids" v-model="form.package2.券的有效期限" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+  </el-row>
+
+   <el-row>
+     <el-col :span="2">
+   <el-form-item label="券3" prop="券3">
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券ID" prop="券ID">
+        <el-input :disabled="ids" v-model="form.package3.券ID" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+   <el-col :span="10">
+   <el-form-item label="券有效期" prop="券的有效期限">
+        <el-input :disabled="ids" v-model="form.package3.券的有效期限" autocomplete="off" />
+      </el-form-item>
+  </el-col>
+  </el-row>
+
+   <!-- <el-row>
+ 
+  </el-row> -->
+       </template>
+         <!-- <el-form-item v-else label="订单状态" prop="订单状态">
+             <el-select v-model="form.订单状态" placeholder="请选择">
+             <el-option
+               v-for="item in options"
+               :key="item.value"
+               :label="item.label"
+               :value="item.value">
+             </el-option>
+           </el-select>
+      </el-form-item> -->
+    </el-form>
+     
+    <div slot="footer" class="dialog-footer" v-if="!ids">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit,addPackage,editPackage } from '@/api/table'
+
+  export default {
+    name: 'TableEdit',
+    data() {
+      return {
+        ids:true,
+        status:'',
+          options: [{
+          value: '已支付',
+          label: '已支付'
+        },
+        ],
+        form: {
+          券包名称:'',
+          券包价格:'',
+          package1:{
+             券ID:'',
+          券的有效期限:'',
+          },
+           package2:{
+             券ID:'',
+          券的有效期限:'',
+          },
+           package3:{
+             券ID:'',
+          券的有效期限:'',
+          },
+         
+        
+        },
+        rules: {
+          // 券包ID: [{ required: true, trigger: 'blur', message: '请输入券ID' }],
+          券包名称: [{ required: true, trigger: 'blur', message: '请输入券名称' }],
+          券包价格: [{ required: true, trigger: 'blur', message: '请输入券包价格' }]
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    created() {},
+    methods: {
+      showEdit(row,ids) {
+        console.log(row,ids,'???')
+        this.status = row
+        if (!row) {
+          this.title = '添加'
+           this.ids = false
+            this.form.券包名称='',
+            
+          this.form. 券包价格='',
+         this.form.package1 = {}
+           this.form.package2 = {}
+             this.form.package3 = {}
+           
+        } else if (ids) {
+          this.ids = ids
+           this.title = '查看'
+             this.form = Object.assign({}, row)
+        }else{
+           this.title = '编辑'
+            this.ids = false
+          this.form = Object.assign({}, row)
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        // this.$refs['form'].resetFields()
+        // this.form = this.$options.data().form
+        this.dialogFormVisible = false
+        this.form.券包名称='',
+          this.form. 券包价格='',
+         this.form.package1 = {}
+           this.form.package2 = {}
+             this.form.package3 = {}
+        // this.$emit('fetch-data')
+      },
+      save() {
+        if(this.status){
+           this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            const { msg } = await editPackage(this.form)
+            this.$message({
+              message:msg,
+              duration:2000,
+              type:'success'
+            })
+            // this.$baseMessage(msg, 'success')
+            this.$refs['form'].resetFields()
+            this.$parent.fetchData();
+            this.dialogFormVisible = false
+            this.form = this.$options.data().form
+          } else {
+            return false
+          }
+        })
+        }else{
+            this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            const { msg } = await addPackage(this.form)
+            this.$message({
+              message:msg,
+              duration:2000,
+              type:'success'
+            })
+            // this.$baseMessage(msg, 'success')
+            this.$refs['form'].resetFields()
+            this.$parent.fetchData();
+            this.dialogFormVisible = false
+            this.form = this.$options.data().form
+          } else {
+            return false
+          }
+        })
+
+        }
+        // console.log(this.status,'--=')
+      },
+    },
+  }
+</script>
+

src/views/coupon/couponlist/index.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="table-container">
+    <vab-query-form>
+      <vab-query-form-left-panel >
+        <el-button  icon="el-icon-plus" type="primary" @click="handleAdd">添加</el-button>
+        <!-- <el-button :disabled="true" icon="el-icon-delete" type="danger" @click="handleDelete">删除</el-button> -->
+        <!-- <el-button type="primary" @click="testMessage">baseMessage</el-button>
+        <el-button type="primary" @click="testALert">baseAlert</el-button>
+        <el-button type="primary" @click="testConfirm">baseConfirm</el-button>
+        <el-button type="primary" @click="testNotify">baseNotify</el-button> -->
+      </vab-query-form-left-panel>
+      <!-- <vab-query-form-right-panel>
+        <el-form ref="form" :inline="true" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.status_Inquiry" placeholder="输入券名称支持模糊查询" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" native-type="submit" type="primary" @click="handleQuery">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel> -->
+    </vab-query-form>
+
+    <el-table
+      ref="tableSort"
+      v-loading="listLoading"
+      :data="list"
+      :element-loading-text="elementLoadingText"
+      :height="height"
+      @selection-change="setSelectRows"
+      @sort-change="tableSortChange"
+    >
+      <!-- <el-table-column  type="selection" width="55" /> -->
+      <!-- <el-table-column label="序号"  width="95">
+        <template #default="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
+       <el-table-column align="center" width="180" label="券包ID" prop="券包ID"  />
+      <el-table-column  align="center"  label="券包价格" prop="券包价格"  />
+      <el-table-column  align="center" label="券包名称" prop="券包名称"  />
+      <!-- <el-table-column align="center" width="200" label="券规则" prop="券规则"  /> -->
+        <!-- <el-table-column align="center"  width="120" label="手机号" prop="手机号"  /> -->
+        <!-- <el-table-column align="center" width="200" label="抵扣条件" prop="抵扣条件"  />
+        <el-table-column align="center"  width="100" label="抵扣金额" prop="抵扣金额"  /> -->
+          <!-- <el-table-column align="center"  width="100" label="有效期" prop="有效期"  /> -->
+             <!-- <el-table-column align="center"  width="100" label="起始时间" prop="起始时间"  />
+            <el-table-column align="center"  width="100" label="结束时间" prop="结束时间"  /> -->
+      <el-table-column label="操作"  fixed="right" width="150px">
+        <template #default="{ row }">
+          <el-button  type="text" @click="handleView(row,ids)">查看</el-button>
+          <el-button  type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="hdleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <table-edit ref="edit" />
+  </div>
+</template>
+
+<script>
+  import { deletePackage, couponPackage,exportUserOperateAdmin } from '@/api/table'
+  import TableEdit from './components/TableEdit'
+  import VabPageHeader from '@/components/VabPageHeader'
+
+  export default {
+    name: 'ComprehensiveTable',
+    components: {
+      TableEdit,
+      VabPageHeader,
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'gray',
+          deleted: 'danger',
+        }
+        return statusMap[status]
+      },
+    },
+    data() {
+      return {
+        ids:true,
+          pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        imgShow: true,
+        list: [],
+        imageList: [],
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        background: true,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 20,
+          title: '',
+        },
+        timeOutID: null,
+      }
+    },
+    computed: {
+      height() {
+        return this.$baseTableHeight()
+      },
+    },
+    created() {
+      this.fetchData()
+    },
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    mounted() {},
+    methods: {
+        hdleDelete(row) {
+          console.log(row,'--=')
+        if (row.券包ID) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await deletePackage({ ids: row.券包ID })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } 
+      },
+    
+      tableSortChange() {
+        const imageList = []
+        this.$refs.tableSort.tableData.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+      },
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleAdd() {
+        this.$refs['edit'].showEdit()
+      },
+      handleView(row,ids){
+        this.$refs['edit'].showEdit(row,ids)
+      },
+      handleEdit(row) {
+        // console.log(row,'---')
+        this.$refs['edit'].showEdit(row)
+      },
+      handleDelete() {
+        exportUserOperateAdmin().then(
+  response => {
+     window.location.href = response.data.url;  
+    // const url = window.URL.createObjectURL(new Blob([response.data])) // 创建下载链接
+    // const link = document.createElement('a')
+    // link.href = url
+    // link.download = '全文导入模板.xlsx' // 设置文件名
+    // document.body.appendChild(link)
+    // link.click() // 触发下载
+    // document.body.removeChild(link) // 下载后移除元素
+  }
+).catch(error => {
+  console.error('下载失败', error)
+  this.loading = false // 停止加载，隐藏加载状态
+})
+      
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      handleQuery() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data, total } = await couponPackage(this.queryForm)
+        this.list = data
+        const imageList = []
+        data.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+        this.total = total
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 500)
+      },
+      testMessage() {
+        this.$baseMessage('test1', 'success')
+      },
+      testALert() {
+        this.$baseAlert('11')
+        this.$baseAlert('11', '自定义标题', () => {
+          /* 可以写回调; */
+        })
+        this.$baseAlert('11', null, () => {
+          /* 可以写回调; */
+        })
+      },
+      testConfirm() {
+        this.$baseConfirm(
+          '你确定要执行该操作?',
+          null,
+          () => {
+            /* 可以写回调; */
+          },
+          () => {
+            /* 可以写回调; */
+          }
+        )
+      },
+      testNotify() {
+        this.$baseNotify('测试消息提示', 'test', 'success', 'bottom-right')
+      },
+    },
+  }
+</script>

src/views/index/index.vue

@@ -51,19 +51,19 @@
           <div class="chart-container">
             <div class="chart-header">
               <div class="chart-title">
-                <span>今日访问趋势</span>
+                <span>今日新增会员数量</span>
               </div>
               <div class="chart-stats">
                 <div class="stat-item">
-                  <div class="stat-value">{{ config1.endVal }}</div>
+                  <div class="stat-value">{{ count }}</div>
-                  <div class="stat-label">总访问量</div>
+                  <div class="stat-label">新增会员</div>
                 </div>
               </div>
             </div>
-            <div class="chart-content">
+            <!-- <div class="chart-content">
               <vab-chart autoresize :option="fwl" />
-            </div>
+            </div> -->
-            <div class="chart-footer">
+            <!-- <div class="chart-footer">
               <div class="trend-info">
                 <div class="trend-item">
                   <vab-icon class="trend-up" :icon="['fas', 'arrow-up']" />
@@ -74,7 +74,7 @@
                   <span class="trend-text">活跃用户 2.3K</span>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </el-card>
       </el-col>
@@ -428,6 +428,7 @@
   import VabChart from '@/plugins/echarts'
   import { dependencies, devDependencies } from '../../../package.json'
   import { getNoticeList } from '@/api/notice'
+  import { members } from '@/api/user'
 
   export default {
     name: 'Index',
@@ -436,6 +437,7 @@
     },
     data() {
       return {
+        count:'',
         timer: 0,
         updateTime: process.env.VUE_APP_UPDATE_TIME,
         nodeEnv: process.env.NODE_ENV,
@@ -879,6 +881,7 @@
     },
     created() {
       this.fetchData()
+      this.membersList()
     },
     beforeDestroy() {
       clearInterval(this.timer)
@@ -928,6 +931,11 @@
         const res = await getNoticeList()
         this.noticeList = res.data
       },
+
+       async membersList() {
+        const res = await members()
+        this.count = res.data.count
+      },
       handleIconClick(item) {
         if (item.link) {
           window.open(item.link, '_blank')

src/views/mall/member/index.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="table-container">
+      <vab-query-form-left-panel style="width:200px;">
+        <el-button  icon="el-icon-delete" type="primary" @click="handleDelete">导出</el-button> 
+      </vab-query-form-left-panel>
     <!-- <vab-page-header description="功能强大的数据表格组件，支持排序、分页、搜索等功能" :icon="['fas', 'table']" title="表格管理" /> -->
     <!-- <vab-query-form> -->
       <!-- <vab-query-form-left-panel style="width:200px;">
@@ -26,7 +29,7 @@
     <el-col :span="12">
      <el-form ref="form" style="display: flex;align-items: center;" :inline="true" :model="queryForm" @submit.native.prevent>
           <el-form-item>
-            <el-input v-model="queryForm.status_Inquiry" placeholder="输入手机号或订单号查询" />
+            <el-input v-model="queryForm.status_Inquiry" placeholder="输入手机号或用户ID" />
           </el-form-item>
           
           <el-form-item>
@@ -56,7 +59,7 @@
       @selection-change="setSelectRows"
       @sort-change="tableSortChange"
     >
-      <el-table-column  type="selection" width="55" />
+      <!-- <el-table-column  type="selection" width="55" /> -->
       <!-- <el-table-column label="序号"  width="95">
         <template #default="scope">
           {{ scope.$index + 1 }}
@@ -113,7 +116,7 @@
 </template>
 
 <script>
-  import { doDelete, goodsListList } from '@/api/table'
+  import { doDelete, goodsListList,exportUserMembership } from '@/api/table'
   import TableEdit from './components/TableEdit'
   import VabPageHeader from '@/components/VabPageHeader'
 
@@ -206,30 +209,48 @@
         this.$refs['edit'].showEdit()
       },
       handleEdit(row) {
-        console.log(row,'---')
+        // console.log(row,'---')
         this.$refs['edit'].showEdit(row)
       },
-      handleDelete(row) {
+       handleDelete() {
-        if (row.id) {
+        exportUserMembership().then(
-          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+  response => {
-            const { msg } = await doDelete({ ids: row.id })
+     window.location.href = response.data.url;  
-            this.$baseMessage(msg, 'success')
+    // const url = window.URL.createObjectURL(new Blob([response.data])) // 创建下载链接
-            this.fetchData()
+    // const link = document.createElement('a')
-          })
+    // link.href = url
-        } else {
+    // link.download = '全文导入模板.xlsx' // 设置文件名
-          if (this.selectRows.length > 0) {
+    // document.body.appendChild(link)
-            const ids = this.selectRows.map((item) => item.id).join()
+    // link.click() // 触发下载
-            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+    // document.body.removeChild(link) // 下载后移除元素
-              const { msg } = await doDelete({ ids: ids })
+  }
-              this.$baseMessage(msg, 'success')
+).catch(error => {
-              this.fetchData()
+  console.error('下载失败', error)
-            })
+  this.loading = false // 停止加载，隐藏加载状态
-          } else {
+})
-            this.$baseMessage('未选中任何行', 'error')
+      
-            return false
-          }
-        }
       },
+      // handleDelete(row) {
+      //   if (row.id) {
+      //     this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+      //       const { msg } = await doDelete({ ids: row.id })
+      //       this.$baseMessage(msg, 'success')
+      //       this.fetchData()
+      //     })
+      //   } else {
+      //     if (this.selectRows.length > 0) {
+      //       const ids = this.selectRows.map((item) => item.id).join()
+      //       this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+      //         const { msg } = await doDelete({ ids: ids })
+      //         this.$baseMessage(msg, 'success')
+      //         this.fetchData()
+      //       })
+      //     } else {
+      //       this.$baseMessage('未选中任何行', 'error')
+      //       return false
+      //     }
+      //   }
+      // },
       handleSizeChange(val) {
         this.queryForm.pageSize = val
         this.fetchData()

src/views/mall/pay/components/TableEdit.vue

@@ -93,7 +93,12 @@
         this.$refs['form'].validate(async (valid) => {
           if (valid) {
             const { msg } = await doEdit(this.form)
-            this.$baseMessage(msg, 'success')
+            this.$message({
+              message:msg,
+              duration:2000,
+              type:'success'
+            })
+            // this.$baseMessage(msg, 'success')
             this.$refs['form'].resetFields()
             this.$parent.fetchData();
             this.dialogFormVisible = false

src/views/mall/pay/index.vue

@@ -2,9 +2,9 @@
   <div class="table-container">
     <!-- <vab-page-header description="功能强大的数据表格组件，支持排序、分页、搜索等功能" :icon="['fas', 'table']" title="表格管理" /> -->
     <!-- <vab-query-form> -->
-         <!-- <vab-query-form-left-panel style="width:200px;">
+         <vab-query-form-left-panel style="width:200px;">
         <el-button  icon="el-icon-delete" type="primary" @click="handleDelete">导出</el-button> 
-      </vab-query-form-left-panel> -->
+      </vab-query-form-left-panel>
       <el-row style="display: flex;align-items: center;">
   <el-col :span="12">
      <el-form ref="form" style="display: flex;align-items: center;" :inline="true" :model="queryForm" @submit.native.prevent>
@@ -87,7 +87,12 @@
                         <el-table-column align="center" label="全身美容" prop="全身美容"  />
                         <el-table-column align="center" label="纯手剪" prop="纯手剪"  />
                         <el-table-column align="center" label="去除废毛" prop="去除废毛"  />
-                        <el-table-column align="center" label="开结" prop="开结"  />
+                        <el-table-column align="center" width="150" label="开结（半小时）" prop="开结（半小时）"  />
+                        <el-table-column align="center" width="150" label="开结（1小时）" prop="开结（1小时）"  />
+                        <el-table-column align="center" width="150" label="开结（1.5小时）" prop="开结（1.5小时）"  />
+                        <el-table-column align="center" width="150" label="开结（2小时）" prop="开结（2小时）"  />
+                        <el-table-column align="center" width="150" label="局部" prop="局部"  />
+                        <el-table-column align="center" width="150" label="全身" prop="全身"  />
                         <el-table-column  width="120" align="center" label="附加项合计" prop="附加项合计"  />
                         <el-table-column align="center" label="调度费" prop="调度费"  />
                         <el-table-column align="center" label="夜间费" prop="夜间费"  />
@@ -100,7 +105,7 @@
                         <el-table-column align="center" label="订单合计" prop="订单合计"  />
                         <el-table-column  width="150" align="center" label="会员折扣后金额" prop="会员折扣后金额"  />
                         <el-table-column align="center" label="结算金额" prop="结算金额"  />
-                        <el-table-column  width="150" align="center" label="订单实际支付金额" prop="订单实际支付金额"  />
+                        <el-table-column  width="150" align="center" label="订单实际支付价格" prop="订单实际支付价格"  />
                         <el-table-column  width="120" align="center" label="最终支付总额" prop="最终支付总额"  />
                         <el-table-column align="center" label="追加刷牙" prop="追加刷牙"  />
                         <el-table-column  width="120" align="center" label="追加头部修建" prop="追加头部修建"  />
@@ -109,7 +114,12 @@
                         <el-table-column  width="120" align="center" label="追加全身美容" prop="追加全身美容"  />
                         <el-table-column  width="120" align="center" label="追加纯手剪" prop="追加纯手剪"  />
                         <el-table-column  width="120" align="center" label="追加去除废毛" prop="追加去除废毛"  />
-                        <el-table-column  width="120" align="center" label="追加开结" prop="追加开结"  />
+                        <el-table-column  width="200" align="center" label="追加开结（半小时）" prop="追加开结（半小时）"  />
+                        <el-table-column  width="200" align="center" label="追加开结（1小时）" prop="追加开结（1小时）"  />
+                        <el-table-column  width="200" align="center" label="追加开结（1.5小时）" prop="追加开结（1.5小时）"  />
+                        <el-table-column  width="200" align="center" label="追加开结（2小时）" prop="追加开结（2小时）"  />
+                        <el-table-column  width="120" align="center" label="追加局部" prop="追加局部"  />
+                        <el-table-column  width="120" align="center" label="追加全身" prop="追加全身"  />
       <!-- <el-table-column label="头像" >
         <template #default="{ row }">
           <el-image v-if="imgShow" :preview-src-list="imageList" :src="row.img" />
@@ -240,44 +250,26 @@
         this.$refs['edit'].showEdit()
       },
       handleEdit(row) {
-        console.log(row,'---')
+        // console.log(row,'---')
         this.$refs['edit'].showEdit(row)
       },
-      handleDelete(row) {
+      handleDelete() {
-        exportUserOperateAdmin(this.queryParams, { responseType: 'blob' }).then(
+        exportUserOperateAdmin().then(
   response => {
-    console.log(response,'----')
+     window.location.href = response.data.url;  
-    const url = window.URL.createObjectURL(new Blob([response.data])) // 创建下载链接
+    // const url = window.URL.createObjectURL(new Blob([response.data])) // 创建下载链接
-    const link = document.createElement('a')
+    // const link = document.createElement('a')
-    link.href = url
+    // link.href = url
-    link.download = '全文导入模板.xlsx' // 设置文件名
+    // link.download = '全文导入模板.xlsx' // 设置文件名
-    document.body.appendChild(link)
+    // document.body.appendChild(link)
-    link.click() // 触发下载
+    // link.click() // 触发下载
-    document.body.removeChild(link) // 下载后移除元素
+    // document.body.removeChild(link) // 下载后移除元素
   }
 ).catch(error => {
   console.error('下载失败', error)
   this.loading = false // 停止加载，隐藏加载状态
 })
-        // if (row.id) {
+      
-        //   this.$baseConfirm('你确定要导出当前项吗', null, async () => {
-        //     const { msg } = await doDelete({ ids: row.id })
-        //     this.$baseMessage(msg, 'success')
-        //     this.fetchData()
-        //   })
-        // } else {
-        //   if (this.selectRows.length > 0) {
-        //     const ids = this.selectRows.map((item) => item.id).join()
-        //     this.$baseConfirm('你确定要导出选中项吗', null, async () => {
-        //       const { msg } = await doDelete({ ids: ids })
-        //       this.$baseMessage(msg, 'success')
-        //       this.fetchData()
-        //     })
-        //   } else {
-        //     this.$baseMessage('未选中任何行', 'error')
-        //     return false
-        //   }
-        // }
       },
       handleSizeChange(val) {
         this.queryForm.pageSize = val

src/views/message/components/TableEdit.vue

@@ -0,0 +1,109 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+       <template v-if="form.status == '2' ">
+      <el-form-item label="车辆ID" prop="车辆ID">
+        <el-input v-model.trim="form.车辆ID" autocomplete="off" />
+      </el-form-item>
+      <el-form-item label="小哇ID" prop="小哇ID">
+        <el-input v-model.trim="form.小哇ID" autocomplete="off" />
+      </el-form-item>
+       <el-form-item label="时段ID" prop="时段ID">
+        <el-input v-model.trim="form.时段ID" autocomplete="off" />
+      </el-form-item>
+          <el-form-item label="预约日期" prop="预约日期">
+             <el-date-picker
+      v-model="form.预约日期"
+      style="width:350px;"
+      type="date"
+      value-format="yyyy-MM-dd"
+      placeholder="选择日期">
+    </el-date-picker>
+        <!-- <el-input v-model.trim="form.预约日期" autocomplete="off" /> -->
+      </el-form-item>
+       </template>
+         <el-form-item v-else label="订单状态" prop="订单状态">
+             <el-select v-model="form.订单状态" placeholder="请选择">
+             <el-option
+               v-for="item in options"
+               :key="item.value"
+               :label="item.label"
+               :value="item.value">
+             </el-option>
+           </el-select>
+      </el-form-item>
+    </el-form>
+     
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit } from '@/api/table'
+
+  export default {
+    name: 'TableEdit',
+    data() {
+      return {
+          options: [{
+          value: '已支付',
+          label: '已支付'
+        },
+        ],
+        form: {
+          title: '',
+          author: '',
+          smallWow:'',
+          time:'',
+          author:''
+        },
+        rules: {
+          车辆ID: [{ required: true, trigger: 'blur', message: '请输入车辆ID' }],
+            小哇ID: [{ required: true, trigger: 'blur', message: '请输入小哇ID' }],
+             时段ID: [{ required: true, trigger: 'blur', message: '请输入时段ID' }],
+          预约日期: [{ required: true, trigger: 'blur', message: '请选择时间' }],
+          订单状态: [{ required: true, trigger: 'blur', message: '请选择状态' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    created() {},
+    methods: {
+      showEdit(row) {
+        if (!row) {
+          this.title = '添加'
+        } else {
+          this.title = '编辑'
+          this.form = Object.assign({}, row)
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        // this.$refs['form'].resetFields()
+        // this.form = this.$options.data().form
+        this.dialogFormVisible = false
+        // this.$emit('fetch-data')
+      },
+      save() {
+        // console.log(this.form,'--=')
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            const { msg } = await doEdit(this.form)
+            this.$baseMessage(msg, 'success')
+            this.$refs['form'].resetFields()
+            this.$parent.fetchData();
+            this.dialogFormVisible = false
+            this.form = this.$options.data().form
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>
+

src/views/message/index.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="table-container">
+    
+    <!-- <vab-page-header description="功能强大的数据表格组件，支持排序、分页、搜索等功能" :icon="['fas', 'table']" title="表格管理" /> -->
+    <el-row>
+  <el-col :span="18">
+     <el-form ref="form"  :inline="true" :model="queryForm" @submit.native.prevent>
+       <el-form-item label="查询时间" >
+            <el-date-picker
+               v-model="queryForm.time"
+                 unlink-panels
+                value-format="yyyy-MM-dd"
+               type="daterange"
+               range-separator="-"
+               start-placeholder="开始日期"
+               end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+            ></el-date-picker>
+         </el-form-item>
+           </el-form>
+  </el-col>
+     <el-form ref="form"   :inline="true" :model="queryForm" @submit.native.prevent>
+          <!-- <el-form-item>
+            <el-input v-model="queryForm.status_Inquiry" placeholder="输入手机号或订单号查询" />
+          </el-form-item> -->
+           <el-select v-model="queryForm.status_Inquiry" placeholder="请选择" style="margin:2px 20px 0 0 ;">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
+          
+          <el-form-item>
+            <el-button icon="el-icon-search" native-type="submit" type="primary" @click="handleQuery">查询</el-button>
+          </el-form-item>
+           </el-form>
+</el-row>
+
+    <el-table
+      ref="tableSort"
+      v-loading="listLoading"
+      :data="list"
+      :element-loading-text="elementLoadingText"
+      :height="height"
+      @selection-change="setSelectRows"
+      @sort-change="tableSortChange"
+    >
+      <el-table-column  type="selection" width="55" />
+      <!-- <el-table-column label="序号"  width="95">
+        <template #default="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
+       <el-table-column align="center" width="100" label="ID" prop="ID"  />
+         <el-table-column align="center" width="200" label="创建时间" prop="创建时间"  />
+           <el-table-column align="center" width="700" label="消息" prop="消息"  />
+         <el-table-column align="center"  width="100" label="消息类型" prop="消息类型"  />
+      <!-- <el-table-column label="头像" >
+        <template #default="{ row }">
+          <el-image v-if="imgShow" :preview-src-list="imageList" :src="row.img" />
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="点击量" prop="pageViews"  sortable /> -->
+      <!-- <el-table-column label="状态" >
+        <template #default="{ row }">
+          <el-tooltip class="item" :content="row.status" effect="dark" placement="top-start">
+            <el-tag :type="row.status | statusFilter">
+              {{ row.status }}
+            </el-tag>
+          </el-tooltip>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="时间" prop="datetime"  width="200" /> -->
+      <!-- <el-table-column label="操作"  fixed="right" width="60px">
+        <template #default="{ row }">
+          <el-button v-if="row.订单状态 == '已派单' || row.订单状态 == '已支付'  " type="text" @click="handleEdit(row)">编辑</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <table-edit ref="edit" />
+  </div>
+</template>
+
+<script>
+  import { doDelete, messageList } from '@/api/table'
+  import TableEdit from './components/TableEdit'
+  import VabPageHeader from '@/components/VabPageHeader'
+
+  export default {
+    name: 'ComprehensiveTable',
+    components: {
+      TableEdit,
+      VabPageHeader,
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'gray',
+          deleted: 'danger',
+        }
+        return statusMap[status]
+      },
+    },
+    data() {
+      return {
+         value: '',
+         options: [{
+          value: '1',
+          label: '订单通知'
+        }, {
+          value: '3',
+          label: '附加项通知'
+        }, {
+          value: '2',
+          label: '取消通知'
+        }
+        ],
+           pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        imgShow: true,
+        list: [],
+        imageList: [],
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        background: true,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 20,
+          title: '',
+        },
+        timeOutID: null,
+      }
+    },
+    computed: {
+      height() {
+        return this.$baseTableHeight()
+      },
+    },
+    created() {
+      this.fetchData()
+    },
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    mounted() {},
+    methods: {
+      previewImage(url) {
+        
+      // 方法1: 使用window.open在新标签页中打开图片
+      window.open(url, '_blank');
+      
+      // 方法2: 使用Vue的Modal组件（例如使用Element UI的Dialog）
+      // this.$refs.imageModal.showImage(url);
+    },
+      tableSortChange() {
+        const imageList = []
+        this.$refs.tableSort.tableData.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+      },
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleAdd() {
+        this.$refs['edit'].showEdit()
+      },
+      handleEdit(row) {
+        console.log(row,'---')
+        this.$refs['edit'].showEdit(row)
+      },
+      handleDelete(row) {
+        if (row.id) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await doDelete({ ids: row.id })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } else {
+          if (this.selectRows.length > 0) {
+            const ids = this.selectRows.map((item) => item.id).join()
+            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+              const { msg } = await doDelete({ ids: ids })
+              this.$baseMessage(msg, 'success')
+              this.fetchData()
+            })
+          } else {
+            this.$baseMessage('未选中任何行', 'error')
+            return false
+          }
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      handleQuery() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data, total } = await messageList(this.queryForm)
+        this.list = data
+        const imageList = []
+        data.forEach((item, index) => {
+          imageList.push(item.img)
+        })
+        this.imageList = imageList
+        this.total = total
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 500)
+      },
+      testMessage() {
+        this.$baseMessage('test1', 'success')
+      },
+      testALert() {
+        this.$baseAlert('11')
+        this.$baseAlert('11', '自定义标题', () => {
+          /* 可以写回调; */
+        })
+        this.$baseAlert('11', null, () => {
+          /* 可以写回调; */
+        })
+      },
+      testConfirm() {
+        this.$baseConfirm(
+          '你确定要执行该操作?',
+          null,
+          () => {
+            /* 可以写回调; */
+          },
+          () => {
+            /* 可以写回调; */
+          }
+        )
+      },
+      testNotify() {
+        this.$baseNotify('测试消息提示', 'test', 'success', 'bottom-right')
+      },
+    },
+  }
+</script>