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

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

 			//查看是否存在系统创建的四条数据
 			QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",userElement.getCommunityId());
+			queryWrapper.eq("source","sys");
 			List<TpShopType> list = shopTypeMapper.selectList(queryWrapper);
 			if (list.size() < 1){
 				//插入数据

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/configindex.vue

       <el-form-item label="酒店地址" prop="hotelAddress">
         <el-input v-model="listData.hotelAddress"/>
       </el-form-item>
-      <el-form-item label="高德坐标">
+      <el-form-item label="高德坐标" prop="hotelLatitude">
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
+        <span  style="color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="房间介绍" prop="hotelIntroduction">
+      <el-form-item label="酒店介绍" prop="hotelIntroduction">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
         hotelName: [
           { required: true, message: '酒店名称', trigger: 'blur' }
         ],
+        hotelLatitude: [
+          { required: true, message: '请输入坐标', trigger: 'blur' }
+        ],
         hotelIntroduction: [
-          { required: true, message: '房间介绍不能为空', trigger: 'change' }
+          { required: true, message: '酒店介绍不能为空', trigger: 'change' }
         ],
       }
     }

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

        <!-- <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,'')"/>
+        <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="上架状态" prop="roomStatus">
         <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="请输入权重数值" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <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>

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

       <!-- <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="单位元"/>
       </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="不小于0的整数"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>

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

     },
     changeSetting() {
       this.ChangeShopSetting(this.shopSettingValue).then((res) => {
-        search()
+        this.search()
       }).catch(() => {
         console.log('error shopTypeList')
       })