From 59a0d1c07ee3789b982c40cfdc4a21c239b86029 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 16 Jan 2023 15:51:23 +0800
Subject: [PATCH] 2023-1-16

---
 src/layout/components/Navbar.vue             | 47 ++++++++++++++------
 src/views/activity/component/addActivity.vue | 14 +++---
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index eca6cfa..2537fad 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -41,21 +41,27 @@
                 >已读</Button
               >
             </el-dropdown-item>
-            <template v-for="(item, index) in noticeData">
-              <el-dropdown-item :divided="!index">
-                <div style="display: flex; align-items: center">
-                  <div v-for="(value, key) in item.data">
-                    {{ key }} : {{ value }}
-                  </div>
-                  <Button
-                    style="margin-left: 10px;"
-                    size="small"
-                    :type="item.read_at ? 'success' : 'primary'"
-                    :icon="item.read_at ? 'md-checkmark' : 'ios-create-outline'"
+            <template v-if="noticeData.length > 0">
+              <template v-for="(item, index) in noticeData">
+                <el-dropdown-item :divided="!index">
+                  <div style="display: flex; align-items: center">
+                    <div v-for="(value, key) in item.data">
+                      {{ key }} : {{ value }}
+                    </div>
+                    <Button
+                      style="margin-left: 10px;"
+                      size="small"
+                      :type="item.read_at ? 'success' : 'primary'"
+                      :icon="item.read_at ? 'md-checkmark' : 'ios-create-outline'"
+                      @click="toggleMessage(item)"
                     >{{ item.read_at ? "已读" : "标为已读" }}</Button
-                  >
-                </div>
-              </el-dropdown-item>
+                    >
+                  </div>
+                </el-dropdown-item>
+              </template>
+            </template>
+            <template v-else>
+              <div style="text-align: center;color: rgb(140,140,140);padding: 10px 0;">暂无通知</div>
             </template>
           </el-dropdown-menu>
         </template>
@@ -171,6 +177,19 @@ export default {
     ...mapGetters(["sidebar", "avatar"]),
   },
   methods: {
+    toggleMessage(item){
+      if(item.read_at) return
+      toggleRead({
+        id:item.id
+      }).then(res => {
+        this.$message({
+          type:'success',
+          message:res?.msg || "成功"
+        })
+        this.getNotice()
+      })
+    },
+
     async getNotice() {
       let res = await getNotice({
         read_state: this.messageStatus,
diff --git a/src/views/activity/component/addActivity.vue b/src/views/activity/component/addActivity.vue
index 5dcb64c..9cf3c7b 100644
--- a/src/views/activity/component/addActivity.vue
+++ b/src/views/activity/component/addActivity.vue
@@ -161,10 +161,10 @@
       <template v-slot:startMemberSum>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            活动人数：
+            初始活动人数：
           </div>
           <div class="xy-table-item-content">
-            <el-input-number :precision="0" :controls="false" v-model="form.startMemberSum" placeholder="请输入活动人数" clearable style="width: 300px;"></el-input-number>
+            <el-input-number :precision="0" :controls="false" v-model="form.startMemberSum" placeholder="请输入初始活动人数" clearable style="width: 300px;"></el-input-number>
           </div>
         </div>
       </template>
@@ -254,8 +254,8 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>活动内容:
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          <div class="xy-table-item-content" style="width: 680px;">
+            <xyTinymce :height="200" v-model="form.content"></xyTinymce>
           </div>
         </div>
       </template>
@@ -279,10 +279,10 @@ import {index as shopIndex} from "@/api/shop"
 import {store,show,save} from "@/api/activity"
 import { Message } from 'element-ui'
 
-import tinymce from "@/components/Tinymce"
+import xyTinymce from "@/components/XyTinymce/index.vue";
 export default {
   components:{
-    tinymce
+    xyTinymce
   },
   data() {
     return {
@@ -435,7 +435,6 @@ export default {
         sort:res.sort,
         content:res.content,
       }
-      this.$refs['tinymce'].setContent(this.form.content ?? ' ')
     },
 
     submit(){
@@ -521,7 +520,6 @@ export default {
         this.id = ''
         this.type = ''
         this.$refs['dialog'].reset()
-        this.$refs['tinymce'].setContent(' ')
       }
     }
   }