From 6d37dc93b40c6935f65ec4c68b7f6985c9d3bad5 Mon Sep 17 00:00:00 2001
From: jxmanxk <312142485@qq.com>
Date: 星期二, 23 一月 2024 17:44:14 +0800
Subject: [PATCH] Merge branch 'xio_dev'
---
src/pages/room/list.vue | 104 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 22 deletions(-)
diff --git a/src/pages/room/list.vue b/src/pages/room/list.vue
index b6ba9c1..77d4c2d 100644
--- a/src/pages/room/list.vue
+++ b/src/pages/room/list.vue
@@ -10,12 +10,21 @@
<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">
+ <div class="flex-1 flex flex-center">
+ <div class="select_shop_block flex flex-ver" @click="showChooseShop">
+ <div v-if="!shopId" class="tx">璇烽�夋嫨闂ㄥ簵</div>
+ <div v-if="shopId" class="tx">{{ shopName }}</div>
+ <div class="icon_block">
+ <img class="icon" src="static/imgs/down.png">
+ </div>
+ </div>
+ </div>
+ <div class="right flex flex-jcfe flex-ver">
+ <!-- <div class="page_choose_shop">
<el-select v-model="shopId" placeholder="璇烽�夋嫨" style="width:400px;" clearable @change="getRoomList">
<el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
- </div>
+ </div> -->
<div class="page_date">
<div class="page_week">{{ timeObj.week }}</div>
<div class="page_day">{{ timeObj.date }}</div>
@@ -39,20 +48,28 @@
</div>
</div>
</div>
+
+ <XioRoomListShopChg ref="XioRoomListShopChg" @confirm="confirmShop" />
</div>
</template>
<script>
// import Login from '../utils/jun_login.js'
import Req from '../../utils/jun_httpInstall' // http 璇锋眰
+// import xioFn from './utils/xio_fn.js'
+// 閫氱煡鍗搁夯
+import XioRoomListShopChg from '@/components/xio_room_list_shop_chg'
export default {
name: 'RoomList',
- components: {},
+ components: {
+ XioRoomListShopChg
+ },
inject: ['noop'],
data() {
return {
shopList: [],
shopId: '',
+ shopName: '',
list: [],
timeObj: {}// week锛氭槦鏈燂紝date锛氬勾鏈堟棩锛宼imeMin锛氭椂鍒嗭紝time锛氭椂鍒嗙锛宼imeStamp锛氭椂闂存埑
}
@@ -69,33 +86,49 @@
},
methods: {
- init() {
+ async init() {
// 璁℃椂
this.countGetTime(this, 'timeObj', 'list')
- this.getShopList()
+ // await this.getShopList()
+ // this.getRoomList()
+ this.showChooseShop()
+ },
+ // 纭畾閫夋嫨闂ㄥ簵
+ confirmShop(item) {
+ this.shopId = item.id
+ this.shopName = item.name
this.getRoomList()
},
- // 鍒锋柊椤甸潰
+ // 鏄剧ず閫夋嫨闂ㄥ簵鍒楄〃寮圭獥
+ showChooseShop() {
+ // 鎵撳紑寮圭獥
+ this.$refs['XioRoomListShopChg'].showShopDialog(this.shopId)
+ },
+ // 鍒锋柊娴忚鍣ㄩ〉闈�
resetPage() {
- this.getRoomList()
+ window.location.reload()
+ // this.getRoomList()
},
// 鑾峰彇闂ㄥ簵鍒楄〃
getShopList() {
var params = {}
- Req.http.post({
- url: 'guide/treat/screen/shop/list',
- data: params,
- header: { 'Content-Type': 'application/json' },
- mockData: {
- code: 100,
- msg: '',
- data: [{
- name: 'xx',
- id: 'xx'
- }]
- }
- }).then((res) => {
- this.shopList = res.data || []
+ return new Promise((resolve, reject) => {
+ Req.http.post({
+ url: 'guide/treat/screen/shop/list',
+ data: params,
+ header: { 'Content-Type': 'application/json' },
+ mockData: {
+ code: 100,
+ msg: '',
+ data: [{
+ name: 'xx',
+ id: 'xx'
+ }]
+ }
+ }).then((res) => {
+ this.shopList = res.data || []
+ resolve(res)
+ })
})
},
// 鑾峰彇鍒楄〃
@@ -129,6 +162,7 @@
selectRoom(item = {}) {
// console.log(this.$router.options.routes)
// this.$router.options.routes
+ localStorage.removeItem('curTreatIds')
if (this.$router && this.$router.options && this.$router.options.routes) {
this.$router.options.routes.forEach((o) => {
if (o.name === 'roomDetail') {
@@ -159,6 +193,12 @@
}
</style>
<style scoped>
+.page_header .left {
+ min-width: 300px;
+}
+.page_date {
+ margin-left: 0;
+}
/* .page_container {
overflow: hidden;
} */
@@ -184,6 +224,7 @@
margin-bottom: 20px;
}
.list_block .list .list__item {
+ cursor: pointer;
padding: 40px 30px;
border-radius: 100px;
background-color: rgba(229,238,253,1);
@@ -208,4 +249,23 @@
text-align: center;
font-family: Roboto;
}
+.select_shop_block {
+ cursor: pointer;
+}
+.select_shop_block .tx {
+ line-height: 50px;
+ color: rgba(255,255,255,1);
+ font-size: 36px;
+ text-align: center;
+ font-family: PingFangSC-regular;
+}
+.select_shop_block .icon_block {
+ width: 30px;
+ height: 30px;
+ display: block;
+}
+.select_shop_block .icon_block .icon {
+ width: 100%;
+ height: 100%;
+}
</style>
--
Gitblit v1.8.0