合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServicelImpl.java

@@ -43,7 +43,11 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
             String houseLabel= tpRentalHouse.getHouseLabel();
             String houseLabelarr= houseLabel.replace("，", ",");
             String [] result = houseLabelarr.split(",");
-            tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
+            if (result[0].equals("")){
+                tpRentalHouse.setHouseLabelArr(null);
+            }else {
+                tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
+            }
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
             List<TpRentalHouseImg> tpRentalHouseImgList= tpRentalHouseImgMapper.selectRentalHouseImg(tpRentalHouse.getId(),1);
              if (null != tpRentalHouseImgList){
@@ -71,6 +75,16 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
                     img.add(tpRentalHouseImg.getImgUrl());
                 }
             }
+            String houseLabel= tpRentalHouse.getHouseLabel();
+            String houseLabelarr= houseLabel.replace("，", ",");
+            String [] result = houseLabelarr.split(",");
+            if (result[0].equals("")){
+                tpRentalHouse.setHouseLabelArr(null);
+            }else {
+                tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
+            }
+
+
             map.put("tpRentalHouse",tpRentalHouse);
             map.put("bannerImg",img);
             response.addSuccess(map);

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

@@ -3,7 +3,7 @@
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
      
       <el-form-item class="filter-item" label="酒店开关">
-        <span  style="font-size:9%;color:#C0C0C0">关闭后业主在APP端将看不到酒店相关的页面</span>
+        <span  style="font-size:0.7vw;color:#C0C0C0">关闭后业主在APP端将看不到酒店相关的页面</span>
         <el-switch style="padding-left:25%"
           v-model="listData.hotelSettingValue"
           active-color="#13ce66"
@@ -11,7 +11,7 @@
         </el-switch>
       </el-form-item>
       <el-form-item label="酒店首页图" prop="appIndexImg">
-        <span  style="font-size:9%;color:#C0C0C0"> APP端首页显示酒店栏的背景图，如果有文案需求可以用PS在图上添加文字等信息</span>
+        <span  style="font-size:0.7vw;color:#C0C0C0"> APP端首页显示酒店栏的背景图，如果有文案需求可以用PS在图上添加文字等信息</span>
         <el-upload
           class="avatar-uploader"
           name="uploadFiles"
@@ -39,18 +39,22 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="酒店名称" prop="hotelName">
+      <!-- <el-form-item label="酒店名称">
         <el-input v-model="listData.hotelName"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="联系电话" prop="hotelTel">
         <el-input v-model="listData.hotelTel"/>
       </el-form-item>
       <el-form-item label="酒店地址" prop="hotelAddress">
         <el-input v-model="listData.hotelAddress"/>
       </el-form-item>
-      <el-form-item label="高德坐标">
+      <el-form-item label="地图定位">
+        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <div>
+        <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
+        </div>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

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

@@ -39,7 +39,7 @@
       <el-button type="info" @click="addHotelEndit()">编辑</el-button>
        <el-button type="primary" @click="enditRoom(1)">上架房型</el-button>
       <el-button type="danger" @click="enditRoom(2)">下架房型</el-button>
-      <span style="padding-left:20%;font-size:9%;color:#C0C0C0;">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
+      <span style="padding-left:20%;font-size:0.7vw;color:#C0C0C0;">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
       </el-row>
     </el-form>
       <el-table

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

@@ -6,7 +6,7 @@
       </el-form-item>
       <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:9%;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
+        <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="面积"/>
@@ -91,10 +91,13 @@
         <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">
