Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
       <el-form-item label="房间名称" prop="houseName">
-        <el-input v-model="listData.houseName"/>
+        <el-input v-model="listData.houseName" placeholder="房间名称"/>
       </el-form-item>
       <el-form-item label="房间租金" prop="rentalPrice">
-        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"  placeholder="房间租金"/>
+        <span style="font-size:9%;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
       </el-form-item>
       <el-form-item label="面积" prop="area">
-        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="面积"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
         </el-select>
       </el-form-item>
       <el-form-item label="楼层" prop="houseLevel">
-         <el-input v-model="listData.houseLevel"/>
+         <el-input v-model="listData.houseLevel" placeholder="楼层"/>
       </el-form-item>
       <el-form-item label="特色标签" prop="houseLabel">
-        <el-input v-model="listData.houseLabel"/>
+        <el-input v-model="listData.houseLabel"  placeholder="特色标签"/>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="权重"/>
       </el-form-item>
       <el-form-item label="联系电话" prop="houseTel">
-        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="联系电话"/>
       </el-form-item>
       <el-form-item label="小区地址" prop="communityAddress">
-        <el-input v-model="listData.communityAddress"/>
+        <el-input v-model="listData.communityAddress" placeholder="小区地址"/>
       </el-form-item>
       <el-form-item label="房屋配套">
         <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
       <el-form-item label="房间名称" prop="houseName">
-        <el-input v-model="listData.houseName"/>
+        <el-input v-model="listData.houseName" placeholder="房间名称"/>
       </el-form-item>
       <el-form-item label="房间租金" prop="rentalPrice">
-        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间租金"/>
+        <span style="font-size:9%;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
       </el-form-item>
       <el-form-item label="面积" prop="area">
-        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="面积"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
         </el-select>
       </el-form-item>
       <el-form-item label="楼层" prop="houseLevel">
-         <el-input v-model="listData.houseLevel"/>
+         <el-input v-model="listData.houseLevel"  placeholder="楼层"/>
       </el-form-item>
       <el-form-item label="特色标签" prop="houseLabel">
-        <el-input v-model="listData.houseLabel"/>
+        <el-input v-model="listData.houseLabel" placeholder="特色标签"/>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="权重"/>
       </el-form-item>
       <el-form-item label="联系电话" prop="houseTel">
-        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="联系电话"/>
       </el-form-item>
       <el-form-item label="小区地址" prop="communityAddress">
-        <el-input v-model="listData.communityAddress"/>
+        <el-input v-model="listData.communityAddress" placeholder="小区地址"/>
       </el-form-item>
       <el-form-item label="房屋配套">
         <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>