Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

src/App.vue

@@ -13,7 +13,7 @@ export default {
 </script>
 
 <style>
-@import "//at.alicdn.com/t/font_1635628_k200g0j2ghq.css";
+@import "//at.alicdn.com/t/font_1635628_xspbsio88z.css";
 @import "./assets/css/common.css";
 @import './assets/global/font.css';
 @import "./assets/css/reset.css";

src/components/assetsman/HotelInfo.vue

@@ -106,12 +106,30 @@
   .w300 {
     width: 300px !important;
   }
+  .w250 {
+    width: 250px !important;
+  }
 
   .HotelInfo .ql-editor {
     min-height: 200px;
 
   }
-
+  .templatSloat{
+    width: 50px;
+    height: 40px;
+    background: #e9e9eb;
+    display: inline-block;
+    position: relative;
+    top: 1px;
+    text-align: center;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    cursor: pointer;
+    left: -4px;
+  }
+  .mapList{
+    width:800px;
+  }
 </style><template>
   <div class="flexOne changInfo HotelInfo">
     <div class="resource-content clearfix">
@@ -142,9 +160,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="ホテルの住所" prop="SHotelAddress" title="酒店地址">
-              <el-input maxlength="100" class="w300  " v-model="addMsg.SHotelAddress">
-                <el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
+              <el-input maxlength="100" class="w250" v-model="addMsg.SHotelAddress">
               </el-input>
+              <div class="templatSloat" @click="selectAddress = true">
+                  <i class="iconfont iconxiazai19"></i>
+              </div>
             </el-form-item>
             <el-form-item label="評価" title="酒店星级">
               <el-select class="w300" placeholder="决断" v-model="addMsg.SHotelStar">
@@ -252,7 +272,7 @@
         </el-upload>
       </div>
     </div>
-    <div class="btn-list" style="margin:0 0 30px 60px;"><span class="common-lefttit"></span><button
+    <div class="btn-list" style="margin-left:60px;padding-bottom:30px;"><span class="common-lefttit"></span><button
         style="margin-right:20px;" class="chaxunSpan" :class="{'disClick':!isSubmit}"
         @click="submitForm('addMsg')">を選択します</button><button class="chaxunSpan"
         @click="goUrl('HotelList')">キャンセル</button></div>

src/components/assetsman/RoomList.vue

@@ -154,9 +154,9 @@
               <span class="label">部屋の面積</span>
               <el-input size="mini" v-model="addMsg.Area" placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" prop="IsExtraBed" title="是否可加床1是2否">
+            <el-form-item label="" title="是否可加床1是2否">
               <span class="label">ベット同伴（はい、いいえ）</span>
-              <el-select size="small" v-model="addMsg.IsExtraBed" placeholder="選んでください" clearable filterable>
+              <el-select size="small" v-model="addMsg.IsExtraBed" placeholder="選んでください" filterable>
                 <el-option label="は" :value="1"></el-option>
                 <el-option label="いいえ" :value="2"></el-option>
               </el-select>
@@ -171,7 +171,7 @@
                 <el-option v-for="(item,index) in wifiList" :key="index" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" title="楼层" prop="Floor">
+            <el-form-item label="" title="楼层">
               <span class="label">フロア</span>
               <el-input size="mini" v-model="addMsg.Floor" @keyup.native="checkInteger(addMsg,'Floor')" placeholder="入力してください"></el-input>
             </el-form-item>
@@ -186,7 +186,7 @@
                 <el-option v-for="(item,index) in FoodList" :key="index" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" prop="IsExtraBed" title="是否是吸烟房1是2否">
+            <el-form-item label="" title="是否是吸烟房1是2否">
               <span class="label">喫煙（可・不可）</span>
               <el-select size="small" v-model="addMsg.IsSmoke" placeholder="選んでください" clearable filterable>
                 <el-option label="は" :value="1"></el-option>
@@ -306,21 +306,11 @@
             message: "フロアを入力してください",
             trigger: "blur"
           }],
-          Floor:[{
-            required: true,
-            message: "フロアを入力してください",
-            trigger: "blur"
-          }],
           BroadBand: [{
             required: true,
             message: "選んでください",
             trigger: "change"
           }],
-          IsExtraBed: [{
-            required: true,
-            message: "選んでください",
-            trigger: "change"
-          }],
           Area: [{
             required: true,
             message: "面積を入力してください",
@@ -346,11 +336,6 @@
             message: "名前を入力してください",
             trigger: "blur"
           }],
-          // WindoWCut: [{
-          //   required: true,
-          //   message: "部屋窓型を入力してください",
-          //   trigger: "blur"
-          // }],
            RoomFacility: [{
             required: true,
             message: "客室タイプを入力してください",

src/components/commonPage/googleMap.vue

 <style>
 .mapContent .googleMap {
-  width: 800px;
+  width: 100%;
   height: 350px;
   margin-top: 10px;
 }
@@ -40,8 +40,8 @@
             </div>
         </div>
         <div class="btnList">
-            <input type="button" class="normalBtn sureBtn" value="确定" @click="sendMsg"/>
-            <input type="button" class="hollowFixedBtn" value="取消" @click="closeDialog"/>
+            <input type="button" class="chaxunSpan" value="确定" @click="sendMsg"/>
+            <input type="button" class="addSpan" value="取消" @click="closeDialog"/>
         </div>
     </div>
 </template>