From 83a87f4114088617a44233f9f21cb14dd67ce2b8 Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Tue, 20 Sep 2022 09:21:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20-=20=E6=B7=BB=E5=8A=A0=E7=BE=A4=E5=8F=91?=
 =?UTF-8?q?=20-=20=E7=BE=A4=E5=8F=91=E5=88=97=E8=A1=A8=20=20=20-=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=88=86=E9=A1=B5=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20-=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 12 +++++++++-
 src/utils/model.js                            |  4 ++--
 .../message-manage/main/add-mass/index.vue    | 12 +++++-----
 .../message-manage/main/mass-list/index.vue   | 22 +++++++++++++++++--
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d1d204d..8d999f6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-19 16:16:05
+ * @LastEditTime: 2022-09-20 09:21:28
  * @FilePath: \TelpoUserManageAdmin\README.md
  * @description:
 -->
@@ -103,3 +103,13 @@ fix
 - 添加群发
 - 群发列表
   - 修改 接口数据结构
+
+
+
+## v1.0.6
+`2022.9.20`
+fix
+- 添加群发
+- 群发列表
+  - 修复 分页异常的问题
+  - 修复 预览异常的问题
\ No newline at end of file
diff --git a/src/utils/model.js b/src/utils/model.js
index 6991ce6..50cba47 100644
--- a/src/utils/model.js
+++ b/src/utils/model.js
@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-19 16:18:49
+ * @LastEditTime: 2022-09-20 09:20:40
  * @FilePath: \TelpoUserManageAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.0.5';
+export const VersionModel = '1.0.6';
diff --git a/src/views/message-manage/main/add-mass/index.vue b/src/views/message-manage/main/add-mass/index.vue
index a88830c..c65a6ee 100644
--- a/src/views/message-manage/main/add-mass/index.vue
+++ b/src/views/message-manage/main/add-mass/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-08 10:09:47
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-19 17:25:05
+ * @LastEditTime: 2022-09-20 09:20:19
  * @FilePath: \TelpoUserManageAdmin\src\views\message-manage\main\add-mass\index.vue
  * @description: 添加群发
 -->
@@ -69,13 +69,13 @@
         <div class="preview-container">
           <div class="top">
             <p>{{form.first}}</p>
-            <p>学习账号：{{form.keyword1}}</p>
-            <p>更新内容：{{form.keyword2}}</p>
+            <p>消息类别：{{form.keyword1}}</p>
+            <p>通知用户：{{form.keyword2}}</p>
+            <p>通知内容：{{form.keyword3}}</p>
             <p>更新时间：{{initUpdateTime}}</p>
-            <p>{{form.remark}}</p>
           </div>
           <div class="fot">
-            <p>详情</p>
+            <p>{{form.remark}}</p>
             <p>></p>
           </div>
         </div>
@@ -163,7 +163,7 @@ export default {
   computed: {
     // 初始弹窗更新时间
     initUpdateTime() {
-       return initTime(new Date(), 'ymdh'); //更新时间
+       return initTime(new Date(), 'ymdhm'); //更新时间
     }
   },
   activated() {
diff --git a/src/views/message-manage/main/mass-list/index.vue b/src/views/message-manage/main/mass-list/index.vue
index fab7f97..079c6b9 100644
--- a/src/views/message-manage/main/mass-list/index.vue
+++ b/src/views/message-manage/main/mass-list/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-08 10:09:50
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-19 16:50:55
+ * @LastEditTime: 2022-09-20 09:16:28
  * @FilePath: \TelpoUserManageAdmin\src\views\message-manage\main\mass-list\index.vue
  * @description: 群发列表
 -->
@@ -28,6 +28,7 @@
             :total="total"
             :page.sync="searchParams.page"
             :limit.sync="searchParams.limit"
+            @pagination="pageChange"
         />
         <el-dialog
           title="发送明细"
@@ -45,6 +46,7 @@
             :total="detailsTotal"
             :page.sync="detailsParams.page"
             :limit.sync="detailsParams.limit"
+            @pagination="pageDetailsChange"
         />
         </el-dialog>
     </div>
@@ -63,7 +65,7 @@ export default {
             searchParams: {
                 subject: "",
                 page: 1,
-                limit: 10000
+                limit: 10
             },
             placeholder: "可输入消息主题",
             dataList: [
@@ -119,6 +121,8 @@ export default {
               limit: 10
             },
             errorMessage: '', //详情错误信息
+            // 群发明细ID
+            massDetailsId: ''
 
         };
     },
@@ -186,6 +190,7 @@ export default {
           console.log("value", value);
           //this.$router.push({name: 'send-details'});
           this.isDetailsShow = true;
+          this.massDetailsId = value.id;
           this.getGroupSenderDetails(value.id);
         },
         // 获取单个群发明细
@@ -212,6 +217,19 @@ export default {
         // 关闭群发明细
         onCloseDetail() {
           this.getGroupSender();
+        },
+        // 分页发生变化
+        pageChange() {
+          if (this.searchParams.keywords !== "") {
+            this.searchParams.keywords = "";
+            this.getGroupSender();
+          } else {
+            this.getGroupSender();
+          }
+        },
+        // 群发明细发生变化
+        pageDetailsChange() {
+          this.getGroupSenderDetails(this.massDetailsId);
         }
     }
 };