diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/material/vo/MpMaterialRespVO.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/material/vo/MpMaterialRespVO.java index 2ee8fa9ee..352d8ba67 100644 --- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/material/vo/MpMaterialRespVO.java +++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/material/vo/MpMaterialRespVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel("管理后台 - 公众号素材 Response VO") @Data public class MpMaterialRespVO { @@ -39,4 +41,8 @@ public class MpMaterialRespVO { private String title; @ApiModelProperty(value = "视频素材的描述", example = "我是介绍", notes = "只有【永久素材】使用") private String introduction; + + @ApiModelProperty(value = "创建时间", required = true) + private Date createTime; + } 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 f6de1ae2d..fade74cee 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 @@ -23,45 +23,59 @@ -
- - - - - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + +
-
- - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + +
@@ -95,6 +109,8 @@ // import { tableOptionVoice } from '@/const/crud/wxmp/wxmaterial_voice' // import { tableOptionVideo } from '@/const/crud/wxmp/wxmaterial_video' import WxNews from '@/views/mp/components/wx-news/main.vue'; + import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'; + import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'; import { getMaterialPage } from "@/api/mp/material"; // import {getPage as getPageNews} from '@/api/wxmp/wxfreepublish' // import {getPage as getPageNewsDraft} from '@/api/wxmp/wxdraft' @@ -102,7 +118,9 @@ export default { name: "wxMaterialSelect", components: { - WxNews + WxNews, + WxVoicePlayer, + WxVideoPlayer }, props: { objData: { 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 8b4dd4577..cf7c790b0 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 @@ -19,7 +19,7 @@
-

{{objData.repName}}

+

{{objData.name}}

@@ -54,7 +54,7 @@ 语音
-

{{objData.repName}}

+

{{objData.name}}

@@ -315,22 +315,17 @@ this.objData.content = tempObjItem.content ? tempObjItem.content : null this.objData.mediaId = tempObjItem.mediaId ? tempObjItem.mediaId : null this.objData.url = tempObjItem.url ? tempObjItem.url : null + this.objData.name = tempObjItem.url ? tempObjItem.name : null // TODO 芋艿:临时注释掉,看看有没用 - // this.objData.repName = tempObjItem.repName ? tempObjItem.repName : null - // this.objData.repMediaId = tempObjItem.repMediaId ? tempObjItem.repMediaId : null // this.objData.repDesc = tempObjItem.repDesc ? tempObjItem.repDesc : null return; } // 如果获取不到,需要把 objData 复原 + this.objData.content = undefined; this.objData.mediaId = undefined; this.objData.url = undefined; - this.objData.content = undefined; - // this.$delete(this.objData,'repName') - // this.$delete(this.objData,'repMediaId') - // this.$delete(this.objData,'mediaId') - // this.$delete(this.objData,'url') - // this.$delete(this.objData,'content') // TODO 芋艿:貌似删除了,文本无法输入 + this.objData.name = undefined; // this.$delete(this.objData,'repDesc') }, /** @@ -357,12 +352,16 @@ tempObjItem.hqMusicUrl = this.objData.hqMusicUrl } else if (this.objData.type === 'image' || this.objData.type === 'voice') { - tempObjItem.mediaId = item.mediaId; + tempObjItem.mediaId = item.mediaId this.objData.mediaId = item.mediaId - tempObjItem.url = item.url; - this.objData.url = item.url - // tempObjItem.repName = item.name - // this.objData.repName = item.name + if (item.url) { + tempObjItem.url = item.url; + this.objData.url = item.url; + } else { // 必须使用 $delete 删除,否则 vue 监听不到数据 + this.$delete(this.objData, 'url'); + } + tempObjItem.name = item.name + this.objData.name = item.name } else if (this.objData.type === 'video') { // getMaterialVideo({ // mediaId:item.mediaId @@ -401,6 +400,7 @@ this.dialogThumbVisible = false }, deleteObj() { + console.log('删除!'); if (this.objData.type === 'news') { // TODO 芋艿,待实现 } else if(this.objData.type === 'image'