公寓

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -86,6 +87,19 @@ public class TpRentalHouseController extends BaseController {
 		return responseBean;
 	}
 	
+	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getRental(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpRentalHouse rentalHouse = tpRentalHouseService.getRentalById(id);
+		responseBean.addSuccess(rentalHouse);
+		return responseBean;
+	}
 	
 	@ApiOperation(value = "上架房间", notes = "上架房间")
 	@ApiImplicitParams({

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseImgMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TpRentalHouseImg;
 
+import java.util.List;
+
 /**
  * <p>
  * 出租房间图片 Mapper 接口
@@ -12,5 +14,6 @@ import com.community.huiju.model.TpRentalHouseImg;
  * @since 2019-05-13
  */
 public interface TpRentalHouseImgMapper extends BaseMapper<TpRentalHouseImg> {
-
+	
+	int batchInsert(List<TpRentalHouseImg> rentalHouseImgList);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouse.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -222,5 +223,16 @@ public class TpRentalHouse implements Serializable {
      */
     @TableField(exist = false)
     private String userName;
-
+    
+    /**
+     * 列表图片
+     */
+    @TableField(exist = false)
+    private String appListImg;
+    
+    /**
+     * 轮播图
+     */
+    @TableField(exist = false)
+    private List<String> appCarouselImg;
 }

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

@@ -30,4 +30,19 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @return
 	 */
 	ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 保存长租公寓房间信息
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement);
+	
+	/**
+	 * 根据ID取值
+	 * @param id
+	 * @return
+	 */
+	TpRentalHouse getRentalById(Integer id);
 }

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

@@ -1,15 +1,20 @@
 package com.community.huiju.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpRentalHouseImgMapper;
 import com.community.huiju.dao.TpRentalHouseMapper;
 import com.community.huiju.model.TpRentalHouse;
+import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.ITpRentalHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +32,10 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 	
 	@Autowired
 	private TpRentalHouseMapper tpRentalHouseMapper;
+	
+	@Autowired
+	private TpRentalHouseImgMapper tpRentalHouseImgMapper;
+	
 	/**
 	 * 获取公寓房间列表
 	 *
@@ -62,4 +71,78 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 保存长租公寓房间信息
+	 *
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//插入房间信息
+		Integer communityId = userElement.getCommunityId();
+		Integer userId = userElement.getId();
+		LocalDateTime nowTime = LocalDateTime.now();
+		rentalHouse.setCommunityId(communityId);
+		rentalHouse.setCreateDate(nowTime);
+		rentalHouse.setCreateUser(userId);
+		tpRentalHouseMapper.insert(rentalHouse);
+		//插入公寓首页图信息
+		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
+		tpRentalHouseImg.setCommunityId(communityId);
+		tpRentalHouseImg.setCreateDate(nowTime);
+		tpRentalHouseImg.setRentalHouseId(rentalHouse.getId());
+		tpRentalHouseImg.setImgType("1");
+		tpRentalHouseImg.setImgUrl(rentalHouse.getAppListImg());
+		tpRentalHouseImgMapper.insert(tpRentalHouseImg);
+		//插入公寓轮播图信息
+		List<String> imgList = rentalHouse.getAppCarouselImg();
+		List<TpRentalHouseImg> rentalHouseImgList = new ArrayList<>();
+		imgList.stream().forEach(e -> {
+			TpRentalHouseImg rentalHouseImg = new TpRentalHouseImg();
+			rentalHouseImg.setCommunityId(communityId);
+			rentalHouseImg.setCreateDate(nowTime);
+			rentalHouseImg.setRentalHouseId(rentalHouse.getId());
+			rentalHouseImg.setImgType("2");
+			rentalHouseImg.setImgUrl(e);
+			rentalHouseImgList.add(rentalHouseImg);
+		});
+		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
+		responseBean.addSuccess("插入成功");
+		return responseBean;
+	}
+	
+	/**
+	 * 根据ID取值
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public TpRentalHouse getRentalById(Integer id) {
+		//获取公寓数据
+		TpRentalHouse tpRentalHouse = tpRentalHouseMapper.selectById(id);
+		//获取公寓列表图片
+		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();
+		tpRentalHouseImgQueryWrapper.eq("community_id", tpRentalHouse.getCommunityId());
+		tpRentalHouseImgQueryWrapper.eq("rental_house_id",tpRentalHouse.getId());
+		tpRentalHouseImgQueryWrapper.eq("img_type","1");
+		TpRentalHouseImg tpRentalHouseImg = tpRentalHouseImgMapper.selectOne(tpRentalHouseImgQueryWrapper);
+		tpRentalHouse.setAppListImg(tpRentalHouseImg.getImgUrl());
+		//获取公寓轮播图图片
+		QueryWrapper<TpRentalHouseImg> carouseQueryWrapper = new QueryWrapper<>();
+		carouseQueryWrapper.eq("community_id", tpRentalHouse.getCommunityId());
+		carouseQueryWrapper.eq("rental_house_id",tpRentalHouse.getId());
+		carouseQueryWrapper.eq("img_type","2");
+		List<TpRentalHouseImg> tpRentalHouseImgList = tpRentalHouseImgMapper.selectList(carouseQueryWrapper);
+		List<String> imgList = new ArrayList<>();
+		tpRentalHouseImgList.stream().forEach(e -> {
+			imgList.add(e.getImgUrl());
+		});
+		tpRentalHouse.setAppCarouselImg(imgList);
+		return tpRentalHouse;
+	}
 }

CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseImgMapper.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TpRentalHouseImgMapper">
-
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_rental_house_img(community_id,rental_house_id,img_url,img_type,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.rentalHouseId},#{item.imgUrl},#{item.imgType},#{item.createDate})
+        </foreach>
+    </insert>
 </mapper>

VUECODE/smart-property-manage/src/api/rental.js

@@ -28,10 +28,17 @@ export function shelfRental(ids) {
   })
 }
 
-export function addShop(listQuery) {
+export function addRental(listQuery) {
   return request({
     url: '/rental/add',
     method: 'post',
     data: listQuery
   })
 }
+
+export function getRental(id) {
+  return request({
+    url: '/rental/get/' + id,
+    method: 'get'
+  })
+}

VUECODE/smart-property-manage/src/store/modules/rental.js

@@ -1,4 +1,4 @@
-import { fetchRentalList, shelfRental, obtainedRental, addRental } from '@/api/rental'
+import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental } from '@/api/rental'
 
 const transaction = {
   namespaced: true,
@@ -28,6 +28,15 @@ const transaction = {
         })
       })
     },
+    GetRental({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getRental(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     ShelfRental({ commit }, ids) {
       return new Promise((resolve, reject) => {
         shelfRental(ids).then(response => {

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

@@ -52,7 +52,7 @@
         </el-dialog>
       </el-form-item>
       <el-form-item label="上架状态" prop="houseStatus">
-        <el-select v-model="listData.shopStatus" placeholder="请选择">
+        <el-select v-model="listData.houseStatus" placeholder="请选择">
           <el-option label="已上架" value="1"/>
           <el-option label="已下架" value="2"/>
         </el-select>
@@ -73,22 +73,22 @@
         <el-input v-model="listData.communityAddress"/>
       </el-form-item>
       <el-form-item label="房屋配套">
-        <el-checkbox v-model="listData.bed">床</el-checkbox>
-        <el-checkbox v-model="listData.mattress">床垫</el-checkbox>
-        <el-checkbox v-model="listData.wardrobe">衣柜</el-checkbox>
-        <el-checkbox v-model="listData.sofa">沙发</el-checkbox>
-        <el-checkbox v-model="listData.washingMachine">洗衣机</el-checkbox>
-        <el-checkbox v-model="listData.airConditioning">空调</el-checkbox>
-        <el-checkbox v-model="listData.fridge">冰箱</el-checkbox>
-        <el-checkbox v-model="listData.TV">电视</el-checkbox>
-        <el-checkbox v-model="listData.smartLock">智能锁</el-checkbox>
-        <el-checkbox v-model="listData.waterHeater">热水器</el-checkbox>
-        <el-checkbox v-model="listData.desk">桌子</el-checkbox>
-        <el-checkbox v-model="listData.chair">椅子</el-checkbox>
-        <el-checkbox v-model="listData.WiFi">网络</el-checkbox>
-        <el-checkbox v-model="listData.kitchen">厨房</el-checkbox>
-        <el-checkbox v-model="listData.bathroom">独卫</el-checkbox>
-        <el-checkbox v-model="listData.balcony">阳台</el-checkbox>
+        <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>
+        <el-checkbox v-model="listData.mattress" true-label="1" false-label="0">床垫</el-checkbox>
+        <el-checkbox v-model="listData.wardrobe" true-label="1" false-label="0">衣柜</el-checkbox>
+        <el-checkbox v-model="listData.sofa" true-label="1" false-label="0">沙发</el-checkbox>
+        <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
+        <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
+        <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
+        <el-checkbox v-model="listData.TV" true-label="1" false-label="0">电视</el-checkbox>
+        <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
+        <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
+        <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
+        <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
+        <el-checkbox v-model="listData.WiFi" true-label="1" false-label="0">网络</el-checkbox>
+        <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
+        <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="高德坐标">
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
@@ -285,7 +285,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error AddBuilding')
+        console.log('error addRental')
       })
     }
   }

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

@@ -1,23 +1,14 @@
 <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-input v-model="listData.shopName"/>
+      <el-form-item label="房间名称" prop="houseName">
+        <el-input v-model="listData.houseName"/>
       </el-form-item>
-      <el-form-item label="商铺说明" prop="remark">
-        <el-input v-model="listData.remark"/>
+      <el-form-item label="房间租金" prop="rentalPrice">
+        <el-input v-model="listData.rentalPrice"/>
       </el-form-item>
-      <el-form-item label="app首页展示图" prop="appIndexImg">
-        <el-upload
-          class="avatar-uploader"
-          name="uploadFiles"
-          :action="uploadImgUrl"
-          :show-file-list="false"
-          :on-success="handleAppIndexSuccess"
-          :before-upload="beforeAvatarUpload">
-          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
+      <el-form-item label="面积" prop="area">
+        <el-input v-model="listData.area"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
@@ -31,13 +22,27 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+      <el-form-item label="户型" prop="houseType">
+        <el-select v-model="listData.houseType" placeholder="请选择">
+            <el-option label="一室居" value="1"/>
+            <el-option label="二室居" value="2"/>
+            <el-option label="三室居" value="3"/>
+            <el-option label="四室居及以上" value="4"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="租赁方式" prop="rentalType">
+        <el-select v-model="listData.rentalType" placeholder="请选择">
+            <el-option label="整租" value="1"/>
+            <el-option label="合租" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="轮播图" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
+          :file-list="displayAppCarouselImg"
           :action="uploadImgUrl"
           list-type="picture-card"
-          :file-list="displayAppCarouselImg"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessCarouselImg">
@@ -47,32 +52,48 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
-      </el-form-item>
-      <el-form-item label="商铺类型" prop="shopTypeId">
-        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
-          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上架状态" prop="shopStatus">
-        <el-select v-model="listData.shopStatus" placeholder="请选择">
+      <el-form-item label="上架状态" prop="houseStatus">
+        <el-select v-model="listData.houseStatus" placeholder="请选择">
           <el-option label="已上架" value="1"/>
           <el-option label="已下架" value="2"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="联系电话" prop="shopTel">
-        <el-input v-model="listData.shopTel"/>
+      <el-form-item label="楼层" prop="houseLevel">
+         <el-input v-model="listData.houseLevel"/>
+      </el-form-item>
+      <el-form-item label="特色标签" prop="houseLabel">
+        <el-input v-model="listData.houseLabel"/>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
       </el-form-item>
-      <el-form-item label="商铺地址" prop="shopAddress">
-        <el-input v-model="listData.shopAddress"/>
+      <el-form-item label="联系电话" prop="houseTel">
+        <el-input v-model="listData.houseTel"/>
       </el-form-item>
-      <el-form-item label="人均消费" prop="averagePrice">
-        <el-input v-model="listData.averagePrice"/>
+      <el-form-item label="小区地址" prop="communityAddress">
+        <el-input v-model="listData.communityAddress"/>
+      </el-form-item>
+      <el-form-item label="房屋配套">
+        <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>
+        <el-checkbox v-model="listData.mattress" true-label="1" false-label="0">床垫</el-checkbox>
+        <el-checkbox v-model="listData.wardrobe" true-label="1" false-label="0">衣柜</el-checkbox>
+        <el-checkbox v-model="listData.sofa" true-label="1" false-label="0">沙发</el-checkbox>
+        <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
+        <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
+        <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
+        <el-checkbox v-model="listData.TV" true-label="1" false-label="0">电视</el-checkbox>
+        <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
+        <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
+        <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
+        <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
+        <el-checkbox v-model="listData.WiFi" true-label="1" false-label="0">网络</el-checkbox>
+        <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
+        <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="高德坐标">
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -83,10 +104,10 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍">
+      <el-form-item label="房间介绍">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
-            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+            <wangeditor :content="listData.houseIntroduction" @wangeditorEvent="wangeditorValue"/>
           </div>
         </el-form-item>
       <el-form-item>
@@ -107,32 +128,49 @@ export default {
       events: {
         click: e => {
           // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          this.listData.shopLongitude = e.lnglat.lng
-          this.listData.shopLatitude = e.lnglat.lat
+          this.listData.communityLongitude = e.lnglat.lng
+          this.listData.communityLatitude = e.lnglat.lat
         }
       },
       listData: {
-        id: '',
-        shopName: '',
-        remark: '',
-        appIndexImg: '',
+        houseName: '',
+        rentalPrice: '',
+        area: '',
         appListImg: '',
         appCarouselImg: [],
+        houseType: '',
+        rentalType: '',
+        houseStatus: '',
+        houseLevel: '',
+        houseLabel: '',
         sort: '',
-        shopTypeId: '',
-        shopStatus: '',
-        shopTel: '',
-        shopAddress: '',
-        averagePrice: '',
-        shopLongitude: '',
-        shopLatitude: '',
-        shopIntroduction: ''
+        houseTel: '',
+        communityAddress: '',
+        communityLongitude: '',
+        communityLatitude: '',
+        houseIntroduction: '',
+        bed: '',
+        mattress: '',
+        wardrobe: '',
+        sofa: '',
+        washingMachine: '',
+        airConditioning: '',
+        fridge: '',
+        TV: '',
+        smartLock: '',
+        waterHeater: '',
+        desk: '',
+        chair: '',
+        WiFi: '',
+        kitchen: '',
+        bathroom: '',
+        balcony: ''
       },
-      displayAppCarouselImg: [],
       dialogImageUrl: '',
       dialogVisible: false,
       uploadImgUrl: process.env.BASE_API + '/uploadimage',
       markers: [],
+      displayAppCarouselImg: [],
       shopTypeList: [],
       searchOption: {
         city: '南京',
@@ -141,26 +179,17 @@ export default {
       mapCenter: [118.789509, 32.019989],
       tableKey: 0,
       rules: {
-        typeName: [
-          { required: true, message: '请输入商铺名称', trigger: 'blur' }
-        ],
-        remark: [
-          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        houseName: [
+          { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
-        shopTel: [
+        houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
-        shopAddress: [
-          { required: true, message: '请输入商铺地址', trigger: 'blur' }
-        ],
-        appIndexImg: [
-          { required: true, message: 'app首页展示图', trigger: 'blur' }
-        ],
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+          { required: true, message: '轮播图', trigger: 'blur' }
         ],
       }
     }
@@ -168,7 +197,6 @@ export default {
   created() {
     this.listData.id = this.$route.query.id
     this.getById()
-    this.getShopTypeList()
   },
   methods: {
      addMarker() {
@@ -177,13 +205,14 @@ export default {
       this.markers.push([lng, lat])
     },
     getById() {
-      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
-        const shopData = res.data
-        this.listData = shopData
-        alert(this.listData.shopIntroduction)
+      this.$store.dispatch('rental/GetRental', this.listData.id).then((res) => {
+        const rentalData = res.data
+        console.log(rentalData)
+        this.listData = { ...rentalData }
+        
         // 多张图片进行遍历
-        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
-          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        for (let i = 0; i < rentalData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: rentalData.appCarouselImg[i] })
         }
       })
     },
@@ -209,13 +238,6 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    getShopTypeList() {
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
-        this.shopTypeList = res.data
-      }).catch(() => {
-        console.log('error ListAnnouncement')
-      })
-    },
     onSearchResult(pois) {
       // 搜索地图
       let latSum = 0
@@ -235,12 +257,12 @@ export default {
       }
     },
     wangeditorValue(value) {
-      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+      this.listData.houseIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
     },
     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.updateShop()
+          this.addRental()
         } else {
           console.log('error submit!!')
           return false
@@ -256,7 +278,7 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    updateShop() {
+    addRental() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -264,13 +286,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
+      this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'shop-index' })
+          this.$router.push({ name: 'rental-index' })
           loading.close()
           return
         }
@@ -278,7 +300,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error UpdateShop')
+        console.log('error addRental')
       })
     }
   }

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

@@ -283,7 +283,7 @@ export default {
 
 
     clickTitle(id) {
-      this.$router.push({ name: 'shop-edit', query: { id: id }})
+      this.$router.push({ name: 'rental-edit', query: { id: id }})
     },
     formatDate(val) {
       if (val === null) {