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/dao/TpShopMapper.java

      * @param communityId
      * @return
      */
-    List<TpShop> selectcommunityIdShop(@Param("communityId") Integer communityId,@Param("houseName") String houseName,@Param("tpShopTypeId") Integer tpShopTypeId);
+    List<TpShop> selectcommunityIdShop(@Param("communityId") Integer communityId,@Param("houseName") String houseName,@Param("tpShopTypeId")Integer tpShopTypeId);
 
     /**
      * 查询当前小区商铺是否展示

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpHotel.java

      */
     private String hotelIntroduction;
 
+    /**
+     * 首頁图片
+     */
+    private  String img;
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
     /**
      * 房间
      * @return

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

             tpHotel.setTpHotelRoomsList(tpHotelRoom);
             img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId(),1).get(0);
         }
-        Map map = new HashMap<>();
-        map.put("tpHotel", tpHotel);
-        map.put("img", img);
-        response.addSuccess(map);
+        tpHotel.setImg(img);
+        response.addSuccess(tpHotel);
         return response;
     }
 }

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

         ResponseBean response = new ResponseBean<>();
         // 当前线下商铺是否展示
         String shopSetting= tpShopMapper.shopSetting(userElement.getCommunityId());
-        List<TpShop> tpShopList = null;
-        List<TpShopType> tpShopTypeList =null;
+        List<TpShop> tpShopList = new ArrayList<>();
+        List<TpShopType> tpShopTypeList =new ArrayList<>();
         if (null != shopSetting) {
             tpShopList = tpShopMapper.selectShopCommunity(userElement.getCommunityId());
             for (TpShop tpShop : tpShopList) {
                 // 1 表示查询当前首页图片
                 List<TpShopImg> tpShopImgList = tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(), tpShop.getId(), 1);
-               TpShopImg tpShopImg= tpShopImgList.get(0);
-                tpShop.setTpShopImgUrl(tpShopImg.getImgUrl());
+                if(tpShopImgList.size()>0) {
+                    TpShopImg tpShopImg = tpShopImgList.get(0);
+                    tpShop.setTpShopImgUrl(tpShopImg.getImgUrl());
+                }
             }
             // 查询当前商铺类型
             tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());

CODE/smart-community/app-api/src/main/resources/mapper/TpHotelRoomMapper.xml

     where  community_id = #{communityId,jdbcType=INTEGER}
     and hotel_id = #{hotelId,jdbcType=INTEGER}
     and room_status = 1
+    ORDER BY sort desc ,update_date desc
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpRentalHouseMapper.xml

       <if test="rentalPrice == 6" >
         and  rh.rental_price >= 4000
       </if>
-
-      <if test="priceFluctuate == 1" >
-        and  order by rh.rental_price  asc
-      </if>
-
-      <if test="priceFluctuate == 2" >
-        and  order by rh.rental_price  desc
-      </if>
       and community_id = #{communityId}
       and rh.house_status = 1
     </where>
+    <if test="priceFluctuate == 1" >
+        order by (rh.rental_price+0)  asc
+    </if>
+
+    <if test="priceFluctuate == 2" >
+        order by (rh.rental_price+0)  desc
+    </if>
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpShopMapper.xml

     *
     from tp_shop
     <where>
-      <if test="houseName != null and tpShopTypeId != ''" >
-        shop_name = #{houseName,jdbcType=INTEGER},
+      <if test="houseName != null and houseName != ''" >
+        shop_name = #{houseName,jdbcType=INTEGER}
       </if>
       <if test="tpShopTypeId != null and tpShopTypeId != ''" >
-       and shop_type_id = #{shopTypeId,jdbcType=INTEGER}
+       and shop_type_id = #{tpShopTypeId,jdbcType=INTEGER}
       </if>
       and community_id = #{communityId,jdbcType=INTEGER}
       and shop_status =1

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

 		rentalHouse.setCommunityId(communityId);
 		rentalHouse.setCreateDate(nowTime);
 		rentalHouse.setCreateUser(userId);
+		rentalHouse.setUpdateDate(nowTime);
+		rentalHouse.setUpdateUser(userId);
 		tpRentalHouseMapper.insert(rentalHouse);
 		//插入公寓首页图信息
 		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
 			rentalHouseImgList.add(rentalHouseImg);
 		});
 		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
-		responseBean.addSuccess("插入成功");
+		responseBean.addSuccess("添加成功");
 		return responseBean;
 	}
 	

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
 import com.community.huiju.model.TpShop;
 	public ResponseBean saveShop(TpShop shop, UserElement userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		//添加商铺信息
+		if (!AccountValidatorUtil.isPhone(shop.getShopTel())){
+			responseBean.addError("请输入正确的手机号!");
+			return responseBean;
+		}
 		Integer communityId = userElement.getCommunityId();
 		LocalDateTime localDateTime = LocalDateTime.now();
 		shop.setCommunityId(communityId);

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

 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.huiju.dao.TpShopMapper;
 import com.community.huiju.dao.TpShopSettingMapper;
 import com.community.huiju.dao.TpShopTypeMapper;
+import com.community.huiju.model.TpShop;
 import com.community.huiju.model.TpShopSetting;
 import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.ITpShopTypeService;
 	
 	@Autowired
 	private TpShopTypeMapper shopTypeMapper;
-	
+
+	@Autowired
+	private TpShopMapper tpShopMapper;
+
 	@Autowired
 	private TpShopSettingMapper shopSettingMapper;
 	
 				//系统创建不可删除
 				message.append(shopType.getTypeName() + "为系统创建，不可删除。");
 			}else{
+				/* 类型删除时，tp_shop里面shop_type_id应修改为空*/
+				QueryWrapper<TpShop>  tpShop= new QueryWrapper<>();
+				tpShop.eq("community_id",shopType.getCommunityId());
+				tpShop.eq("shop_type_id",id.toString());
+				List<TpShop> tpShopList=tpShopMapper.selectList(tpShop);
+				for (TpShop shop:tpShopList){
+					shop.setShopTypeId(null);
+					tpShopMapper.updateById(shop);
+				}
 				shopTypeMapper.deleteById(id.toString());
 			}
 		}

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

                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
         </where>
