diff --git a/src/apps/AppBroadcast1/AppBroadcast1.vue b/src/apps/AppBroadcast1/AppBroadcast1.vue
index 18acce70..209073ab 100644
--- a/src/apps/AppBroadcast1/AppBroadcast1.vue
+++ b/src/apps/AppBroadcast1/AppBroadcast1.vue
@@ -52,13 +52,13 @@ export default {
{
title: '音频录制',
text: '音频文件的录制',
- path: '../AppResourcesManage/addPlay?type=1',
+ path: './AppResourcesManage/addPlay?type=1',
imgUrl: require('./img/bigHorn-icon33@2x.png'),
bgClass: 'bg-E5B565'
},
{
title: '媒资管理',
- path: '../AppResourcesManage/AppResourcesManage',
+ path: './AppResourcesManage/AppResourcesManage',
text: '支持音频文件和录音内容添加',
imgUrl: require('./img/bigHorn-icon44@2x.png'),
bgClass: 'bg-F19661'
diff --git a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
index 57ef5208..e25bb181 100644
--- a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
+++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
@@ -5,7 +5,7 @@
播放方式
-
立即播放
![]()
+
立即播放

-

定时播放
+

定时播放
+
@@ -426,9 +428,13 @@ export default {
}
}
+ .flex{
+ display: flex;
+ justify-content: space-between;
+ }
+
.item {
- display: inline-block;
- width: 320px;
+ flex: 1;
height: 112px;
line-height: 112px;
text-align: center;
diff --git a/src/apps/AppBroadcast1/selectMedia.vue b/src/apps/AppBroadcast1/selectMedia.vue
index 78b04c81..30c2b79d 100644
--- a/src/apps/AppBroadcast1/selectMedia.vue
+++ b/src/apps/AppBroadcast1/selectMedia.vue
@@ -5,7 +5,7 @@
-
+
@@ -122,7 +122,7 @@ export default {
this.$http.post(`/app/appdlbresource/list`, null, {
params: {
- ...this.search,
+ name: this.keyword,
type: this.currIndex === 0 ? 1 : 3,
current: this.current,
size: 10,
diff --git a/src/apps/AppMessageNotification/AppMessageNotification.vue b/src/apps/AppMessageNotification/AppMessageNotification.vue
new file mode 100644
index 00000000..d58a30e8
--- /dev/null
+++ b/src/apps/AppMessageNotification/AppMessageNotification.vue
@@ -0,0 +1,450 @@
+
+
+
+
+
用户选择
+
+
+ 全部
+ 已选择
+
+

+
+
+
+
群发消息设置
+
+
*群发方式
+
+
+ {{item.name}}
+
+
+
+
+
+
*群发时间
+
+ {{form.sendTime}}
+ 请选择
+
+
+
+
*文本内容
+
+
+
{{ form.content.length }}/1000
+
+
+
其它类型
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/apps/AppMessageNotification/SelectUser.vue b/src/apps/AppMessageNotification/SelectUser.vue
new file mode 100644
index 00000000..72ab89a7
--- /dev/null
+++ b/src/apps/AppMessageNotification/SelectUser.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
diff --git a/src/apps/AppMessageNotification/components/img/local-icon.png b/src/apps/AppMessageNotification/components/img/local-icon.png
new file mode 100644
index 00000000..3e23aff6
Binary files /dev/null and b/src/apps/AppMessageNotification/components/img/local-icon.png differ
diff --git a/src/apps/AppMessageNotification/components/img/right-icon.png b/src/apps/AppMessageNotification/components/img/right-icon.png
new file mode 100644
index 00000000..e1c626b7
Binary files /dev/null and b/src/apps/AppMessageNotification/components/img/right-icon.png differ