合并

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

       <el-form-item label="酒店地址" prop="hotelAddress">
         <el-input v-model="listData.hotelAddress"/>
       </el-form-item>
-<<<<<<< HEAD
       <el-form-item label="地图定位">
-        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
-        <div>
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
-        <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
-        </div>
-=======
-      <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>
->>>>>>> e8f4a282c9948bc18a2bac11b9a4ab6b8d9e8c70
+        <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 100px;" />
+        <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 100px;" />
+        
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

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

         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
       </el-form-item>
       <el-form-item label="地图定位" prop="communityLatitude">
-        <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
-        <div>
         <span>高德坐标</span>
-        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        </div>
+        <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <span>高德坐标</span>
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 100px;" />
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 100px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

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

           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍">
+      <el-form-item label="商铺介绍" prop="shopIntroductionValue">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor @wangeditorEvent="wangeditorValue"/>
         ],
         averagePrice: [
           { required: true, message: '请输入人均消费', trigger: 'blur' }
+        ],
+        shopIntroductionValue: [
+          { required: true, message: '', trigger: 'blur' }
         ]
       }
     }
       this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
     },
     submitForm(formName) { // 提交
+    console.log('this.listData.shopIntroduction',this.listData.shopIntroduction)
+    if(this.listData.shopIntroduction ==='<p><br></p>'){
+        this.$message.error('商铺介绍不能为空');
+        return
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.addShop()
       this.$refs[formName].resetFields()
     },
     addShop() {
+      console.log('this.listData.shopIntroduction',this.listData.shopIntroduction)
       if(this.listData.shopIntroduction ===''){
         this.$message.error('商铺介绍不能为空');
         return

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

       <!-- <el-form-item label="商铺名称" prop="shopName">
         <el-input v-model="listData.shopName"/>
       </el-form-item> -->
-      <el-form-item label="商铺说明" prop="remark">
+      <el-form-item label="商铺说明11" prop="remark">
         <el-input v-model="listData.remark"/>
       </el-form-item>
       <el-form-item label="app首页展示图" prop="appIndexImg">
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍">
-          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>  listData.shopIntroduction-->
+      <el-form-item label="* 商铺介绍">
+          <!-- <el-input v-model="listData.shopIntroductiont" placeholder="内容详情"/>   -->
           <div id="father">
             <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
           </div>
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
-          { required: false, message: 'app商铺轮播图', trigger: 'blur' }
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
         ],
         shopName: [
           { required: true, message: '商铺名称', trigger: 'blur' }
         loading.close()
         return
       }
+      console.log()
+      if(this.listData.shopIntroduction ==='<p><br></p>'){
+        this.$message.error('商铺介绍不能为空');
+        loading.close()
+        return
+      }
       this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({