傅行帆 6 年之前
父節點
當前提交
184b664ccf

+ 1
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopSettingServiceImpl.java 查看文件

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

+ 1
- 1
VUECODE/smart-property-manage/src/router/index.js 查看文件

487
         path: '/grogshop/grogshopRoom',
487
         path: '/grogshop/grogshopRoom',
488
         component: () => import('@/views/grogshop/grogshopRoom'),
488
         component: () => import('@/views/grogshop/grogshopRoom'),
489
         name: 'grogshop-grogshopRoom',
489
         name: 'grogshop-grogshopRoom',
490
-        meta: { title: '房列表', icon: 'table' }
490
+        meta: { title: '房列表', icon: 'table' }
491
       },
491
       },
492
       {
492
       {
493
         path: '/grogshop/grogshopRoomAdd',
493
         path: '/grogshop/grogshopRoomAdd',

+ 7
- 3
VUECODE/smart-property-manage/src/views/grogshop/configindex.vue 查看文件

48
       <el-form-item label="酒店地址" prop="hotelAddress">
48
       <el-form-item label="酒店地址" prop="hotelAddress">
49
         <el-input v-model="listData.hotelAddress"/>
49
         <el-input v-model="listData.hotelAddress"/>
50
       </el-form-item>
50
       </el-form-item>
51
-      <el-form-item label="高德坐标">
51
+      <el-form-item label="高德坐标" prop="hotelLatitude">
52
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
52
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
53
         <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
53
         <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
54
+        <span  style="color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值,供APP端用户导航</span>
54
       </el-form-item>
55
       </el-form-item>
55
       <el-form-item label="">
56
       <el-form-item label="">
56
          <!-- 地图 -->
57
          <!-- 地图 -->
61
           </el-amap>
62
           </el-amap>
62
         </div>
63
         </div>
63
       </el-form-item>
64
       </el-form-item>
64
-      <el-form-item label="房间介绍" prop="hotelIntroduction">
65
+      <el-form-item label="酒店介绍" prop="hotelIntroduction">
65
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
66
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
66
           <div id="father">
67
           <div id="father">
67
             <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
68
             <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
129
         hotelName: [
130
         hotelName: [
130
           { required: true, message: '酒店名称', trigger: 'blur' }
131
           { required: true, message: '酒店名称', trigger: 'blur' }
131
         ],
132
         ],
133
+        hotelLatitude: [
134
+          { required: true, message: '请输入坐标', trigger: 'blur' }
135
+        ],
132
         hotelIntroduction: [
136
         hotelIntroduction: [
133
-          { required: true, message: '房间介绍不能为空', trigger: 'change' }
137
+          { required: true, message: '酒店介绍不能为空', trigger: 'change' }
134
         ],
138
         ],
135
       }
139
       }
136
     }
140
     }

+ 4
- 4
VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue 查看文件

7
        <!-- <el-form-item label="房型号" prop="roomNo">
7
        <!-- <el-form-item label="房型号" prop="roomNo">
8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
9
       </el-form-item> -->
9
       </el-form-item> -->
10
-     <el-form-item class="filter-item" label="房描述" prop="remark" >
11
-        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
10
+     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
11
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
12
       </el-form-item>
12
       </el-form-item>
13
       <el-form-item label="房型价格" prop="price">
13
       <el-form-item label="房型价格" prop="price">
14
-        <el-input v-model="ruleForm.price" placeholder="房型价格" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
14
+        <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
15
       </el-form-item>
15
       </el-form-item>
16
       <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
16
       <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
20
         </el-select>
20
         </el-select>
21
       </el-form-item>
21
       </el-form-item>
22
       <el-form-item label="权重" prop="sort">
22
       <el-form-item label="权重" prop="sort">
23
-        <el-input v-model="ruleForm.sort" placeholder="请输入权重数值" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
23
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
24
       </el-form-item>  
24
       </el-form-item>  
25
       <el-form-item>
25
       <el-form-item>
26
         <el-button type="primary" @click="submitForm()">保存</el-button>
26
         <el-button type="primary" @click="submitForm()">保存</el-button>

+ 4
- 4
VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue 查看文件

7
       <!-- <el-form-item label="房型号" >
7
       <!-- <el-form-item label="房型号" >
8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
9
       </el-form-item> -->
9
       </el-form-item> -->
10
-     <el-form-item class="filter-item" label="房描述" prop="remark" >
11
-        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
10
+     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
11
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
12
       </el-form-item>
12
       </el-form-item>
13
       <el-form-item label="房型价格">
13
       <el-form-item label="房型价格">
14
-        <el-input v-model="ruleForm.price" placeholder="房型价格"/>
14
+        <el-input v-model="ruleForm.price" placeholder="单位元"/>
15
       </el-form-item>
15
       </el-form-item>
16
       <el-form-item class="filter-item"  label="上架状态">
16
       <el-form-item class="filter-item"  label="上架状态">
17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
20
         </el-select>
20
         </el-select>
21
       </el-form-item>
21
       </el-form-item>
22
       <el-form-item label="权重" prop="sort">
22
       <el-form-item label="权重" prop="sort">
23
-        <el-input v-model="ruleForm.sort" placeholder="权重"/>
23
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数"/>
24
       </el-form-item>  
24
       </el-form-item>  
25
       <el-form-item>
25
       <el-form-item>
26
         <el-button type="primary" @click="submitForm()">保存</el-button>
26
         <el-button type="primary" @click="submitForm()">保存</el-button>

+ 1
- 1
VUECODE/smart-property-manage/src/views/shop/shopSetting.vue 查看文件

112
     },
112
     },
113
     changeSetting() {
113
     changeSetting() {
114
       this.ChangeShopSetting(this.shopSettingValue).then((res) => {
114
       this.ChangeShopSetting(this.shopSettingValue).then((res) => {
115
-        search()
115
+        this.search()
116
       }).catch(() => {
116
       }).catch(() => {
117
         console.log('error shopTypeList')
117
         console.log('error shopTypeList')
118
       })
118
       })