Commit e0b094a1 authored by 冯伟's avatar 冯伟

Merge branch 'feature/20190730-some-bug' into test

parents c1e2b343 1f15347b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="scan-order-tips" @touchmove.native.stop="noop"> <view class="scan-order-tips" @touchmove.native.stop="noop">
<view class="content"> <view class="content">
<view class="close" @click.native.stop="close"></view> <view class="close" @click.native.stop="close"></view>
<view class="title">您可能正在{{tableNo}}点餐,是否继续?</view> <view class="title">您可能正在{{ tableNo }}点餐,是否继续?</view>
<view class="button-group"> <view class="button-group">
<view class="btn cancel" @click.native.stop="close"></view> <view class="btn cancel" @click.native.stop="close"></view>
<view class="btn confirm" @click.native.stop="confirm"></view> <view class="btn confirm" @click.native.stop="confirm"></view>
...@@ -12,103 +12,102 @@ ...@@ -12,103 +12,102 @@
</template> </template>
<script> <script>
export default {
export default { props: {
props: { tableNo: {
tableNo: { type: String,
type: String, default: '',
default: '' },
} },
data() {
return {}
},
methods: {
close() {
this.$emit('close')
}, },
data() { //点击前往查看
return {} confirm() {
}, this.$emit('confirm')
methods: { },
close() { noop() {},
this.$emit('close') },
}, }
//点击前往查看
confirm() {
this.$emit('confirm')
},
noop() {}
}
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '@/styles/reset.components.scss'; @import '@/styles/reset.components.scss';
@import '@/styles/util.scss'; @import '@/styles/util.scss';
.component-scan-order-tips { .scan-order-tips {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 1001;
.content {
width: 650rpx;
background-color: rgba(0, 0, 0, 0.7);
border-radius: 10rpx;
position: absolute; position: absolute;
top: 0; top: 50%;
left: 0; left: 50rpx;
right: 0; transform: translateY(-50%);
bottom: 0; box-sizing: border-box;
z-index: 1001; padding: 60rpx 0;
.content { .close {
width: 650rpx; background-image: url(https://img-shop.qmimg.cn/s16/images/2019/07/11/06ba913878cecbe0.png);
background-color: rgba(0, 0, 0, 0.7); background-size: 22rpx 22rpx;
border-radius: 10rpx; background-repeat: no-repeat;
background-position: center center;
position: absolute; position: absolute;
top: 50%; right: 0;
left: 50rpx; top: 0;
transform:translateY(-50%); width: 55rpx;
box-sizing: border-box; height: 55rpx;
padding: 60rpx 0; }
.close { .title {
background-image: url(https://img-shop.qmimg.cn/s16/images/2019/07/11/06ba913878cecbe0.png); padding: 0 60rpx;
background-size: 22rpx 22rpx; font-size: 34rpx;
background-repeat: no-repeat; color: #fff;
background-position: center center; text-align: center;
position: absolute; margin-bottom: 50rpx;
right: 0; }
top: 0; .button-group {
width: 55rpx; display: flex;
height: 55rpx; justify-content: space-between;
} padding: 0 110rpx;
.title{ .btn {
padding: 0 60rpx; width: 200rpx;
height: 76rpx;
position: relative;
text-align: center;
font-size: 34rpx; font-size: 34rpx;
line-height: 76rpx;
color: #fff; color: #fff;
text-align: center; &.cancel {
margin-bottom: 50rpx; &::after {
} content: '';
.button-group { position: absolute;
display: flex; left: 0;
justify-content: space-between; top: 0;
padding: 0 110rpx; right: 0;
.btn{ bottom: 0;
width: 200rpx; width: 400rpx;
height: 76rpx; height: 152rpx;
position: relative; transform-origin: left top;
text-align: center; transform: scale(0.5);
font-size: 34rpx; border: 1rpx solid #e5e5e5;
line-height: 76rpx; border-radius: 12rpx;
color: #fff;
&.cancel{
&::after{
content: '';
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
width: 400rpx;
height: 152rpx;
transform-origin: left top;
transform: scale(0.5);
border: 1rpx solid #e5e5e5;
border-radius: 12rpx;
}
}
&.confirm{
background-color: rgba(255, 255, 255, 0.3);
border-radius: 6rpx;
} }
} }
&.confirm {
background-color: rgba(255, 255, 255, 0.3);
border-radius: 6rpx;
}
} }
} }
} }
}
</style> </style>
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