From 0b454e3b19b28aaf794c2aeee50ef00d5c5ec875 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 9 Jun 2022 10:45:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=96=8A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/beta/AppBroadcast1/LiveBroadcast.vue | 7 ++++--- src/project/beta/AppBroadcast1/img/voice.gif | Bin 0 -> 2613 bytes 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 src/project/beta/AppBroadcast1/img/voice.gif diff --git a/src/project/beta/AppBroadcast1/LiveBroadcast.vue b/src/project/beta/AppBroadcast1/LiveBroadcast.vue index 72c8ee14..1e57ef8e 100644 --- a/src/project/beta/AppBroadcast1/LiveBroadcast.vue +++ b/src/project/beta/AppBroadcast1/LiveBroadcast.vue @@ -11,7 +11,8 @@
- + + 23"
@@ -412,8 +413,8 @@ } image { - width: 20px; - height: 32px; + width: 28px; + height: 28px; margin-right: 14px; } } diff --git a/src/project/beta/AppBroadcast1/img/voice.gif b/src/project/beta/AppBroadcast1/img/voice.gif new file mode 100644 index 0000000000000000000000000000000000000000..10cc2dcf34e618afd44cc0bddf38b95953abab6a GIT binary patch literal 2613 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 Date: Thu, 9 Jun 2022 13:52:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/saas/AppCountryAlbum/AlbumDetail.vue | 7 +++++-- src/saas/AppCountryAlbum/EditAlbum.vue | 4 +--- src/saas/AppCountryAlbum/components/Home.vue | 4 +--- src/saas/AppCountryAlbum/components/Organize.vue | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue index c0284eaa..00b40b86 100644 --- a/src/saas/AppCountryAlbum/AlbumDetail.vue +++ b/src/saas/AppCountryAlbum/AlbumDetail.vue @@ -2,7 +2,11 @@

{{ info.albumName }}

