合并

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

         roomName: [
           { required: true, message: '请输入房型名称', trigger: 'blur' }
         ],
-        roomNo: [
-          { required: true, message: '请输入房型号', trigger: 'change' }
-        ],
         remark: [
           { required: true, message: '请输入房型描述', trigger: 'blur' }
         ],
   },
   methods: {
     submitForm(){
-      if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房型号');
-        return
-      }
       if(this.ruleForm.roomName ===''){
         this.$message.error('请输入房型名称');
         return

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

       <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>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

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

       <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>注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

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

           inactive-color="#ff4949"
           @change="changeSetting">
         </el-switch>
-        <span>关闭后业主在APP端将看不到商铺相关的页面</span>
+         <span  style="font-size:9%;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>索引顺序即显示时的先后顺序，不能相同，必须为大于0的整数，数字越小越靠前，如果有1则1号值排会在APP端第一位</span>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">索引顺序即显示时的先后顺序，不能相同，必须为大于0的整数，数字越小越靠前，如果有1则1号值排会在APP端第一位</span>
     </div>
     <el-table
       v-loading="listLoading"