+      <el-form-item label="地图定位" prop="communityLatitude">
+        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <div>
+        <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        </div>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -183,9 +186,9 @@ export default {
         houseName: [
           { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
-        rentalPrice: [
-          { required: true, message: '请输入房间租金', trigger: 'blur' }
-        ],
+        // rentalPrice: [
+        //   { required: true, message: '请输入房间租金', trigger: 'change' }
+        // ],
         houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
@@ -291,6 +294,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      if(this.listData.appCarouselImg == 0){
+         this.$message.error("轮播图不能为空")
+        loading.close()
+        return
+      }
       this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({

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

@@ -4,9 +4,9 @@
       <el-form-item label="房间名称" prop="houseName">
         <el-input v-model="listData.houseName" placeholder="房间名称"/>
       </el-form-item>
-      <el-form-item label="房间租金" prop="rentalPrice">
+      <el-form-item label="房间租金">
         <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间租金"/>
-        <span style="font-size:9%;color:#C0C0C0">季租,年租优惠可以写在房间介绍中</span>
+        <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="面积"/>
@@ -37,7 +37,7 @@
             <el-option label="合租" value="2"/>
           </el-select>
       </el-form-item>
-      <el-form-item label="轮播图(最多六张)" prop="appCarouselImg">
+      <el-form-item label="轮播图(最多六张)">
         <el-upload
           name="uploadFiles"
           :limit="6"
@@ -92,10 +92,13 @@
         <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">
+      <el-form-item label="地图定位" prop="communityLatitude">
+        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <div>
+        <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        </div>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -200,10 +203,10 @@ export default {
           { required: true, message: '请选择租赁方式', trigger: 'blur' }
         ],
         appListImg: [
-          { required: true, message: 'app列表展示图', trigger: 'blur' }
+          { required: true, message: 'app列表展示图', trigger: 'clear' }
         ],
         appCarouselImg: [
-          { required: true, message: '轮播图', trigger: 'blur' }
+          { required: true, message: '轮播图不能为空', trigger: 'blur' }
         ],
         communityAddress: [
           { required: true, message: '请选择小区地址', trigger: 'blur' }
@@ -298,7 +301,11 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    updateRental() {
+    updateRental() { 
+     if(this.listData.appCarouselImg.length == 0){
+       this.$message.error("app轮播图不能为空")
+       return
+     }
       // 加载框
       const loading = this.$loading({
         lock: true,

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

@@ -44,7 +44,7 @@
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="shelfRental">上架房间</el-button>
       <el-button type="danger" @click="obtainedRental">下架房间</el-button>
-      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
+      <span  style="font-size:0.7vw;color:#C0C0C0;padding-left:25%">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

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

@@ -48,7 +48,7 @@
       </el-form-item>
       <el-form-item label="权重" prop="sort">
         <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
-        <span style="font-size:9%;color:#C0C0C0;">权重值越大，排序越靠前</span>
+        <span style="font-size:0.7vw;color:#C0C0C0;">权重值越大，排序越靠前</span>
       </el-form-item>
       <el-form-item label="商铺类型" prop="shopTypeId">
         <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
@@ -71,10 +71,13 @@
       <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="高德坐标" prop="shopLatitude">
+      <el-form-item label="地图定位" prop="shopLatitude">
+        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <div>
+        <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
-        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        </div>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

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

@@ -162,7 +162,7 @@ export default {
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+          { required: false, message: 'app商铺轮播图', trigger: 'blur' }
         ],
         shopName: [
           { required: true, message: '商铺名称', trigger: 'blur' }
@@ -282,6 +282,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      if(this.listData.appCarouselImg == 0){
+         this.$message.error("轮播图不能为空")
+        loading.close()
+        return
+      }
       this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({

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

@@ -29,7 +29,7 @@
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="shelfShop">上架商铺</el-button>
       <el-button type="danger" @click="obtainedShop">下架商铺</el-button>
-      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
+      <span  style="font-size:0.7vw;color:#C0C0C0;padding-left:25%">注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

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

@@ -9,14 +9,14 @@
           inactive-color="#ff4949"
           @change="changeSetting">
         </el-switch>
-         <span  style="font-size:9%;color:#C0C0C0;">关闭后业主在APP端将看不到商铺相关的页面</span>
+         <span  style="font-size:0.7vw;color:#C0C0C0;">关闭后业主在APP端将看不到商铺相关的页面</span>
       </el-form-item>
     </el-form>
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="deleteShopType">删除</el-button>
-      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">索引顺序即显示时的先后顺序，不能相同，必须为大于0的整数，数字越小越靠前，如果有1则1号值排会在APP端第一位</span>
+      <span  style="font-size:0.7vw;color:#C0C0C0;padding-left:25%">索引顺序即显示时的先后顺序，不能相同，必须为大于0的整数，数字越小越靠前，如果有1则1号值排会在APP端第一位</span>
     </div>
     <el-table
       v-loading="listLoading"