调整样式

src/pages/contractCreate/creat-rent-info.vue

@@ -10,16 +10,15 @@
           </div>
           <div class="down-content">
             <span>请上传照片</span>
-            <<<<<<< HEAD
             <div v-if="!isReadOnly" class="photo" @click="ocrShow()">
-              =======
               <div v-if="!isReadOnly" class="photo" @click="pickMethod()">
-                >>>>>>> bd6801eb470716e53e6e672ef73511511d752666
                 <img v-if="vehicleImg" :src="vehicleImg" alt="">
               </div>
               <div v-if="isReadOnly" class="photo">
                 <img :src="vehicleImg" @click="showBigPicture(vehicleImg)">
               </div>
+
+            </div>
             <list-item :item-height="44">
               <item>
                 <div slot="name" class="required">车架号</div>
@@ -72,7 +71,6 @@
             </list-item>
           </div>
         </div>
-        </div>
     </div></transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">