Commit 7194b290 authored by 毛线's avatar 毛线

test

parent f936aefc
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<img v-audio src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Full%20Screen%20Button.png" alt=""> <img v-audio src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Full%20Screen%20Button.png" alt="">
</div> </div>
</div> </div>
<img src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Rectangle.png" style="height: 30px; width: 100%; margin: 70px -10px;" alt=""> <img src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Rectangle.png" style="height: 30px; width: 100%; margin: 70px -10px; pointer-events: none;" alt="">
<Confirm ref="confirm" title="登出" message="您要登出当前账号吗?" @confirm="() => network().quitAccount()"/> <Confirm ref="confirm" title="登出" message="您要登出当前账号吗?" @confirm="() => network().quitAccount()"/>
<Confirm <Confirm
ref="outGame" ref="outGame"
......
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
this.list = list this.list = list
setTimeout(() => { setTimeout(() => {
this.network().jackpot() this.network().jackpot()
}, 1000) }, 2000)
}) })
}, },
} }
......
...@@ -203,7 +203,7 @@ export default { ...@@ -203,7 +203,7 @@ export default {
top: -4px; top: -4px;
width: 38px; width: 38px;
z-index: 10; z-index: 10;
z-index: 3; z-index: 100;
} }
.content { .content {
display: flex; display: flex;
......
...@@ -140,6 +140,7 @@ export default { ...@@ -140,6 +140,7 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative;
.dialog-content { .dialog-content {
background-color: #003649; background-color: #003649;
background-image: linear-gradient(#004156, #00212e); background-image: linear-gradient(#004156, #00212e);
......
...@@ -14,7 +14,8 @@ export default { ...@@ -14,7 +14,8 @@ export default {
title: process.env.project_name || '', title: process.env.project_name || '',
meta: [ meta: [
{ charset: 'utf-8' }, { charset: 'utf-8' },
{ name: 'viewport', content: 'width=device-width, initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no' }, // { name: 'viewport', content: 'width=device-width, initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no' },
{ name: 'viewport', content: 'user-scalable=no' },
{ hid: 'description', name: 'description', content: process.env.project_description || '' } { hid: 'description', name: 'description', content: process.env.project_description || '' }
], ],
link: [ link: [
......
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
<!-- 右侧菜单 --> <!-- 右侧菜单 -->
<Menu /> <Menu />
<!-- 个人中心弹窗 --> <!-- 个人中心弹窗 -->
<UserDialog ref="userDialog"/> <!-- <div style="position: relative; z-index: 10;">
<UserDialog ref="userDialog" />
</div> -->
<UserDialog ref="userDialog" />
<JackpotDialog ref="jackpotDialog" :data="jackpotData" /> <JackpotDialog ref="jackpotDialog" :data="jackpotData" />
</div> </div>
</template> </template>
...@@ -265,5 +268,7 @@ export default { ...@@ -265,5 +268,7 @@ export default {
.main-content { .main-content {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
position: relative;
z-index: 1;
} }
</style> </style>
<template> <template>
<div class="layout"> <div class="layout">
<div class="bg">
<img src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/bg_01.jpg" alt="">
</div>
<div class="device-list" style="height: 350px; padding-top: 30px;"> <div class="device-list" style="height: 350px; padding-top: 30px;">
<div v-for="(item, index) in topDeviceList" :key="index" class="device"> <div v-for="(item, index) in topDeviceList" :key="index" class="device">
<Device :data="item" :header="headerType[index]"/> <Device :data="item" :header="headerType[index]"/>
...@@ -108,11 +111,22 @@ export default { ...@@ -108,11 +111,22 @@ export default {
} }
.layout { .layout {
color: white; color: white;
background-image: url(https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/bg_01.jpg); /* background-image: url(https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/bg_01.jpg); */
background-size: 100%; background-size: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
overflow: auto; overflow: auto;
height: 100%; height: 100%;
position: relative;
z-index: 1;
.bg {
position: fixed;
z-index: -1;
margin-top: -40px;
display: none;
img {
width: 100%;
}
}
.device-list { .device-list {
/* float: left; */ /* float: left; */
padding: 0 30px; padding: 0 30px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment