Authored by ccbikai

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -97,7 +97,7 @@ $white: #fff;
.goods-detail {
flex: 1;
margin: 0 20px;
margin: 0 24px;
font-size: 24px;
span {
... ... @@ -118,6 +118,7 @@ $white: #fff;
.size {
color: #b0b0b0;
margin: 20px 0;
}
}
... ... @@ -129,7 +130,7 @@ $white: #fff;
}
p:last-of-type {
font-size: 30px;
font-size: 20px;
color: #b0b0b0;
}
}
... ...
... ... @@ -30,7 +30,7 @@
</div>
</div>
<div class="order-option">
<div class="goods-total">合计: <b>&yen;{{order.amount}}</b></div>
<div class="goods-total">合计 <b>&yen;{{order.amount}}</b></div>
<div class="options">
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<template v-else>
... ... @@ -256,7 +256,7 @@
amount: order.amount
});
},
dropDown(elementId){
dropDown(elementId) {
let dropdown = document.getElementById(elementId);
this.showDropdown(dropdown);
... ...