Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

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;
   }
 }
 

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>