-        order by sort desc
+        order by sort desc,update_date desc
     </select>
 
 </mapper>

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

             and t.house_status  = #{tpRentalHouse.houseStatus}
         </if>
         <if test="tpRentalHouse.startPrice != null and tpRentalHouse.startPrice != ''">
-            and t.rental_price  >= #{tpRentalHouse.startPrice}
+            and t.rental_price  >= #{tpRentalHouse.startPrice,jdbcType=INTEGER}
         </if>
         <if test="tpRentalHouse.endPrice != null and tpRentalHouse.endPrice != ''">
-            and t.rental_price  &lt;= #{tpRentalHouse.endPrice}
+            and t.rental_price  &lt;= #{tpRentalHouse.endPrice,jdbcType=INTEGER}
         </if>
     </select>
 </mapper>

VUECODE/smart-property-manage/src/router/index.js

         path: '/grogshop/grogshopRoom',
         component: () => import('@/views/grogshop/grogshopRoom'),
         name: 'grogshop-grogshopRoom',
-        meta: { title: '房间列表', icon: 'table' }
+        meta: { title: '房屋列表', icon: 'table' }
       },
       {
         path: '/grogshop/grogshopRoomAdd',

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

 <template>
   <div>
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <el-form-item class="filter-item"  label="房间编号">
-        <el-input v-model="listQuery.roomNo"  placeholder="房间编号"/>
+      <el-form-item class="filter-item"  label="房型编号">
+        <el-input v-model="listQuery.roomNo"  placeholder="房型编号"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="房间名称">
-        <el-input v-model="listQuery.roomName" placeholder="房间名称"/>
+      <el-form-item class="filter-item"  label="房型名称">
+        <el-input v-model="listQuery.roomName" placeholder="房型名称"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="房间价格">
-        <el-input  v-model="listQuery.price" placeholder="房间价格"/>
+      <el-form-item class="filter-item"  label="房型价格">
+        <el-input  v-model="listQuery.price" placeholder="房型价格"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="上架状态">
-        <el-select v-model="listQuery.roomStatus" placeholder="待办类型">
+        <el-select v-model="listQuery.roomStatus" placeholder="上架状态">
          <el-option label="已上架" value="1"/>
          <el-option label="已下架" value="2"/>
         </el-select>
       <el-row>
       <el-button type="success" @click="addHotelRoom()">新增</el-button>
       <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>
+       <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>
       </el-row>
-
     </el-form>
       <el-table
       v-loading="listLoading"
         type="selection"
         width="55"/>
       <el-table-column prop="roomNo" label="编号" align="center"/>
-      <el-table-column prop="roomName" label="房间名称" align="center">
+      <el-table-column prop="roomName" label="房屋名称" align="center">
          <template slot-scope="scope" >
         <a :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
            {{ scope.row.roomName}}
       </template>
       </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
-      <el-table-column prop="price" label="房间价格" align="center"/>
+      <el-table-column prop="price" label="房型价格" align="center"/>
       <el-table-column prop="roomStatus" label="上架状态" align="center"><template slot-scope="scope">{{ scope.row.roomStatus=='1'?'已上架':'已下架' }}</template></el-table-column>
       <el-table-column prop="editUser" label="编辑人" align="center"/>
-      <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
+      <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
 
     </el-table>
         <div class="block">
     },
     addHotelEndit(){
       const ids = this.deleteIds
+      if (ids.length < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
       if (ids.length > 1) {
         this.$message.error('只能选择一行数据进行修改!')
         return

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

 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
-      <el-form-item label="房间名称" >
-        <el-input v-model="ruleForm.roomName" placeholder="房间名称"/>
+      <el-form-item label="房型名称" >
+        <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
-       <el-form-item label="房间号" >
-        <el-input v-model="ruleForm.roomNo" placeholder="房间号"/>
+       <el-form-item label="房型号" >
+        <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item>
-     <el-form-item class="filter-item" label="房间描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房间描述"/>
+     <el-form-item class="filter-item" label="房型描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
       </el-form-item>
-      <el-form-item label="房间价格">
-        <el-input v-model="ruleForm.price" placeholder="房间价格"/>
+      <el-form-item label="房型价格">
+        <el-input v-model="ruleForm.price" placeholder="房型价格" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="上架状态">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="ruleForm.sort" placeholder="权重"/>
+        <el-input v-model="ruleForm.sort" placeholder="请输入权重数值" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>
            remark: '',
          roomName: '',
        roomStatus: '',
-             sort: '',
+             sort: '1',
            roomNo: ''
       }
       // rules: {
   methods: {
     submitForm(){
       if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房间号');
+        this.$message.error('请输入房型号');
         return
       }
       if(this.ruleForm.roomName ===''){
-        this.$message.error('请输入房间名称');
+        this.$message.error('请输入房型名称');
         return
       }
       if(this.ruleForm.price ===''){
-        this.$message.error('房间价格');
+        this.$message.error('请输入房型价格');
         return
       }
     
         }else{
         this.$router.push({ name: 'grogshop-grogshopRoom' })
          this.$message({
-          message: '新增房间成功',
+          message: '新增房型成功',
           type: 'success'
          })
         }

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

 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
-      <el-form-item label="房间名称" >
-        <el-input v-model="ruleForm.roomName" placeholder="房间名称"/>
+      <el-form-item label="房型名称" >
+        <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
-       <el-form-item label="房间号" >
-        <el-input v-model="ruleForm.roomNo" placeholder="房间号"/>
+       <el-form-item label="房型号" >
+        <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item>
-     <el-form-item class="filter-item" label="房间描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房间描述"/>
+     <el-form-item class="filter-item" label="房型描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
       </el-form-item>
-      <el-form-item label="房间价格">
-        <el-input v-model="ruleForm.price" placeholder="房间价格"/>
+      <el-form-item label="房型价格">
+        <el-input v-model="ruleForm.price" placeholder="房型价格"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="上架状态">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
   methods: {
     submitForm(){
       if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房间号');
+        this.$message.error('请输入房型号');
         return
       }
       if(this.ruleForm.roomName ===''){
-        this.$message.error('请输入房间名称');
+        this.$message.error('请输入房型名称');
         return
       }
       if(this.ruleForm.price ===''){
-        this.$message.error('房间价格');
+        this.$message.error('房型价格');
         return
       }
     
         }else{
         this.$router.push({ name: 'grogshop-grogshopRoom' })
          this.$message({
-          message: '修改房间成功',
+          message: '修改房型成功',
           type: 'success'
          })
         }

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

         <el-input v-model="listData.houseName"/>
       </el-form-item>
       <el-form-item label="房间租金" prop="rentalPrice">
-        <el-input v-model="listData.rentalPrice"/>
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="面积" prop="area">
-        <el-input v-model="listData.area"/>
+        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
             <el-option label="合租" value="2"/>
           </el-select>
       </el-form-item>
-      <el-form-item label="轮播图" prop="appCarouselImg">
+      <el-form-item label="轮播图(最多六张)" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
         <el-input v-model="listData.houseLabel"/>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
+        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="联系电话" prop="houseTel">
-        <el-input v-model="listData.houseTel"/>
+        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="小区地址" prop="communityAddress">
         <el-input v-model="listData.communityAddress"/>
         <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-form-item label="高德坐标" prop="communityLatitude">
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
+        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
         houseName: [
           { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
+        rentalPrice: [
+          { required: true, message: '请输入房间租金', trigger: 'blur' }
+        ],
         houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
+        houseStatus: [
+          { required: true, message: '请选择上架状态', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '请选择户型', trigger: 'blur' }
+        ],
+        rentalType: [
+          { required: true, message: '请选择租赁方式', trigger: 'blur' }
+        ],
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
           { required: true, message: '轮播图', trigger: 'blur' }
         ],
+        communityAddress: [
+          { required: true, message: '请选择小区地址', trigger: 'blur' }
+        ],
+        communityLatitude: [
+          { required: true, message: '请选择坐标', trigger: 'blur' }
+        ],
       }
     }
   },

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

         <el-input v-model="listData.houseName"/>
       </el-form-item>
       <el-form-item label="房间租金" prop="rentalPrice">
