Merge branch 'xio_dev'

jazz

2023-12-27 6283f47d248818ef9fa64e4d65f27a343b54bdd2

 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：年月日，timeMin：时分，time：时分秒，timeStamp：时间戳
    }
@@ -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)
        })
      })
    },
    // 获取列表
@@ -160,6 +193,12 @@
}
</style>
<style scoped>
.page_header .left {
  min-width: 300px;
}
.page_date {
  margin-left: 0;
}
/* .page_container {
  overflow: hidden;
} */
@@ -185,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);
@@ -209,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>