From 7ba6a2e385538eb4008dcdf2df40da0a06a6ef92 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 12 Jan 2023 19:47:25 +0800
Subject: [PATCH] =?UTF-8?q?mp=EF=BC=9A=E5=A2=9E=E5=8A=A0=E3=80=90=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E3=80=91=E6=B6=88=E6=81=AF=E7=9A=84=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/message/vo/MpMessageSendReqVO.java  |  2 +-
 .../mp/components/wx-material-select/main.vue |  3 +-
 .../src/views/mp/components/wx-reply/main.vue | 53 ++++++++-----------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/MpMessageSendReqVO.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/MpMessageSendReqVO.java
index cb673b2f6..6ca179201 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/MpMessageSendReqVO.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/MpMessageSendReqVO.java
@@ -38,7 +38,7 @@ public class MpMessageSendReqVO {
     private String title;
 
     @ApiModelProperty(value = "描述", required = true, example = "你猜")
-    @NotEmpty(message = "消息内容不能为空", groups = VideoGroup.class)
+    @NotEmpty(message = "消息描述不能为空", groups = VideoGroup.class)
     private String description;
 
     @ApiModelProperty(value = "缩略图的媒体 id", required = true, example = "qqc_2Fot30Jse-HDoZmo5RrUDijz2nGUkP")
diff --git a/yudao-ui-admin/src/views/mp/components/wx-material-select/main.vue b/yudao-ui-admin/src/views/mp/components/wx-material-select/main.vue
index fade74cee..4233d09b8 100644
--- a/yudao-ui-admin/src/views/mp/components/wx-material-select/main.vue
+++ b/yudao-ui-admin/src/views/mp/components/wx-material-select/main.vue
@@ -28,7 +28,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="mediaId" />
-      <el-table-column label="名字" align="center" prop="name" />
+      <el-table-column label="文件名" align="center" prop="name" />
       <el-table-column label="语音" align="center">
         <template v-slot="scope">
           <wx-voice-player :url="scope.row.url" />
@@ -54,6 +54,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="mediaId" />
+      <el-table-column label="文件名" align="center" prop="name" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="介绍" align="center" prop="introduction" />
       <el-table-column label="视频" align="center">
diff --git a/yudao-ui-admin/src/views/mp/components/wx-reply/main.vue b/yudao-ui-admin/src/views/mp/components/wx-reply/main.vue
index cf7c790b0..a085fa389 100644
--- a/yudao-ui-admin/src/views/mp/components/wx-reply/main.vue
+++ b/yudao-ui-admin/src/views/mp/components/wx-reply/main.vue
@@ -81,15 +81,16 @@
         </el-dialog>
       </el-row>
     </el-tab-pane>
+    <!-- 类型 4：视频 -->
     <el-tab-pane name="video">
       <span slot="label"><i class="el-icon-share"></i> 视频</span>
       <el-row>
-        <el-input v-model="objData.repName" placeholder="请输入标题"></el-input>
+        <el-input v-model="objData.title" placeholder="请输入标题"></el-input>
         <div style="margin: 20px 0;"></div>
-        <el-input v-model="objData.repDesc" placeholder="请输入描述"></el-input>
+        <el-input v-model="objData.description" placeholder="请输入描述"></el-input>
         <div style="margin: 20px 0;"></div>
         <div style="text-align: center;">
-          <a target="_blank" v-if="objData.url" :href="objData.url"><i class="icon-shipinbofang">&nbsp;播放视频</i></a>
+          <wx-video-player v-if="objData.url" :url="objData.url" />
         </div>
         <div style="margin: 20px 0;"></div>
         <div style="text-align: center">
@@ -161,13 +162,15 @@
   import WxNews from '@/views/mp/components/wx-news/main.vue'
   import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'
   import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
+  import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
 
   export default {
     name: "wxReplySelect",
     components: {
       WxNews,
       WxMaterialSelect,
-      WxVoicePlayer
+      WxVoicePlayer,
+      WxVideoPlayer
     },
     props: {
       objData: { // 消息对象。
@@ -354,27 +357,22 @@
             || this.objData.type === 'voice') {
           tempObjItem.mediaId = item.mediaId
           this.objData.mediaId = item.mediaId
-          if (item.url) {
-            tempObjItem.url = item.url;
-            this.objData.url = item.url;
-          } else { // 必须使用 $delete 删除，否则 vue 监听不到数据
-            this.$delete(this.objData, 'url');
-          }
+          tempObjItem.url = item.url;
+          this.objData.url = item.url;
           tempObjItem.name = item.name
           this.objData.name = item.name
         } else if (this.objData.type === 'video') {
-          // getMaterialVideo({
-          //   mediaId:item.mediaId
-          // }).then(response => {
-          //   if(response.code == 200){
-          //     let data = response.data
-          //     this.$set(this.objData,'repName',data.title)
-          //     this.$set(this.objData,'repDesc',data.description)
-          //     this.$set(this.objData,'url',data.downUrl)
-          //     tempObjItem.repDesc = data.description
-          //     tempObjItem.url = data.downUrl
-          //   }
-          // })
+          tempObjItem.mediaId = item.mediaId
+          this.objData.mediaId = item.mediaId
+          tempObjItem.url = item.url;
+          this.objData.url = item.url;
+          tempObjItem.name = item.name
+          this.objData.name = item.name
+          // title、introduction
+          this.objData.title = item.title
+          tempObjItem.title = this.objData.title
+          this.objData.description = item.introduction // 消息使用的是 description，素材使用的是 introduction，所以转换下
+          tempObjItem.description = this.objData.introduction
         }
         // 最终设置到临时缓存
         this.tempObj.set(this.objData.type, tempObjItem)
@@ -400,15 +398,8 @@
         this.dialogThumbVisible = false
       },
       deleteObj() {
-        console.log('删除！');
-        if (this.objData.type === 'news') {
-          // TODO 芋艿，待实现
-        } else if(this.objData.type === 'image'
-            || this.objData.type === 'voice') {
-          this.selectMaterial({}) // 选择一个空的素材
-        }  else if(this.objData.type === 'video') {
-          // TODO 芋艿，待实现
-        }
+        // this.$delete(this.objData, 'url'); TODO 芋艿：重新实现清空；还有 reset
+        this.selectMaterial({}) // 选择一个空的素材
       },
       getPage(page, params) {
         this.tableLoading = true