-        <el-input v-model="listData.rentalPrice"/>
+        <el-input v-model="listData.rentalPrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="面积" prop="area">
-        <el-input v-model="listData.area"/>
+        <el-input v-model="listData.area" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
             <el-option label="合租" value="2"/>
           </el-select>
       </el-form-item>
-      <el-form-item label="轮播图" prop="appCarouselImg">
+      <el-form-item label="轮播图(最多六张)" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
         <el-input v-model="listData.houseLabel"/>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
+        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="联系电话" prop="houseTel">
-        <el-input v-model="listData.houseTel"/>
+        <el-input v-model="listData.houseTel" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="小区地址" prop="communityAddress">
         <el-input v-model="listData.communityAddress"/>
         <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-form-item label="高德坐标" prop="communityLatitude">
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
+        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
         houseName: [
           { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
+        rentalPrice: [
+          { required: true, message: '请输入房间租金', trigger: 'blur' }
+        ],
         houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
+        houseStatus: [
+          { required: true, message: '请选择上架状态', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '请选择户型', trigger: 'blur' }
+        ],
+        rentalType: [
+          { required: true, message: '请选择租赁方式', trigger: 'blur' }
+        ],
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
           { required: true, message: '轮播图', trigger: 'blur' }
         ],
+        communityAddress: [
+          { required: true, message: '请选择小区地址', trigger: 'blur' }
+        ],
+        communityLatitude: [
+          { required: true, message: '请选择坐标', trigger: 'blur' }
+        ],
       }
     }
   },

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

         <el-input v-model.trim="listQuery.houseName" placeholder="房间名称" />
       </el-form-item>
       <el-form-item class="filter-item" label="租金从" >
