diff --git a/src/apps/AppBuilding/detail.vue b/src/apps/AppBuilding/detail.vue
index f06a6ab6..38bfe65f 100644
--- a/src/apps/AppBuilding/detail.vue
+++ b/src/apps/AppBuilding/detail.vue
@@ -41,7 +41,7 @@
     </div>
     <u-select v-model="showSelect" :list="selectList" label-name="cellName" value-name="id"
               @confirm="confirmSelect"></u-select>
-    <u-popup v-model="show" mode="bottom" border-radius="14">
+    <u-popup v-model="show" mode="bottom" border-radius="14" height="1000">
       <div class="popup">
         <div class="bg"></div>
         <div class="title">{{ houseInfo.createAddress }}</div>
@@ -127,6 +127,7 @@
           </div>
         </div>
       </div>
+      <div class="pad-b112"></div>
       <div class="pop-btn" @click="toAdd(houseInfo.id)">编辑修改</div>
     </u-popup>
   </div>
@@ -520,6 +521,12 @@ export default {
     font-weight: 500;
     color: #FFF;
     background: #1365DD;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .pad-b112{
+    padding-bottom: 112px;
   }
 }
 
diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue
index 65117c73..0111e06a 100644
--- a/src/apps/AppCountryAlbum/list.vue
+++ b/src/apps/AppCountryAlbum/list.vue
@@ -50,7 +50,7 @@ export default {
     getList() {
       this.$http.post(`/app/appvillagepicturealbum/queryAlbumMenu`, null, {
         params: {
-          areaId: this.user.areaId,
+          areaId: this.areaId,
         }
       }).then(res => {
         if (res.code == 0) {
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index b8077e40..e5ce7e07 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -395,7 +395,7 @@ uni-page-body {
         .imgs {
           margin-top: 8px;
           img {
-            width: 201px;
+            width: 32%;
             height: 204px;
             margin-right: 8px;
           }
diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index 7064149f..0b51ffa2 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -29,7 +29,7 @@
               <span>| 2天</span>
             </div>
 
-            <div class="areaNmae">{{ item.address }}</div>
+            <div class="areaNmae" v-if="item.areaName || item.address">{{ item.areaName }}{{ item.address }}</div>
           </div>
 
           <img :src="item.url[0].url" alt="" />
diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index fdf8f409..e71bee3e 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="AppResidentDocument">
-    <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+    <div class="areatop">
+      <div>区域选择</div>
+      <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+    </div>
 
     <div class="line"></div>
 
@@ -25,23 +28,6 @@
             <span>{{ item.phone }}</span>
           </div>
         </div>
-
-        <!-- <div class="left">
-          <img :src="item.avatar" alt="" v-if="item.photo" />
-          <img src="./components/img/4.png" alt="" v-else />
-        </div>
-
-        <div class="right">
-          <div class="rightTop">
-            {{ item.corpName }}
-            <span v-if="item.corpFullName" style="margin-left: 4px">@{{ item.corpFullName }}</span>
-          </div>
-          <div class="rightBottom">
-            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
-
-            <span>{{ item.phone }}</span>
-          </div>
-        </div> -->
       </div>
     </div>
 
@@ -143,6 +129,13 @@ export default {
 .AppResidentDocument {
   height: 100%;
   background: #fff;
+  .areatop {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 32px;
+  }
+
   .line {
     height: 16px;
     background: #f5f5f5;
diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index 7a8afb9f..42a506b7 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -12,7 +12,7 @@
     </div>
 
     <div class="bottom">
-      <div class="hints">家庭成员 {{ data.family.length }}人</div>
+      <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
 
       <div v-if="data.family && data.family.length > 0">
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
@@ -26,8 +26,8 @@
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
                 <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
-                <span class="householdNames" v-if="item.householdRelation == 1">户主</span>
-                <span class="householdNames" v-else>
+
+                <span class="householdNames">
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}
                 </span>
               </div>
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index fcbf24d7..ad49a3a3 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -2,21 +2,20 @@
   <div class="DetailPeople">
     <div class="top">
       <div class="photos">
-        <img :src="data.resident.photo" alt="" v-if="data.resident.photo" />
+        <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
         <img src="./components/img/44.png" alt="" v-else />
       </div>
 
       <div class="right">
         <div class="rightTop">
-          <span class="names">{{ data.resident.name }}</span>
+          <span class="names">{{ data.resident && data.resident.name }}</span>
 
-          <span class="householdNames" v-if="data.resident.householdRelation == 1">户主</span>
-          <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
+          <span class="householdNames">
+            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>
         </div>
 
-        <div class="rightBottom">{{ data.resident.phone }}</div>
+        <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
       </div>
     </div>
 
@@ -28,47 +27,47 @@
       <div class="contents">
         <div class="item">
           <span>籍贯</span>
-          <span>{{ data.resident.birthplaceAreaName }}</span>
+          <span>{{ data.resident && data.resident.birthplaceAreaName }}</span>
         </div>
 
         <div class="item">
           <span>身份证号</span>
-          <span>{{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+          <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
         </div>
 
         <div class="item">
           <span>民族</span>
-          <span> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
+          <span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
         </div>
 
         <div class="item">
           <span>文化程度</span>
-          <span>{{ $dict.getLabel('education', data.resident.education) }}</span>
+          <span v-if="data.resident && data.resident.education">{{ $dict.getLabel('education', data.resident.education) }}</span>
         </div>
 
         <div class="item">
           <span>婚姻状况</span>
-          <span>{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
+          <span v-if="data.resident && data.resident.maritalStatus">{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
         </div>
 
         <div class="item">
           <span>政治面貌</span>
-          <span>{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
+          <span v-if="data.resident && data.resident.politicsStatus">{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
         </div>
 
         <div class="item">
           <span>兵役状况</span>
-          <span>{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
+          <span v-if="data.resident && data.resident.militaryStatus">{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
         </div>
 
         <div class="item">
           <span>宗教信仰</span>
-          <span>{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
+          <span v-if="data.resident && data.resident.faithType">{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
         </div>
 
         <div class="item">
           <span>职业</span>
-          <span>{{ $dict.getLabel('job', data.resident.job) }}</span>
+          <span v-if="data.resident && data.resident.job">{{ $dict.getLabel('job', data.resident.job) }}</span>
         </div>
       </div>
     </div>
@@ -81,27 +80,27 @@
       <div class="contents">
         <div class="item">
           <span>联系方式</span>
-          <span class="phones" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
+          <span class="phones" v-if="data.resident && data.resident.phone" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
         </div>
 
         <div class="item">
           <span>现住址</span>
-          <span>{{ data.resident.currentAreaName }}</span>
+          <span v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
         </div>
 
         <div class="item">
           <span>现住详细地址</span>
-          <span>{{ data.resident.currentAddress }}</span>
+          <span v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
         </div>
 
         <div class="item">
           <span>户籍地址</span>
-          <span>{{ data.resident.householdAreaName }}</span>
+          <span v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
         </div>
 
         <div class="item">
           <span>户籍详细地址</span>
-          <span>{{ data.resident.householdAddress }}</span>
+          <span v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
         </div>
       </div>
     </div>
diff --git a/src/apps/AppResourcesManage/img/play-icon.png b/src/apps/AppResourcesManage/img/play-icon.png
new file mode 100644
index 00000000..93d3c996
Binary files /dev/null and b/src/apps/AppResourcesManage/img/play-icon.png differ
diff --git a/src/apps/AppResourcesManage/img/stop-img.png b/src/apps/AppResourcesManage/img/stop-img.png
new file mode 100644
index 00000000..57180c34
Binary files /dev/null and b/src/apps/AppResourcesManage/img/stop-img.png differ
diff --git a/src/apps/AppResourcesManage/recording.vue b/src/apps/AppResourcesManage/recording.vue
index de2b34c6..9162ba12 100644
--- a/src/apps/AppResourcesManage/recording.vue
+++ b/src/apps/AppResourcesManage/recording.vue
@@ -109,7 +109,7 @@
     </div>
     <div class="footer">
       <span v-if="isRecording || isStop" @click="restart">重新开始</span>
-      <img v-if="isStop" :src="`${$cdn}video/${!isPlay ? 'play-icon' : 'stop-img'}.png`" @click="play">
+      <img v-if="isStop" :src="`${!isPlay ? './img/play-icon' : './img/stop-img'}.png`" @click="play">
       <img v-else :src="isRecording ? stopImg : microphone" @click="record">
       <span v-if="isStop" @click="save">保存</span>
     </div>
diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue
index 597a4abf..ad25af86 100644
--- a/src/apps/AppUniMsg/Add.vue
+++ b/src/apps/AppUniMsg/Add.vue
@@ -17,7 +17,7 @@
         <div class="line"></div>
 
         <u-form-item label="图片上传 (最多9张)" prop="images" :border-bottom="false" class="avatars" label-position="top">
-          <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9"></AiUploader>
+          <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
         </u-form-item>
 
         <div class="line"></div>
diff --git a/src/apps/AppWorkonline/AppWorkonline.vue b/src/apps/AppWorkonline/AppWorkonline.vue
index 325ada49..4cb45d0a 100644
--- a/src/apps/AppWorkonline/AppWorkonline.vue
+++ b/src/apps/AppWorkonline/AppWorkonline.vue
@@ -165,9 +165,6 @@ uni-page-body {
             font-weight: 500;
             margin-bottom: 16px;
             width: 80%;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
           }
           .plan,
           .modetpye,