-
+
相册设置
@@ -95,7 +99,6 @@ onLoad (query) { this.id = query.id - this.isAdmin = !!this.$store.state.user.adminAuthType this.$nextTick(() => { this.getTotalInfo(query.id) diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue index 4253597c..795e069b 100644 --- a/src/saas/AppCountryAlbum/EditAlbum.vue +++ b/src/saas/AppCountryAlbum/EditAlbum.vue @@ -57,7 +57,6 @@ isShow: false, list: [], currIndex: 0, - isAdmin: false, albumList: [], pageShow: false } @@ -75,7 +74,6 @@ onLoad (query) { this.$loading() - this.isAdmin = !!this.$store.state.user.adminAuthType this.id = query.id this.getAlbumList() @@ -90,7 +88,7 @@ params: { albumId: this.id, pageSize: 100000, - userId: this.isAdmin ? '' : this.$store.state.user.openId + userId: this.$store.state.user.openId } }).then(res => { if (res.code === 0) { diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue index 584f2301..1f4ce8b6 100644 --- a/src/saas/AppCountryAlbum/components/Home.vue +++ b/src/saas/AppCountryAlbum/components/Home.vue @@ -62,7 +62,6 @@

工作相册

- 未查看
@@ -80,7 +79,7 @@
-
+

添加相册

@@ -116,7 +115,6 @@ }, mounted () { - console.log(this.user.adminAuthType) this.getCountPhotoNo() this.getAlbumList() this.getMsgList() diff --git a/src/saas/AppCountryAlbum/components/Organize.vue b/src/saas/AppCountryAlbum/components/Organize.vue index 874baa90..ceac8d05 100644 --- a/src/saas/AppCountryAlbum/components/Organize.vue +++ b/src/saas/AppCountryAlbum/components/Organize.vue @@ -44,7 +44,7 @@
-
+

考勤统计

From 164d1d1b0ee04afe46ce67f64828b74c02fb1c17 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 9 Jun 2022 14:10:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=91=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beta => apps}/AppBroadcast1/AppBroadcast1.vue | 0 .../AppBroadcast1/AppEquipment/AppEquipment.vue | 0 .../AppBroadcast1/AppEquipment/detail.vue | 0 .../AppBroadcast1/AppEquipment/taskDetail.vue | 0 .../AppBroadcast1/AppPlayList/AppPlayList.vue | 0 .../AppBroadcast1/AppPlayList/detail.vue | 0 .../AppBroadcast1/AppPlayList/equipmentList.vue | 0 .../AppResourcesManage/AppResourcesManage.vue | 10 ++++++++-- .../AppBroadcast1/AppResourcesManage/addPlay.vue | 0 .../AppBroadcast1/AppResourcesManage/detail.vue | 0 .../AppResourcesManage/img/add-icon.png | Bin .../AppBroadcast1/AppResourcesManage/img/body.png | Bin .../AppResourcesManage/img/circle-active.png | Bin .../AppResourcesManage/img/circle-icon.png | Bin .../AppResourcesManage/img/microphone.png | Bin .../AppResourcesManage/img/play-icon.png | Bin .../AppResourcesManage/img/right-icon.png | Bin .../AppResourcesManage/img/right-img.png | Bin .../AppResourcesManage/img/stop-img.png | Bin .../AppBroadcast1/AppResourcesManage/img/top.png | Bin .../AppResourcesManage/img/video-img.png | Bin .../AppBroadcast1/AppResourcesManage/recording.vue | 0 .../AppBroadcast1/AppResourcesManage/talking.vue | 0 .../beta => apps}/AppBroadcast1/LiveBroadcast.vue | 0 .../beta => apps}/AppBroadcast1/addPlay.vue | 0 .../beta => apps}/AppBroadcast1/img/bigHorn-bg.png | Bin .../AppBroadcast1/img/bigHorn-icon11@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon1@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon22@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon2@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon33@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon3@2x.png | Bin .../AppBroadcast1/img/bigHorn-icon44@2x.png | Bin .../AppBroadcast1/img/bigHorn-lb@2x.png | Bin .../beta => apps}/AppBroadcast1/img/bigHorn-xz.png | Bin .../beta => apps}/AppBroadcast1/img/body.png | Bin .../beta => apps}/AppBroadcast1/img/cir.png | Bin .../beta => apps}/AppBroadcast1/img/close-w.png | Bin .../beta => apps}/AppBroadcast1/img/close.png | Bin .../beta => apps}/AppBroadcast1/img/lb@2x.png | Bin .../beta => apps}/AppBroadcast1/img/microphone.png | Bin .../beta => apps}/AppBroadcast1/img/right-icon.png | Bin .../beta => apps}/AppBroadcast1/img/right.png | Bin .../beta => apps}/AppBroadcast1/img/search-icon.png | Bin .../beta => apps}/AppBroadcast1/img/select-blue.png | Bin .../beta => apps}/AppBroadcast1/img/voice-icon.png | Bin .../beta => apps}/AppBroadcast1/img/voice-w.png | Bin .../beta => apps}/AppBroadcast1/onlineList.vue | 0 .../beta => apps}/AppBroadcast1/onlinePlayList.vue | 0 .../beta => apps}/AppBroadcast1/playList.vue | 0 .../beta => apps}/AppBroadcast1/selectEquipment.vue | 0 .../beta => apps}/AppBroadcast1/selectMedia.vue | 0 .../beta => apps}/AppBroadcast1/selectMp3.vue | 0 .../police/AppMessageNotification/SelectUser.vue | 6 +++--- .../police/AppResidentFile/AppResidentFile.vue | 2 ++ 55 files changed, 13 insertions(+), 5 deletions(-) rename src/{project/beta => apps}/AppBroadcast1/AppBroadcast1.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppEquipment/AppEquipment.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppEquipment/detail.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppEquipment/taskDetail.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppPlayList/AppPlayList.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppPlayList/detail.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppPlayList/equipmentList.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue (96%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/addPlay.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/detail.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/add-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/body.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/circle-active.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/circle-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/microphone.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/play-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/right-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/right-img.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/stop-img.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/top.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/img/video-img.png (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/recording.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/AppResourcesManage/talking.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/LiveBroadcast.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/addPlay.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-bg.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon11@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon1@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon22@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon2@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon33@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon3@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-icon44@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-lb@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/bigHorn-xz.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/body.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/cir.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/close-w.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/close.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/lb@2x.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/microphone.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/right-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/right.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/search-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/select-blue.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/voice-icon.png (100%) rename src/{project/beta => apps}/AppBroadcast1/img/voice-w.png (100%) rename src/{project/beta => apps}/AppBroadcast1/onlineList.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/onlinePlayList.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/playList.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/selectEquipment.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/selectMedia.vue (100%) rename src/{project/beta => apps}/AppBroadcast1/selectMp3.vue (100%) diff --git a/src/project/beta/AppBroadcast1/AppBroadcast1.vue b/src/apps/AppBroadcast1/AppBroadcast1.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppBroadcast1.vue rename to src/apps/AppBroadcast1/AppBroadcast1.vue diff --git a/src/project/beta/AppBroadcast1/AppEquipment/AppEquipment.vue b/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppEquipment/AppEquipment.vue rename to src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue diff --git a/src/project/beta/AppBroadcast1/AppEquipment/detail.vue b/src/apps/AppBroadcast1/AppEquipment/detail.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppEquipment/detail.vue rename to src/apps/AppBroadcast1/AppEquipment/detail.vue diff --git a/src/project/beta/AppBroadcast1/AppEquipment/taskDetail.vue b/src/apps/AppBroadcast1/AppEquipment/taskDetail.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppEquipment/taskDetail.vue rename to src/apps/AppBroadcast1/AppEquipment/taskDetail.vue diff --git a/src/project/beta/AppBroadcast1/AppPlayList/AppPlayList.vue b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppPlayList/AppPlayList.vue rename to src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue diff --git a/src/project/beta/AppBroadcast1/AppPlayList/detail.vue b/src/apps/AppBroadcast1/AppPlayList/detail.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppPlayList/detail.vue rename to src/apps/AppBroadcast1/AppPlayList/detail.vue diff --git a/src/project/beta/AppBroadcast1/AppPlayList/equipmentList.vue b/src/apps/AppBroadcast1/AppPlayList/equipmentList.vue similarity index 100% rename from src/project/beta/AppBroadcast1/AppPlayList/equipmentList.vue rename to src/apps/AppBroadcast1/AppPlayList/equipmentList.vue diff --git a/src/project/beta/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue similarity index 96% rename from src/project/beta/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue rename to src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue index fe484022..6d3e2bc7 100644 --- a/src/project/beta/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue +++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue @@ -51,7 +51,7 @@ export default { url: '', autioName: '', audio: null, - barStyle: {width: '98px', bottom: '-3px', left: '-38px'}, + barStyle: {width: '96px', bottom: '-3px', left: '-38px'}, keyword: '', type: '0', typeList: [{label: '全部', value: '0'}, {label: '我创建的', value: '1'},] @@ -156,7 +156,7 @@ export default { }) }, toDetail(item) { - uni.navigateTo({url: `./detail`}) + uni.navigateTo({url: `./detail?id=${item.id}`}) } }, @@ -168,6 +168,11 @@ export default {