Commit b750907a authored by Xuguangxing's avatar Xuguangxing

style fix

parent fa022b73
...@@ -191,6 +191,7 @@ export default { ...@@ -191,6 +191,7 @@ export default {
} }
} }
.confirm-order-btn { .confirm-order-btn {
outline: none;
width: 130px !important; width: 130px !important;
margin-right: 10px !important; margin-right: 10px !important;
} }
......
<template> <template>
<div class="success-info"> <div class="success-info">
<p class="desc"> <p class="desc">
已有<span>{{ groupInfo.groupBuySuccessPersonCount || 0 }}</span>拼团成功 已有<span>{{ groupInfo.groupBuySuccessPersonCount || 0 }}</span>参与拼团
</p> </p>
<avator-swiper :avator-data="avatorData" /> <avator-swiper :avator-data="avatorData" />
</div> </div>
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<p style="font-size: 34px;margin-bottom: 15px;"> <p style="font-size: 34px;margin-bottom: 15px;">
已有<span>{{ sharePicData.groupBuySuccessGuys }}人</span> 已有<span>{{ sharePicData.groupBuySuccessGuys }}人</span>
</p> </p>
<p>拼团成功</p> <p>参与拼团</p>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -80,14 +80,14 @@ export default { ...@@ -80,14 +80,14 @@ export default {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
height: 30px; height: 30px;
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.4);
border-radius: 15px; border-radius: 15px;
padding: @padding-unit; padding: @padding-unit;
&-icon { &-icon {
flex-shrink: 0; flex-shrink: 0;
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-right: @padding-unit + 2; margin-right: @padding-unit;
.avatar { .avatar {
/deep/ img { /deep/ img {
border-radius: 50%; border-radius: 50%;
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
} }
} }
&-info { &-info {
text-align: center;
flex-shrink: 0; flex-shrink: 0;
padding-right: @padding-x; padding-right: @padding-x;
.text-12(); .text-12();
......
...@@ -135,11 +135,16 @@ export default { ...@@ -135,11 +135,16 @@ export default {
width: 100%; width: 100%;
background: @white; background: @white;
border-top: 2px solid #f7f7f7; border-top: 2px solid #f7f7f7;
padding: 10px 12px; padding-bottom: calc(10px + constant(safe-area-inset-bottom));
padding-bottom: calc(10px + env(safe-area-inset-bottom));
padding-top: 10px;
padding-left: 12px;
padding-right: 12px;
box-sizing: border-box; box-sizing: border-box;
z-index: 2; z-index: 2;
button { button {
flex: 1; flex: 1;
font-size: 16px;
&.mutiplie { &.mutiplie {
margin: 0 @padding-xs; margin: 0 @padding-xs;
} }
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
width: 40px; width: 40px;
height: 40px; height: 40px;
position: fixed; position: fixed;
right: 0; right: 10px;
bottom: 120px; bottom: 120px;
z-index: 3; z-index: 3;
/deep/ img { /deep/ img {
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
} }
&-container { &-container {
padding-bottom: 60px; padding-bottom: calc(60px + env(safe-area-inset-bottom));
box-sizing: border-box; box-sizing: border-box;
font-size: 16px; font-size: 16px;
&-lose { &-lose {
......
...@@ -344,16 +344,18 @@ export default { ...@@ -344,16 +344,18 @@ export default {
// 校验是否允许开团或者参团 // 校验是否允许开团或者参团
this.$dialog({ this.$dialog({
message: checkStatus.failedReason || '', message: checkStatus.failedReason || '',
showCancelButton: false, cancelButtonText: '知道了',
confirmButtonText: '查看其他商品', showConfirmButton: false,
onConfirm: () => { cancelButtonColor: '#ec1500'
this.$router.replace({ // confirmButtonText: '返回活动',
path: '/groupBuy/list', // onConfirm: () => {
query: { // this.$router.replace({
activityId: this.detailParam.activityId // path: '/groupBuy/list',
} // query: {
}); // activityId: this.detailParam.activityId
} // }
// });
// }
}); });
return; return;
} }
......
...@@ -36,12 +36,7 @@ ...@@ -36,12 +36,7 @@
<FeeInfo :calc-fee-info="orderInfo.calcFeeInfo" /> <FeeInfo :calc-fee-info="orderInfo.calcFeeInfo" />
</template> </template>
<!-- 底部 --> <!-- 底部 -->
<bottom-nav <bottom-nav type="submitOrder" :info="orderInfo.calcFeeInfo" @buy="handleBuy" />
v-if="orderInfo.shopSkuList.length && !isPrimordialBrowser && !isWeixinBrowser"
type="submitOrder"
:info="orderInfo.calcFeeInfo"
@buy="handleBuy"
/>
</div> </div>
</template> </template>
......
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