-        <el-input v-model.trim="listQuery.startPrice" placeholder="租金从" />
+        <el-input v-model.trim="listQuery.startPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="租金从" />
       </el-form-item>
       <el-form-item class="filter-item" label="到" >
-        <el-input v-model.trim="listQuery.endPrice" placeholder="到" />
+        <el-input v-model.trim="listQuery.endPrice" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="到" />
       </el-form-item>
       <el-form-item class="filter-item" label="租赁方式" >
         <el-select v-model="listQuery.rentalType" placeholder="请选择">
       <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>注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"
       }
     },
 	  search() {
+      if(this.listQuery.startPrice > this.listQuery.endPrice){
+          this.$message.warning("起始金额不能大于结束金额");
+          return
+      }
       this.listQuery.pageNum = 1
       this.dataQuery()
     },

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

         </el-dialog>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
+        <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <span  style="font-size:9%;color:#C0C0C0">{{ '权重值越大，排序越靠前' }}</span>
       </el-form-item>
       <el-form-item label="商铺类型" prop="shopTypeId">
         <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="shopTel">
-        <el-input v-model="listData.shopTel"/>
+        <el-input v-model="listData.shopTel" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="商铺地址" prop="shopAddress">
         <el-input v-model="listData.shopAddress"/>
       </el-form-item>
       <el-form-item label="人均消费" prop="averagePrice">
