Skip to content

M
mallapp
Commit d381f2fc authored by Mac's avatar Mac
Browse files
Options

1

parent b628eb19
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
components/goods/style1.vue
View file @ d381f2fc
...@@ -45,13 +45,16 @@ ...@@ -45,13 +45,16 @@
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}` :custom-style="{
" 'backgroundColor':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ?'#FFF' : goodsInfo.buttonColor ,
'color':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
}"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
> >
{{ goodsInfo.buyBtnText }} {{ goodsInfo.buyBtnText }}
</u-button> </u-button>
</span> </span>
...@@ -163,7 +166,7 @@ export default { ...@@ -163,7 +166,7 @@ export default {
flex: 1; flex: 1;
} }
.good-one .good-info .good-price-info .buy { .good-one .good-info .good-price-info .buy {
width: 24px; /* width: 24px; */
text-align: right; text-align: right;
} }
</style> </style>
components/goods/style2.vue
View file @ d381f2fc
...@@ -43,11 +43,10 @@ ...@@ -43,11 +43,10 @@
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style=" :custom-style="{
`backgroundColor:${goodsInfo.buttonColor},color:${ 'backgroundColor':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ?'#FFF' : goodsInfo.buttonColor ,
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF' 'color':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
}` }"
"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else v-else
...@@ -183,7 +182,7 @@ export default { ...@@ -183,7 +182,7 @@ export default {
font-size: 14px; font-size: 14px;
} }
.good-two .good-info .good-price-info .buy { .good-two .good-info .good-price-info .buy {
width: 24px; /* width: 24px; */
text-align: right; text-align: right;
} }
</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