From e1ae9d00165a6c353f17a4a6cad05d6e281c66be Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 3 Mar 2023 09:49:44 +0800
Subject: [PATCH] up

---
 src/components/XyTinymce/EditorImage.vue     |   2 +
 src/components/XyTinymce/index.vue           |   1 +
 src/layout/components/Navbar.vue             |  18 +++
 src/views/finance/component/rechargeFine.vue |   2 +-
 src/views/finance/flow.vue                   |   8 +-
 src/views/notice/index.vue                   | 154 +++++++++++++++++++
 6 files changed, 181 insertions(+), 4 deletions(-)
 create mode 100644 src/views/notice/index.vue

diff --git a/src/components/XyTinymce/EditorImage.vue b/src/components/XyTinymce/EditorImage.vue
index f6cfd75..aec6a6a 100644
--- a/src/components/XyTinymce/EditorImage.vue
+++ b/src/components/XyTinymce/EditorImage.vue
@@ -60,6 +60,8 @@ export default {
     },
     handleSubmit() {
       const arr = Object.keys(this.listObj).map(v => this.listObj[v])
+      console.log("listObj",this.listObj)
+      console.log("arr1",arr)
       if (!this.checkAllSuccess()) {
         this.$message('请等待所有图片上传成功。如有网络问题，请刷新页面重新上传!')
         return
diff --git a/src/components/XyTinymce/index.vue b/src/components/XyTinymce/index.vue
index 160d452..63f8c5f 100644
--- a/src/components/XyTinymce/index.vue
+++ b/src/components/XyTinymce/index.vue
@@ -104,6 +104,7 @@ export default {
       this.showImg = val
     },
     imageSuccessCBK(arr) {
+      console.log("arr",arr)
       arr.forEach(
         (v) => (this.myValue += `<img class="wscnph" src="${v.url}" >`)
       );
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0ca97a6..9080fb2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -45,6 +45,15 @@
                 @click.native="messageStatus = 1,getNotice()"
                 >已读</Button
               >
+              <Button
+                type="primary"
+                size="small"
+                shape="circle"
+                style="margin-left: 10px;padding:0 20px"
+
+                @click.native="toNotice"
+                >全部</Button
+              >
             </el-dropdown-item>
             <template v-if="noticeData.length > 0">
               <template v-for="(item, index) in noticeData">
@@ -183,6 +192,9 @@ export default {
     ...mapGetters(["sidebar", "avatar"]),
   },
   methods: {
+    toNotice(){
+      this.$router.push('/notice/index')
+    },
     timeymd(start){
 
       return this.$moment(start).format('YYYY-MM-DD')
@@ -202,6 +214,8 @@ export default {
 
     async getNotice() {
       let res = await getNotice({
+        page:1,
+        page_size:99,
         read_state: this.messageStatus,
       });
       console.log(res);
@@ -225,6 +239,10 @@ export default {
   /deep/ .el-badge__content.is-fixed{
     top:13px;
   }
+  .el-dropdown-menu.el-popper.message-dropdown{
+      max-height:400px;
+      overflow: auto;
+  }
 </style>
 <style lang="scss" scoped>
 .navbar {
diff --git a/src/views/finance/component/rechargeFine.vue b/src/views/finance/component/rechargeFine.vue
index 3233c70..5b8fc33 100644
--- a/src/views/finance/component/rechargeFine.vue
+++ b/src/views/finance/component/rechargeFine.vue
@@ -142,7 +142,7 @@ export default {
         }).then(res => {
           Message({
             type:'success',
-            message:'罚款成功'
+            message:'扣款成功'
           })
           this.isShow = false
           this.$emit('refresh')
diff --git a/src/views/finance/flow.vue b/src/views/finance/flow.vue
index bb785c2..9eeff1b 100644
--- a/src/views/finance/flow.vue
+++ b/src/views/finance/flow.vue
@@ -32,7 +32,7 @@
               <div class="select-content-item">
                 <!-- <div class="select-content-item-label">日期</div> -->
                 <div>
-                  <el-date-picker style="width: 260px;margin-right: 10px;height:32px;line-height:32px" @change="changeCreatedDate" v-model="select.createdDate" type="daterange"
+                  <el-date-picker style="width: 260px;margin-right: 10px;height:32px;line-height:32px" @change="changeCreatedDate" v-model="createdDate" type="daterange"
                     :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至"
                     start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                   </el-date-picker>
@@ -87,9 +87,11 @@
           type: '',
           serial: '',
           money_min: '',
-          money_max: ''
+          money_max: '',
+          start_date:"",
+          end_date:""
         },
-
+createdDate:['',''],
         merchants: [],
 pickerOptions: {
           shortcuts: [{
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
new file mode 100644
index 0000000..385d896
--- /dev/null
+++ b/src/views/notice/index.vue
@@ -0,0 +1,154 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="消息中心" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <slot>
+          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
+            <Select v-model="select.type" class="select" style="width:160px;margin-right: 10px;" :clearable="true"
+              placeholder="消息类型" filterable>
+              <Option v-for="item in typeList" :value="item.id" :key="item.id">{{ item.value }}</Option>
+            </Select>
+            <Select v-model="select.read_state" class="select" style="width:160px;margin-right: 10px;" :clearable="true"
+              placeholder="消息状态" filterable>
+              <Option v-for="item in stateList" :value="item.id" :key="item.id">{{ item.value }}</Option>
+            </Select>
+            <Button icon="ios-search" type="primary" style="margin-right: 10px;" @click="getNotices">查询</Button>
+
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table
+      :list="list"
+      :total="total"
+      :table-item="table"
+       @pageSizeChange="e => select.pageSize = e"
+       @pageIndexChange="pageChange"
+      >
+      <template v-slot:btns>
+        <el-table-column fixed="right" label="操作" width="200" header-align="center">
+          <template slot-scope="scope">
+            <Button v-if="!scope.row.read_at" type="primary" size="small" @click="toggleMessage(scope.row)">标为已读</Button>
+          </template>
+        </el-table-column>
+      </template>
+      </xy-table>
+
+  </div>
+</template>
+
+<script>
+import {toggleRead,getNotice} from "@/api/notice"
+
+import { Message } from 'element-ui'
+export default {
+  components:{
+
+  },
+  data() {
+    return {
+      select:{
+        pageIndex: 1,
+        pageSize: 10,
+        type:"",
+        read_state:""
+      },
+      stateList:[{
+        id:"",
+        value:"全部"
+      },{
+        id:2,
+        value:"未读"
+      },{
+        id:1,
+        value:"已读"
+      }],
+      typeList:[{
+        id:"MerchantBalance",
+        value:"余额不足"
+      },{
+        id:"OrderItemMemberCancel",
+        value:"用户取消单"
+      },{
+        id:"OrderItemMerchantAutoRecover",
+        value:"分发48小时未接收退回"
+      },{
+        id:"OrderItemMerchantCancel",
+        value:"商家取消订单"
+      },{
+        id:"OrderItemMerchantReturn",
+        value:"商家退回订单"
+      }],
+      total:0,
+      list:[],
+      table:[
+        {
+          label:"消息",
+          prop:'data.通知',
+          align:'left'
+        },
+        {
+          label:"状态",
+          prop:'read_at',
+          align:'center',
+          width:220,
+          customFn:(row)=>{
+            if(row.read_at){
+              return (<div style="color: green">已读</div>)
+            }else{
+              return (<div style="color: red">未读</div>)
+            }
+          }
+        },
+        {
+          label:"通知时间",
+          prop:'created_at',
+          align:'center',
+          width:220
+        },
+        // {
+        //   label:"状态",
+        //   prop:'type_name'
+        // }
+      ]
+    }
+  },
+  methods: {
+    async getNotices(){
+      const res = await getNotice({
+        page: this.select.pageIndex,
+        page_size: this.select.pageSize,
+        type:this.select.type,
+        read_state:this.select.read_state
+
+      })
+      this.list = res.data
+      this.total = res.total
+    },
+    pageChange(e) {
+      this.select.pageIndex = e
+      this.getNotices()
+    },
+    toggleMessage(item){
+      if(item.read_at) return
+      toggleRead({
+        id:item.id
+      }).then(res => {
+        this.$message({
+          type:'success',
+          message:res?.msg || "成功"
+        })
+        this.getNotices()
+      })
+    },
+  },
+  mounted() {
+    this.getNotices()
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>