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_r9erjx8y0oe.css";
+@import "//at.alicdn.com/t/font_1635628_k200g0j2ghq.css";
 @import "./assets/css/common.css";
 @import './assets/global/font.css';
 @import "./assets/css/reset.css";

src/components/assetsman/HotelList.vue

@@ -77,7 +77,7 @@
               </el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="プレビュー" placement="top" title="预览">
-              <el-button type="primary" @click="goPreviewUrl(row)" icon="iconfont iconicon-" circle
+              <el-button type="danger" @click="goPreviewUrl(row)" icon="iconfont iconyulan" circle
                 style="padding:5px;"></el-button>
             </el-tooltip>
           </template>

src/components/assetsman/RoomList.vue

@@ -34,7 +34,7 @@
           </el-select>
         </li>
         <li>
-          <el-select clearable size="small" v-model="msg.RoomStatus" placeholder="状态" title="状态">
+          <el-select clearable size="small" v-model="msg.RoomStatus" placeholder="状態" title="状態">
             <el-option label="决断" :value="0"></el-option>
             <el-option label="やむを得ず" :value="1"></el-option>
             <el-option label="下機" :value="2"></el-option>