Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

src/views/homestead/index.vue

@@ -435,14 +435,14 @@
           <div class="statusQuo">
             <div class="picture" v-if="landInfoLookList.behindland == ''"></div>
             <div class="picture" v-if="landInfoLookList.behindland != ''">
-              <img :src="landInfoLookList.behindland" />
+              <img :src="landInfoLookList.behindland" class="describe"/>
             </div>
             <div class="describe">现<br />状<br />图<br />片</div>
           </div>
           <div class="statusQuo">
             <div class="picture" v-if="landInfoLookList.frontland == ''"></div>
             <div class="picture" v-if="landInfoLookList.frontland != ''">
-              <img :src="landInfoLookList.frontland" />
+              <img :src="landInfoLookList.frontland" class="describe"/>
             </div>
             <div class="describe">历<br />史<br />图<br />片</div>
           </div>
@@ -726,25 +726,33 @@
           </div>
           <!--2-->
           <div class="uploadPicturesFlex_block">
-            <div class="title_m">上传历史图片</div>
+            <div class="title_m">上传现状图片</div>
             <div class="main_m">
               <van-uploader
-                v-model="nfAddfileListHistory"
-                :after-read="nfAddimgonReadHistory"
+                v-model="nfAddfileListNow"
+                :after-read="nfAddimgonReadNow"
                 :max-count="1"
                 accept="image/gif, image/jpeg, image/png"
-              />
+              >
+                <div v-if="houseInfoList.behindHouse !=null">
+                <img :src=houseInfoList.behindHouse alt="等待传图">
+                </div>
+              </van-uploader>
             </div>
           </div>
           <div class="uploadPicturesFlex_block">
-            <div class="title_m">上传现状图片</div>
+            <div class="title_m">上传历史图片</div>
             <div class="main_m">
               <van-uploader
-                v-model="nfAddfileListNow"
-                :after-read="nfAddimgonReadNow"
+                v-model="nfAddfileListHistory"
+                :after-read="nfAddimgonReadHistory"
                 :max-count="1"
                 accept="image/gif, image/jpeg, image/png"
-              />
+              >
+                <div v-if="houseInfoList.frontHouse != null">
+              <img :src=houseInfoList.frontHouse alt="等待传图">
+                </div>
+              </van-uploader>
             </div>
           </div>
         </div>
@@ -915,25 +923,33 @@
 
           <!--2-->
           <div class="uploadPicturesFlex_block">
-            <div class="title_m">上传历史图片</div>
+            <div class="title_m">上传现状图片</div>
             <div class="main_m">
               <van-uploader
-                v-model="ndAddfileListHistory"
-                :after-read="ndAddimgonReadHistory"
+                v-model="ndAddfileListNow"
+                :after-read="ndAddimgonReadNow"
                 :max-count="1"
                 accept="image/gif, image/jpeg, image/png"
-              />
+              >
+                <div v-if="landInfoList.behindland !=null">
+                <img :src=landInfoList.behindland alt="等待传图">
+                </div>
+              </van-uploader>
             </div>
           </div>
           <div class="uploadPicturesFlex_block">
-            <div class="title_m">上传现状图片</div>
+            <div class="title_m">上传历史图片</div>
             <div class="main_m">
               <van-uploader
-                v-model="ndAddfileListNow"
-                :after-read="ndAddimgonReadNow"
+                v-model="ndAddfileListHistory"
+                :after-read="ndAddimgonReadHistory"
                 :max-count="1"
                 accept="image/gif, image/jpeg, image/png"
-              />
+              >
+                <div v-if="landInfoList.frontland !=null">
+              <img :src=landInfoList.frontland alt="等待传图">
+                </div>
+              </van-uploader>
             </div>
           </div>
         </div>
@@ -1244,11 +1260,14 @@ export default {
     addNewPlot(type) {
       this.farmlandEditSwitchVisbuleFun("hide");
       this.landHomesteadEditVisbileFun("show");
-
       //farmhouse农房    land农地
       if (type == "farmhouse") {
         this.farmhouseStatus = 0;
+        this.houseInfoList.behindHouse =null;
+        this.houseInfoList.frontHouse =null;
       } else if (type == "land") {
+        this.landInfoList.frontland =null;
+        this.landInfoList.behindland =null;
         this.farmhouseStatus = 1;
       }
     },
@@ -4119,8 +4138,8 @@ export default {
               center no-repeat;
             background-size: 90% auto;
             img {
-              width: 100%;
-              height: 100%;
+              width: 98%;
+              height: 90%;
             }
           }
           .describe {