-        <el-input v-model="listData.averagePrice"/>
+        <el-input v-model="listData.averagePrice" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item label="高德坐标">
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
         appIndexImg: '',
         appListImg: '',
         appCarouselImg: [],
-        sort: '',
+        sort: '1',
         shopTypeId: '',
         shopStatus: '',
         shopTel: '',
     handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
       const resImg = response.data[0]
       this.listData.appCarouselImg.push(resImg)
+      console.log('this.listData.appCarouselImg.length',this.listData.appCarouselImg.length)
+      if(this.listData.appCarouselImg.length === 6){
+         this.$message({
+          message: '当期图片添加已到最大限制',
+          type: 'warning'
+        });
+      }
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.$refs[formName].resetFields()
     },
     addShop() {
+      if(this.listData.shopIntroduction ===''){
+        this.$message.error('商铺介绍不能为空');
+        return
+      }
       // 加载框
       const loading = this.$loading({
         lock: true,

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

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

文档/MYSQL/smartCommunity.pdb

 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557818754" Name="smartCommunity" Objects="1163" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557991843" Name="smartCommunity" Objects="1154" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 <a:CreationDate>1557303510</a:CreationDate>
 <a:ModificationDate>1557306066</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((187327,18360), (204115,49558))</a:Rect>
+<a:Rect>((187327,17010), (204115,50908))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:Code>sort</a:Code>
 <a:CreationDate>1557302933</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557303497</a:ModificationDate>
+<a:ModificationDate>1557991843</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>排序(权重)</a:Comment>
-<a:DataType>varchar(2)</a:DataType>
-<a:Length>2</a:Length>
+<a:DataType>int(11)</a:DataType>
+<a:Length>11</a:Length>
 </o:Column>
 <o:Column Id="o994">
 <a:ObjectID>374CA7A2-870F-4618-8B30-6B2A033445B2</a:ObjectID>
 <a:Code>tp_rental_house</a:Code>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557818754</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>出租公寓表</a:Comment>
 <a:TotalSavingCurrency/>
 </o:Column>
 <o:Column Id="o1039">
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
-<a:Name>dining_table</a:Name>
-<a:Code>dining_table</a:Code>
+<a:Name>sofa</a:Name>
+<a:Code>sofa</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>餐桌 1 有</a:Comment>
+<a:Comment>沙发 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1040">
-<a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
-<a:Name>computer_desk</a:Name>
-<a:Code>computer_desk</a:Code>
+<a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
+<a:Name>washing_machine</a:Name>
+<a:Code>washing_machine</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>电脑桌 1 有</a:Comment>
+<a:Comment> 洗衣机 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1041">
-<a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
-<a:Name>water_heater</a:Name>
-<a:Code>water_heater</a:Code>
+<a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
+<a:Name>air_conditioning</a:Name>
+<a:Code>air_conditioning</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>热水器 1 有</a:Comment>
+<a:Comment>空调 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1042">
-<a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
-<a:Name>chair</a:Name>
-<a:Code>chair</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>00143CC9-8BE2-4977-A1B3-83A931F33907</a:ObjectID>
+<a:Name>fridge</a:Name>
+<a:Code>fridge</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>椅子 1 有</a:Comment>
+<a:Comment>冰箱 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1043">
-<a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
-<a:Name>washing_machine</a:Name>
-<a:Code>washing_machine</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>2DA64D7F-937A-462D-8887-C882BF3B10CD</a:ObjectID>
+<a:Name>TV</a:Name>
+<a:Code>TV</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment> 洗衣机 1 有</a:Comment>
+<a:Comment>电视 1有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1044">
-<a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
-<a:Name>air_conditioning</a:Name>
-<a:Code>air_conditioning</a:Code>
-<a:CreationDate>1557307121</a:CreationDate>
+<a:ObjectID>A9AA4CDC-CAA9-4524-B36F-93BDC87C4F0E</a:ObjectID>
+<a:Name>smart_lock</a:Name>
+<a:Code>smart_lock</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>空调 1 有</a:Comment>
+<a:Comment>智能锁 1有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1045">
-<a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
-<a:Name>table_lamp</a:Name>
-<a:Code>table_lamp</a:Code>
+<a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
+<a:Name>water_heater</a:Name>
+<a:Code>water_heater</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
 <a:ModificationDate>1557307546</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>台灯 1 有</a:Comment>
+<a:Comment>热水器 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
 <o:Column Id="o1046">
+<a:ObjectID>02B389B0-AF1E-4E9F-9FC6-F23DC270B992</a:ObjectID>
+<a:Name>desk</a:Name>
+<a:Code>desk</a:Code>
+<a:CreationDate>1557818776</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557819511</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>桌子 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1047">
+<a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
+<a:Name>chair</a:Name>
+<a:Code>chair</a:Code>
+<a:CreationDate>1557307121</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557307546</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>椅子 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1048">
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
 <a:Name>WiFi</a:Name>
 <a:Code>WiFi</a:Code>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1047">
+<o:Column Id="o1049">
+<a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
+<a:Name>kitchen</a:Name>
+<a:Code>kitchen</a:Code>
+<a:CreationDate>1557307121</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557819511</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>厨房 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1050">
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
-<a:Name>microwave_oven</a:Name>
-<a:Code>microwave_oven</a:Code>
+<a:Name>bathroom</a:Name>
+<a:Code>bathroom</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819544</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>微波炉 1 有</a:Comment>
+<a:Comment>独卫 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1048">
+<o:Column Id="o1051">
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
-<a:Name>natural_gas</a:Name>
-<a:Code>natural_gas</a:Code>
+<a:Name>balcony</a:Name>
+<a:Code>balcony</a:Code>
 <a:CreationDate>1557307121</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557819511</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>天然气 1 有</a:Comment>
+<a:Comment>阳台 1 有</a:Comment>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1049">
+<o:Column Id="o1052">
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1050">
+<o:Column Id="o1053">
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1051">
+<o:Column Id="o1054">
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1052">
+<o:Column Id="o1055">
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1053">
+<o:Key Id="o1056">
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1053"/>
+<o:Key Ref="o1056"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o253">
 <a:Comment>商铺图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1054">
+<o:Column Id="o1057">
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1055">
+<o:Column Id="o1058">
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1056">
+<o:Column Id="o1059">
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
 <a:Name>shop_id</a:Name>
 <a:Code>shop_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1057">
+<o:Column Id="o1060">
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1058">
+<o:Column Id="o1061">
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1059">
+<o:Column Id="o1062">
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1060">
+<o:Key Id="o1063">
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 <a:ModificationDate>1557304098</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1054"/>
+<o:Column Ref="o1057"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1060"/>
+<o:Key Ref="o1063"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o255">
 <a:Comment>出租房间图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1061">
+<o:Column Id="o1064">
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1062">
+<o:Column Id="o1065">
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1063">
+<o:Column Id="o1066">
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
 <a:Name>rental_house_id</a:Name>
 <a:Code>rental_house_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1064">
+<o:Column Id="o1067">
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1065">
+<o:Column Id="o1068">
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1066">
+<o:Column Id="o1069">
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1067">
+<o:Key Id="o1070">
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 <a:ModificationDate>1557307564</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1061"/>
+<o:Column Ref="o1064"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1067"/>
+<o:Key Ref="o1070"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o256">
 <a:Comment>用户车牌号表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1068">
+<o:Column Id="o1071">
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1069">
+<o:Column Id="o1072">
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1070">
+<o:Column Id="o1073">
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
 <a:Name>ta_user_id</a:Name>
 <a:Code>ta_user_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1071">
+<o:Column Id="o1074">
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1072">
+<o:Column Id="o1075">
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1073">
+<o:Column Id="o1076">
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1074">
+<o:Column Id="o1077">
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1075">
+<o:Column Id="o1078">
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1076">
+<o:Column Id="o1079">
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
 <a:Name>renew_time</a:Name>
 <a:Code>renew_time</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1077">
+<o:Column Id="o1080">
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
 <a:Name>license_type</a:Name>
 <a:Code>license_type</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1078">
+<o:Column Id="o1081">
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1079">
+<o:Column Id="o1082">
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1080">
+<o:Column Id="o1083">
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1081">
+<o:Column Id="o1084">
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1082">
+<o:Key Id="o1085">
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 <a:ModificationDate>1557367718</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1068"/>
+<o:Column Ref="o1071"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1082"/>
+<o:Key Ref="o1085"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o257">
 <a:Comment>月租车缴费订单表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1083">
+<o:Column Id="o1086">
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1084">
+<o:Column Id="o1087">
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1085">
+<o:Column Id="o1088">
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
 <a:Name>user_license_id</a:Name>
 <a:Code>ta_user_id</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1086">
+<o:Column Id="o1089">
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1087">
+<o:Column Id="o1090">
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
 <a:Name>order_status</a:Name>
 <a:Code>order_status</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1088">
+<o:Column Id="o1091">
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1089">
+<o:Column Id="o1092">
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1090">
+<o:Column Id="o1093">
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1091">
+<o:Column Id="o1094">
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1092">
+<o:Column Id="o1095">
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
 <a:Name>extension_month</a:Name>
 <a:Code>extension_month</a:Code>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1093">
+<o:Column Id="o1096">
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
 <a:Name>extension_price</a:Name>
 <a:Code>extension_price</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1094">
+<o:Column Id="o1097">
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
 <a:Name>payment_tel</a:Name>
 <a:Code>payment_tel</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1095">
+<o:Column Id="o1098">
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
 <a:Name>payment_name</a:Name>
 <a:Code>payment_name</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1096">
+<o:Column Id="o1099">
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
 <a:Name>payment_type</a:Name>
 <a:Code>payment_type</a:Code>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1097">
+<o:Column Id="o1100">
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1098">
+<o:Column Id="o1101">
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1099">
+<o:Column Id="o1102">
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1100">
+<o:Column Id="o1103">
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1101">
+<o:Key Id="o1104">
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 <a:ModificationDate>1557372945</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1083"/>
+<o:Column Ref="o1086"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1101"/>
+<o:Key Ref="o1104"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o259">
 <a:Comment>app端版本号</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1102">
+<o:Column Id="o1105">
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
 <a:Length>11</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1103">
+<o:Column Id="o1106">
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
 <a:Name>client_version</a:Name>
 <a:Code>client_version</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1104">
+<o:Column Id="o1107">
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
 <a:Name>service_version</a:Name>
 <a:Code>service_version</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1105">
+<o:Column Id="o1108">
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
 <a:Name>type</a:Name>
 <a:Code>type</a:Code>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1106">
+<o:Column Id="o1109">
 <a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
 <a:Name>update_address</a:Name>
 <a:Code>update_address</a:Code>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1107">
+<o:Key Id="o1110">
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
 <a:ModificationDate>1557800616</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1102"/>
+<o:Column Ref="o1105"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1107"/>
+<o:Key Ref="o1110"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1108">
+<o:Group Id="o1111">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1109">
+<o:TargetModel Id="o1112">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

文档/MYSQL/smartCommunity.pdm

 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557819544" Name="smartCommunity" Objects="1167" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557991843" Name="smartCommunity" Objects="1154" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 <a:Code>sort</a:Code>
 <a:CreationDate>1557302933</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557303497</a:ModificationDate>
+<a:ModificationDate>1557991843</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>排序(权重)</a:Comment>
-<a:DataType>varchar(2)</a:DataType>
-<a:Length>2</a:Length>
+<a:DataType>int(11)</a:DataType>
+<a:Length>11</a:Length>
 </o:Column>
 <o:Column Id="o994">
 <a:ObjectID>374CA7A2-870F-4618-8B30-6B2A033445B2</a:ObjectID>