From df74f02d3bb4e9045d53e4a229f3b5e04d5b248f Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期五, 22 十二月 2023 16:01:19 +0800
Subject: [PATCH] update_202312221600_卸麻通知和称谓显示v1
---
src/pages/room/list.vue | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/src/pages/room/list.vue b/src/pages/room/list.vue
index d5134fc..2e1d4ed 100644
--- a/src/pages/room/list.vue
+++ b/src/pages/room/list.vue
@@ -1,10 +1,14 @@
<!--room-list.vue-->
<template>
- <div class="page">
+ <div class="page flex flex-col">
<div class="page_header flex flex-ver">
- <div class="left flex flex-ver" @click="back">
- <img class="page_logo_1" src="../../assets/img/logo_1.png">
- <img class="page_logo_2" src="../../assets/img/logo_2.png">
+ <div class="left flex flex-ver" @click="resetPage">
+ <div class="page_logo_1">
+ <img class="img" src="static/imgs/logo_1.png">
+ </div>
+ <div class="page_logo_2">
+ <img class="img" src="static/imgs/logo_2.png">
+ </div>
</div>
<div class="right flex-1 flex flex-jcfe flex-ver">
<div class="page_choose_shop">
@@ -20,10 +24,10 @@
<!-- <div class="page_time">{{ timeObj.time }}</div> -->
</div>
</div>
- <div class="page_container">
- <div class="list_container flex flex-col">
+ <div class="page_container flex-1 h1 flex flex-col">
+ <div class="list_container h1 flex-1 flex flex-col">
<div class="list_container__title">璇烽�夋嫨鎴块棿</div>
- <div class="list_block flex-1">
+ <div class="list_block flex-1 h1">
<div v-if="list && list.length" class="list flex flex-ver flex-wrap">
<!-- act -->
<div v-for="(item, index) in list" :key="index" class="list__item flex flex-center" @click="selectRoom(item)">{{ item.roomNo }}</div>
@@ -41,6 +45,7 @@
<script>
// import Login from '../utils/jun_login.js'
import Req from '../../utils/jun_httpInstall' // http 璇锋眰
+// import xioFn from './utils/xio_fn.js'
export default {
name: 'RoomList',
components: {},
@@ -56,6 +61,7 @@
computed: {
},
+ activated() {},
mounted() {
console.log('roomList mounted')
this.init()
@@ -70,17 +76,25 @@
this.getShopList()
this.getRoomList()
},
+ // 鍒锋柊娴忚鍣ㄩ〉闈�
+ resetPage() {
+ window.location.reload()
+ // this.getRoomList()
+ },
// 鑾峰彇闂ㄥ簵鍒楄〃
getShopList() {
var params = {}
Req.http.post({
- url: 'treat/screen/shop/list',
+ url: 'guide/treat/screen/shop/list',
data: params,
header: { 'Content-Type': 'application/json' },
mockData: {
code: 100,
msg: '',
- data: {}
+ data: [{
+ name: 'xx',
+ id: 'xx'
+ }]
}
}).then((res) => {
this.shopList = res.data || []
@@ -93,13 +107,15 @@
params.shopId = this.shopId
}
Req.http.post({
- url: 'treat/screen/room/list',
+ url: 'guide/treat/screen/room/list',
data: params,
header: { 'Content-Type': 'application/json' },
mockData: {
code: 100,
msg: '',
- data: {}
+ data: [{
+ id: 'xx', roomNo: 'xx'
+ }]
}
}).then((res) => {
this.list = res.data || []
@@ -113,6 +129,16 @@
},
// 璺宠浆璇︽儏
selectRoom(item = {}) {
+ // console.log(this.$router.options.routes)
+ // this.$router.options.routes
+ localStorage.removeItem('curTreatId')
+ if (this.$router && this.$router.options && this.$router.options.routes) {
+ this.$router.options.routes.forEach((o) => {
+ if (o.name === 'roomDetail') {
+ o.meta && (o.meta.isPush = true)
+ }
+ })
+ }
this.$router.push({
path: `./room/detail?id=${item.id || ''}`
})
@@ -136,11 +162,14 @@
}
</style>
<style scoped>
+/* .page_container {
+ overflow: hidden;
+} */
.list_container {
width: 100%;
- height: 100%;
background-color: #fff;
border-radius: 10px;
+ /* overflow: hidden; */
}
.list_container__title {
line-height: 56px;
@@ -152,12 +181,10 @@
/* font-weight: bold; */
}
.list_block {
- /* padding-right: 66px; */
- margin-bottom: 50px;
overflow: auto;
}
.list_block .list {
-
+ margin-bottom: 20px;
}
.list_block .list .list__item {
padding: 40px 30px;
--
Gitblit v1.8.0