提交

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

@@ -272,7 +272,7 @@
       </if>
       and community_id = #{communityId,jdbcType=INTEGER}
       and shop_status =1
-      order by create_date
+      order by sort DESC,update_date desc
     </where>
   </select>
 
@@ -281,7 +281,7 @@
   </select>
 
   <select id="selectShopCommunity" resultMap="ResultMapWithBLOBs">
-    select * from tp_shop WHERE community_id = #{communityId} and shop_status = 1  order by sort desc LIMIT 4
+    select * from tp_shop WHERE community_id = #{communityId} and shop_status = 1  order by sort DESC,update_date desc  LIMIT 4
   </select>
 
 </mapper>

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

@@ -22,6 +22,7 @@
                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            and community_id = #{communityId}
         </where>
         order by sort desc,update_date desc
     </select>

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

@@ -39,6 +39,6 @@
         <if test="tpRentalHouse.endPrice != null and tpRentalHouse.endPrice != ''">
             and t.rental_price  &lt;= #{tpRentalHouse.endPrice,jdbcType=INTEGER}
         </if>
-        order by t.sort
+        order by t.sort, t.update_date desc
     </select>
 </mapper>

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

@@ -494,14 +494,14 @@ export const constantRouterMap = [
         component: () => import('@/views/grogshop/grogshopRoomAdd'),
         name: 'grogshop-grogshopRoomAdd',
         hidden: true,
-        meta: { title: '新增房间', icon: 'table' }
+        meta: { title: '新增房型', icon: 'table' }
       },
       {
         path: '/grogshop/grogshopRoomEdit',
         component: () => import('@/views/grogshop/grogshopRoomEdit'),
         name: 'grogshop-grogshopRoomEdit',
         hidden: true,
-        meta: { title: '编辑房间', icon: 'table' }
+        meta: { title: '编辑房型', icon: 'table' }
       }
     ]
   },

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

@@ -54,7 +54,7 @@
         type="selection"
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
-      <el-table-column prop="roomName" label="房屋名称" align="center">
+      <el-table-column prop="roomName" label="房型名称" align="center">
          <template slot-scope="scope" >
           <a v-if="scope.row.roomStatus==='1'">
             <span :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">

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

@@ -7,8 +7,8 @@
        <!-- <el-form-item label="房型号" prop="roomNo">
         <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="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>

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

@@ -7,11 +7,11 @@
       <!-- <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-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="上架">
@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数"/>
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>
@@ -60,10 +60,10 @@ export default {
   },
   methods: {
     submitForm(){
-      if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房型号');
-        return
-      }
+      // if(this.ruleForm.roomNo ===''){
+      //   this.$message.error('请输入房型号');
+      //   return
+      // }
       if(this.ruleForm.roomName ===''){
         this.$message.error('请输入房型名称');
         return

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

@@ -92,7 +92,7 @@
         <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="地图定位1" prop="communityLatitude">
+      <el-form-item label="地图定位" prop="communityLatitude">
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择公寓位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />

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

@@ -59,7 +59,18 @@
         width="55"/>
       <el-table-column prop="id" label="房间编号" align="center"/>
       <el-table-column prop="houseName" label="房间名称" align="center" >
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.houseName }}</span></a></template>
+        <template slot-scope="scope" >
+          <a v-if="scope.row.houseStatus==='1'">
+            <span :title="scope.row.houseName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
+            {{ scope.row.houseName}}
+            </span>
+          </a>
+          <a v-if="scope.row.houseStatus==='2'">
+            <span :title="scope.row.houseName" @click="clickTitle(scope.row.id)" style="color:#BDBDBD">
+            {{ scope.row.houseName}}
+            </span>
+          </a>
+       </template>
       </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
       <el-table-column prop="rentalPrice" label="租金" align="center"/>

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

@@ -1,9 +1,9 @@
 <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-form-item label="商铺名称" prop="shopName">
         <el-input v-model="listData.shopName"/>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="商铺说明" prop="remark">
         <el-input v-model="listData.remark"/>
       </el-form-item>
@@ -71,7 +71,7 @@
       <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="高德坐标">
+      <el-form-item label="地图坐标">
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择商铺位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 100px;" />