合并

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

@@ -92,7 +92,7 @@
         <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
       </el-form-item>
-      <el-form-item label="地图定位1" prop="communityLatitude">
+      <el-form-item label="地图定位" prop="communityLatitude">
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择公寓位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />

VUECODE/smart-property-manage/src/views/shop/shopEdit.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
-      <!-- <el-form-item label="商铺名称" prop="shopName">
+      <el-form-item label="商铺名称" prop="shopName">
         <el-input v-model="listData.shopName"/>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="商铺说明" prop="remark">
         <el-input v-model="listData.remark"/>
       </el-form-item>
@@ -71,7 +71,7 @@
       <el-form-item label="人均消费" prop="averagePrice">
         <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 元/人"/>
       </el-form-item>
-      <el-form-item label="高德坐标">
+      <el-form-item label="地图坐标">
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择商铺位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 100px;" />