Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

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'

src/apps/AppBroadcast1/LiveBroadcast.vue

@@ -16,15 +16,17 @@
         <scroll-view scroll-y class="record-wrapper">
           <div class="record-item" v-for="(item, index) in recordList" :key="index">
             <image :src="user.avatar" />
-            <div class="right" :style="{width: item.duration + '%'}">
+            <div class="right-wrapper">
-              <image mode="aspectFit" @click="play(item.src, index)" v-if="!item.isPlay" src="./img/voice-icon.png" />
+              <div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}" @click="play(item.src, index)">
-              <image v-else @click="play(item.src, index)" src="./img/voice.gif" />
+                <image mode="aspectFit" v-if="!item.isPlay" src="./img/voice-icon.png" />
-              <span>{{ item.duration }}"</span>
+                <image v-else src="./img/voice.gif" />
+                <span>{{ item.duration }}"</span>
+              </div>
             </div>
           </div>
         </scroll-view>
       </div>
-      <div class="tips">
+      <div class="tips" v-if="!isShowRecord">
         <image src="./img/body.png" />
         <p>请先选择设备再按住下方按钮开始喊话~</p>
       </div>
@@ -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: url(./img/voice-bg.png);
-        background: linear-gradient(180deg, #9D9E9F 0%, #D4D5D6 100%);
+        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 {

src/apps/AppMonitoringObject/Add.vue

@@ -100,6 +100,18 @@
             </div>
           </div>
         </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>共同生活家庭人口数</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" type="number" v-model="form.familyCount" :maxlength="20"
+                     placeholder-style="color: #999; font-size: 30rpx;"/>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="form-group">
         <div class="form-item">
@@ -483,6 +495,7 @@ export default {
         foreignWorkers: '',
         foreignWorkersAddress: '',
         houseIdNumber: '',
+        familyCount: '',
       },
       $areaId: '',
       girdInfo: {},

src/apps/AppMonitoringObject/residentDetail.vue

@@ -65,6 +65,10 @@
           <label>残疾证办证年度</label>
           <span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span>
         </div>
+        <div class="item-info">
+          <label>家庭人口数</label>
+          <span>{{ info.familyCount }}</span>
+        </div>
         <!-- 基础保障 -->
         <h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">基础保障</h4>
         <div class="item-info">