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

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -233,7 +233,7 @@ export default {
       })
       console.log('this.listData.hotelIntroduction',this.listData.hotelIntroduction)
       if(this.listData.hotelIntroduction === '<p><br></p>'){
-         this.$message.error('房间介绍不能为空')
+         this.$message.error('酒店介绍不能为空')
          loading.close()
          return
       }

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

@@ -5,11 +5,11 @@
         <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,'')"  placeholder="房间租金"/>
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"  placeholder="元/月"/>
         <span style="font-size:0.7vw;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,'')" placeholder="面积"/>
+        <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
@@ -62,7 +62,7 @@
          <el-input v-model="listData.houseLevel" placeholder="楼层"/>
       </el-form-item>
       <el-form-item label="特色标签" prop="houseLabel">
-        <el-input v-model="listData.houseLabel"  placeholder="特色标签"/>
+        <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,'')" placeholder="权重"/>
@@ -93,7 +93,7 @@
       </el-form-item>
       <el-form-item label="地图定位" prop="communityLatitude">
         <span>高德坐标</span>
-        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择公寓位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 100px;" />
@@ -185,9 +185,9 @@ export default {
         houseName: [
           { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
-        // rentalPrice: [
-        //   { required: true, message: '请输入房间租金', trigger: 'change' }
-        // ],
+        rentalPrice: [
+          { required: true, message: '请输入房间租金', trigger: 'change' }
+        ],
         houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],

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

@@ -4,8 +4,8 @@
       <el-form-item label="房间名称" prop="houseName">
         <el-input v-model="listData.houseName" placeholder="房间名称"/>
       </el-form-item>
-      <el-form-item label="房间租金">
-        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间租金"/>
+      <el-form-item label="房间租金" prop="rentalPrice">
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="元/月"/>
         <span style="font-size:0.7vw;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
       </el-form-item>
       <el-form-item label="面积" prop="area">
@@ -63,7 +63,7 @@
          <el-input v-model="listData.houseLevel"  placeholder="楼层"/>
       </el-form-item>
       <el-form-item label="特色标签" prop="houseLabel">
-        <el-input v-model="listData.houseLabel" placeholder="特色标签"/>
+        <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,'')" placeholder="权重"/>
@@ -92,13 +92,11 @@
         <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="地图定位" prop="communityLatitude">
-        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
-        <div>
+      <el-form-item label="地图定位1" prop="communityLatitude">
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择公寓位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
-        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        </div>
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 100px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

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

@@ -72,12 +72,10 @@
         <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 元/人"/>
       </el-form-item>
       <el-form-item label="地图定位" prop="shopLatitude">
-        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
-        <div>
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
-        </div>
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 100px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 100px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -88,7 +86,7 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍" prop="shopIntroductionValue">
+      <el-form-item label="* 商铺介绍">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor @wangeditorEvent="wangeditorValue"/>
@@ -177,9 +175,6 @@ export default {
         ],
         averagePrice: [
           { required: true, message: '请输入人均消费', trigger: 'blur' }
-        ],
-        shopIntroductionValue: [
-          { required: true, message: '', trigger: 'blur' }
         ]
       }
     }

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

@@ -4,7 +4,7 @@
       <!-- <el-form-item label="商铺名称" prop="shopName">
         <el-input v-model="listData.shopName"/>
       </el-form-item> -->
-      <el-form-item label="商铺说明11" prop="remark">
+      <el-form-item label="商铺说明" prop="remark">
         <el-input v-model="listData.remark"/>
       </el-form-item>
       <el-form-item label="app首页展示图" prop="appIndexImg">
@@ -72,8 +72,10 @@
         <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="单位 元/人"/>
       </el-form-item>
       <el-form-item label="高德坐标">
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择商铺位置确定坐标值，供APP端用户导航</span>
+        <span>高德坐标</span>
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 100px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 100px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->