傅行帆 6 vuotta sitten
vanhempi
commit
184b664ccf

+ 1
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopSettingServiceImpl.java Näytä tiedosto

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

+ 1
- 1
VUECODE/smart-property-manage/src/router/index.js Näytä tiedosto

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

+ 7
- 3
VUECODE/smart-property-manage/src/views/grogshop/configindex.vue Näytä tiedosto

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

@@ -7,11 +7,11 @@
7 7
        <!-- <el-form-item label="房型号" prop="roomNo">
8 8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
9 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 12
       </el-form-item>
13 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 15
       </el-form-item>
16 16
       <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
17 17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
@@ -20,7 +20,7 @@
20 20
         </el-select>
21 21
       </el-form-item>
22 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 24
       </el-form-item>  
25 25
       <el-form-item>
26 26
         <el-button type="primary" @click="submitForm()">保存</el-button>

+ 4
- 4
VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue Näytä tiedosto

@@ -7,11 +7,11 @@
7 7
       <!-- <el-form-item label="房型号" >
8 8
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
9 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 12
       </el-form-item>
13 13
       <el-form-item label="房型价格">
14
-        <el-input v-model="ruleForm.price" placeholder="房型价格"/>
14
+        <el-input v-model="ruleForm.price" placeholder="单位元"/>
15 15
       </el-form-item>
16 16
       <el-form-item class="filter-item"  label="上架状态">
17 17
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
@@ -20,7 +20,7 @@
20 20
         </el-select>
21 21
       </el-form-item>
22 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 24
       </el-form-item>  
25 25
       <el-form-item>
26 26
         <el-button type="primary" @click="submitForm()">保存</el-button>

+ 1
- 1
VUECODE/smart-property-manage/src/views/shop/shopSetting.vue Näytä tiedosto

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