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

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

                    //休闲
                    List<String> tpShopTypeImg = new ArrayList<>();
                    // 休闲3x
-                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817084664.png?Expires=1559644472&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1558077862814.png?Expires=1559905250&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
                    // 休闲2x
-                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817102003.png?Expires=1559644489&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+                tpShopTypeImg.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1558077918669.png?Expires=1559905306&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
                 tpShopType.setImg(tpShopTypeImg);
                }
                if (a == 4){

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/HotelServiceImpl.java

             return response;
         }
         // 查询当前房间编号是否重复
-        QueryWrapper<HotelRoom> HotelRoomQuery= new QueryWrapper<>();
-        HotelRoomQuery.eq("community_id",userElement.getCommunityId());
-        HotelRoomQuery.eq("room_no",hotelRoom.getRoomNo());
-        List<HotelRoom> RoomNo= tpHotelRoomMapper.selectList(HotelRoomQuery);
-        if (null != RoomNo && RoomNo.size()>0){
-            response.addError("当前房间号已存在");
-            return response;
-        }
+//        QueryWrapper<HotelRoom> HotelRoomQuery= new QueryWrapper<>();
+//        HotelRoomQuery.eq("community_id",userElement.getCommunityId());
+//        HotelRoomQuery.eq("room_no",hotelRoom.getRoomNo());
+//        List<HotelRoom> RoomNo= tpHotelRoomMapper.selectList(HotelRoomQuery);
+//        if (null != RoomNo && RoomNo.size()>0){
+//            response.addError("当前房间号已存在");
+//            return response;
+//        }
         // 判断价格是否存在
         if (null == hotelRoom.getPrice()) {
             response.addError("请输入房间价格");

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

         this.$message.error('请输入房型价格');
         return
       }
+      if(this.ruleForm.roomStatus === ''){
+        this.ruleForm.roomStatus = '1'
+      }
     
       this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
         if(res.code === '1'){

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

       const ids = this.deleteIds
       if (ids < 1) {
         this.$message.error('请至少选择一行数据上架!')
+        this.listLoading = false
         return
       }
       this.$store.dispatch('rental/ShelfRental', ids).then((res) => {
       const ids = this.deleteIds
       if (ids < 1) {
         this.$message.error('请至少选择一行数据下架!')
+        this.listLoading = false
         return
       }
       this.$store.dispatch('rental/ObtainedRental', ids).then((res) => {