diff --git a/src/apps/AppBroadcast1/AppBroadcast1.vue b/src/apps/AppBroadcast1/AppBroadcast1.vue index 209073ab..18acce70 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/LiveBroadcast.vue b/src/apps/AppBroadcast1/LiveBroadcast.vue index 9b86d560..c94f043b 100644 --- a/src/apps/AppBroadcast1/LiveBroadcast.vue +++ b/src/apps/AppBroadcast1/LiveBroadcast.vue @@ -16,15 +16,17 @@
-
- - - {{ item.duration }}" +
+
+ + + {{ item.duration }}" +
-
+

请先选择设备再按住下方按钮开始喊话~

@@ -121,9 +123,15 @@ this.y = close.offsetTop this.w = close.clientWidth this.h = close.clientHeight + + document.body.addEventListener('touchmove', this.bindEvent, { passive: false }) }) }, + destroyed () { + document.body.removeEventListener('touchmove', this.bindEvent) + }, + onLoad () { this.innerAudioContext = uni.createInnerAudioContext() this.innerAudioContext.autoplay = true @@ -145,6 +153,10 @@ }, methods: { + bindEvent (e) { + e.preventDefault() + }, + onLongtap () { if (!this.equipmentList.length) { return this.$u.toast('请选择播发设备') @@ -240,6 +252,14 @@ let formData = {} formData = new FormData() formData.append('file', new window.File([blob], `${(new Date).getTime()}` )) + // this.$u.toast('播发成功') + // this.recordList.push({ + // src: (window.URL || webkitURL).createObjectURL(blob), + // isPlay: false, + // duration: (duration / 1000).toFixed(0) + // }) + // this.isShowRecord = true + // return this.$loading() this.$http.post(`/app/appdlbresource/uploadDlbFile`, formData).then(res => { @@ -358,12 +378,14 @@ width: 100%; height: 234px; margin-top: 48px; - border-radius: 200px 200px 0 0; - background: linear-gradient(180deg, #9D9E9F 0%, #D4D5D6 100%); + background: url(./img/voice-bg.png); + background-size: 100% 100%; image { width: 96px; height: 96px; + pointer-events: none; + user-select: none; } } @@ -458,6 +480,7 @@ .middle { height: calc(100% - 378px); + overflow: hidden; background: #fff; .tips { @@ -520,6 +543,11 @@ border-radius: 8px; } + .right-wrapper { + // flex: 1; + width: calc(100% - 102px); + } + .right { display: flex; align-items: center; @@ -530,6 +558,7 @@ min-width: 160px; max-width: 100%; background: #C0DAFF; + box-sizing: border-box; &::after { position: absolute; @@ -571,6 +600,7 @@ height: 128px; margin-bottom: 16px; pointer-events: none; + user-select: none; } p { diff --git a/src/apps/AppBroadcast1/img/voice-bg.png b/src/apps/AppBroadcast1/img/voice-bg.png new file mode 100644 index 00000000..7345d130 Binary files /dev/null and b/src/apps/AppBroadcast1/img/voice-bg.png differ diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 1db5dde1..272fcc87 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -100,6 +100,18 @@
+
+
+
+ * + 共同生活家庭人口数 +
+
+ +
+
+
@@ -483,6 +495,7 @@ export default { foreignWorkers: '', foreignWorkersAddress: '', houseIdNumber: '', + familyCount: '', }, $areaId: '', girdInfo: {}, diff --git a/src/apps/AppMonitoringObject/residentDetail.vue b/src/apps/AppMonitoringObject/residentDetail.vue index 6589ca9c..9fda37b9 100644 --- a/src/apps/AppMonitoringObject/residentDetail.vue +++ b/src/apps/AppMonitoringObject/residentDetail.vue @@ -65,6 +65,10 @@ {{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}
+
+ + {{ info.familyCount }} +

基础保障