|
|
|
@ -10,7 +10,7 @@ |
|
|
|
@click="addAddressTap" |
|
|
|
> |
|
|
|
<image |
|
|
|
src="https://ceres.zkthink.com/static/images/orderAddress.png" |
|
|
|
src="https://wechat.hnthee.com/ceres-local-file/image/address_select.png" |
|
|
|
class="address-img" |
|
|
|
></image> |
|
|
|
<!-- 有地址的 --> |
|
|
|
@ -34,7 +34,7 @@ |
|
|
|
<text>你还没有收货地址哦，点击这里添加</text> |
|
|
|
</view> |
|
|
|
<image |
|
|
|
src="https://ceres.zkthink.com/static/images/greyArrow.png" |
|
|
|
src="https://wechat.hnthee.com/ceres-local-file/image/address_foward.png" |
|
|
|
class="arrow-right-img" |
|
|
|
></image> |
|
|
|
</view> |
|
|
|
@ -47,7 +47,7 @@ |
|
|
|
<view class="order-list-top"> |
|
|
|
<view class="top-l"> |
|
|
|
<image |
|
|
|
src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" |
|
|
|
src="https://wechat.hnthee.com/ceres-local-file/image/cart_shop.png" |
|
|
|
class="shop-img" |
|
|
|
> |
|
|
|
</image> |
|
|
|
@ -90,9 +90,9 @@ |
|
|
|
<view> |
|
|
|
<view class="item"> |
|
|
|
<view class="flex-items"> |
|
|
|
<text>配送方式</text> |
|
|
|
<text class="fs26 font-color-252744">配送方式</text> |
|
|
|
</view> |
|
|
|
<view class="flex-row-plus flex-items"> |
|
|
|
<view class="flex-row-plus flex-items fs26 font-color-252744"> |
|
|
|
<text v-if="item.distribution.distributionPrice > 0">{{$t('common.express')}} ¥ |
|
|
|
{{ item.distribution.distributionPrice }} |
|
|
|
</text> |
|
|
|
@ -130,7 +130,7 @@ |
|
|
|
</view> |
|
|
|
<image |
|
|
|
class="discount-img" |
|
|
|
src="https://ceres.zkthink.com/static/images/arrowRight.png" |
|
|
|
src="https://wechat.hnthee.com/ceres-local-file/image/address_foward.png" |
|
|
|
></image> |
|
|
|
</view> |
|
|
|
<!-- <view class="discount-info-box flex-items" v-else>--> |
|
|
|
@ -184,26 +184,26 @@ |
|
|
|
</view> |
|
|
|
<image |
|
|
|
class="discount-img" |
|
|
|
src="https://ceres.zkthink.com/static/images/arrowRight.png" |
|
|
|
src="https://wechat.hnthee.com/ceres-local-file/image/address_foward.png" |
|
|
|
></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- 积分支付--> |
|
|
|
<!-- 积分支付--> |
|
|
|
<view |
|
|
|
class="integralPayBox" |
|
|
|
v-if="integralShow" |
|
|
|
> |
|
|
|
<view class="integralBg"> |
|
|
|
<view class="integralTit fs26">可用{{ integralNum }}积分抵扣{{ integralPrice.toFixed(2) }}元</view> |
|
|
|
<view class="fs28 font-color-252744">可用{{ integralNum }}积分抵扣{{ integralPrice.toFixed(2) }}元</view> |
|
|
|
<view class="maxIntegral"> |
|
|
|
<checkbox-group |
|
|
|
@change="changeIntegral" |
|
|
|
style="width: 50rpx" |
|
|
|
> |
|
|
|
<checkbox |
|
|
|
style="transform:scale(0.7);" |
|
|
|
style="transform:scale(0.9);" |
|
|
|
class="integralCheckbox" |
|
|
|
color="#C5AA7B" |
|
|
|
color="#252744" |
|
|
|
value="1" |
|
|
|
:checked="selectIntegral" |
|
|
|
/> |
|
|
|
@ -236,12 +236,12 @@ |
|
|
|
<text class="total">合计：</text> |
|
|
|
<text |
|
|
|
v-if="totalPrice>0" |
|
|
|
class="price" |
|
|
|
class="bottom-total-price" |
|
|
|
>¥{{ totalPrice.toFixed(2) }} |
|
|
|
</text> |
|
|
|
<text |
|
|
|
v-else |
|
|
|
class="price" |
|
|
|
class="bottom-total-price" |
|
|
|
>¥0.00 |
|
|
|
</text> |
|
|
|
</view> |
|
|
|
@ -1330,7 +1330,7 @@ export default { |
|
|
|
|
|
|
|
<style lang="scss"> |
|
|
|
page { |
|
|
|
background-color: #F7F7F7; |
|
|
|
background-color: #FAFAFA; |
|
|
|
} |
|
|
|
|
|
|
|
.content { |
|
|
|
@ -1340,8 +1340,8 @@ page { |
|
|
|
|
|
|
|
.address-box { |
|
|
|
margin-top: 20upx; |
|
|
|
background: #fff; |
|
|
|
border-radius: 10upx; |
|
|
|
background-color: #FFFFFF; |
|
|
|
border-radius: 30upx; |
|
|
|
width: 100%; |
|
|
|
padding: 30upx; |
|
|
|
box-sizing: border-box; |
|
|
|
@ -1352,8 +1352,8 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.address-box .address-img { |
|
|
|
width: 71upx; |
|
|
|
height: 57upx; |
|
|
|
width: 42rpx; |
|
|
|
height: 45rpx; |
|
|
|
margin-right: 20upx; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1361,19 +1361,19 @@ page { |
|
|
|
flex: 1; |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
font-size: 28upx; |
|
|
|
color: #333; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.arrow-right-img { |
|
|
|
width: 62upx; |
|
|
|
height: 62upx; |
|
|
|
width: 16rpx; |
|
|
|
height: 28rpx; |
|
|
|
margin-left: 20upx; |
|
|
|
} |
|
|
|
|
|
|
|
.address-name-box { |
|
|
|
font-size: 30upx; |
|
|
|
color: #333; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.phone { |
|
|
|
@ -1383,15 +1383,20 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.address-info { |
|
|
|
font-size: 28upx; |
|
|
|
color: #333; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
margin-top: 15upx; |
|
|
|
} |
|
|
|
|
|
|
|
.order-list-box .item { |
|
|
|
background: #fff; |
|
|
|
border-radius: 10upx; |
|
|
|
.order-list-box{ |
|
|
|
border-radius: 30upx; |
|
|
|
background-color: #FFFFFF; |
|
|
|
} |
|
|
|
/* |
|
|
|
.order-list-box .item { |
|
|
|
border-radius: 30upx; |
|
|
|
background-color: #FFFFFF; |
|
|
|
}*/ |
|
|
|
|
|
|
|
.order-list-top { |
|
|
|
height: 96upx; |
|
|
|
@ -1411,15 +1416,15 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.shop-img { |
|
|
|
width: 34upx; |
|
|
|
height: 34upx; |
|
|
|
width: 36rpx; |
|
|
|
height: 32rpx; |
|
|
|
margin-right: 10upx; |
|
|
|
} |
|
|
|
|
|
|
|
.shop-name { |
|
|
|
font-size: 30upx; |
|
|
|
color: #333; |
|
|
|
font-weight: bold; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
font-weight: 400; |
|
|
|
} |
|
|
|
|
|
|
|
.arrow-img { |
|
|
|
@ -1440,10 +1445,10 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.product-img { |
|
|
|
width: 180upx; |
|
|
|
height: 180upx; |
|
|
|
border-radius: 10upx; |
|
|
|
margin-right: 30upx; |
|
|
|
width: 152rpx; |
|
|
|
height: 152rpx; |
|
|
|
border-radius: 30upx; |
|
|
|
margin-right: 12upx; |
|
|
|
} |
|
|
|
|
|
|
|
.info-box { |
|
|
|
@ -1451,10 +1456,8 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.product-name { |
|
|
|
font-size: 26upx; |
|
|
|
color: #333; |
|
|
|
height: 68upx; |
|
|
|
line-height: 34upx; |
|
|
|
font-size: 26rpx; |
|
|
|
color: #252744; |
|
|
|
display: -webkit-box; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
@ -1471,28 +1474,30 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.product-sku { |
|
|
|
font-size: 24upx; |
|
|
|
font-weight: 500; |
|
|
|
color: #999; |
|
|
|
font-size: 24rpx; |
|
|
|
font-weight: 400; |
|
|
|
color: #90919C; |
|
|
|
margin-left: -20upx; |
|
|
|
margin-top: 5rpx; |
|
|
|
width: 100%; |
|
|
|
display: flex; |
|
|
|
flex-direction: row; |
|
|
|
} |
|
|
|
|
|
|
|
.product-price { |
|
|
|
font-size: 32upx; |
|
|
|
color: #C83732; |
|
|
|
font-size: 28rpx; |
|
|
|
margin-top: 26rpx; |
|
|
|
color: #90919C; |
|
|
|
font-weight: 400; |
|
|
|
} |
|
|
|
|
|
|
|
.product-price .fuhao { |
|
|
|
font-size: 28upx; |
|
|
|
font-size: 28rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.product-num { |
|
|
|
font-size: 28upx; |
|
|
|
color: #999; |
|
|
|
font-size: 24rpx; |
|
|
|
color: #90919C; |
|
|
|
font-weight: 400; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1504,7 +1509,8 @@ page { |
|
|
|
.delivery-way-box { |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
border: 2rpx solid #E4E5E6; |
|
|
|
border: 1px solid #BCBDC6; |
|
|
|
border-radius: 20rpx; |
|
|
|
padding: 20rpx; |
|
|
|
margin-bottom: 20rpx; |
|
|
|
box-sizing: content-box; |
|
|
|
@ -1539,13 +1545,13 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.total-num { |
|
|
|
font-size: 26upx; |
|
|
|
color: #333; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.total-price { |
|
|
|
font-size: 46rpx; |
|
|
|
color: #333333; |
|
|
|
font-size: 36rpx; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.ml10 { |
|
|
|
@ -1555,11 +1561,12 @@ page { |
|
|
|
.order-flow-box { |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
margin-top: 40rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.flow-word { |
|
|
|
font-size: 24upx; |
|
|
|
color: #999; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
} |
|
|
|
@ -1579,42 +1586,49 @@ page { |
|
|
|
left: 0; |
|
|
|
width: 100%; |
|
|
|
background: #fff; |
|
|
|
border-radius: 40rpx; |
|
|
|
padding: 30upx; |
|
|
|
} |
|
|
|
|
|
|
|
.num-box { |
|
|
|
font-size: 30upx; |
|
|
|
color: #999; |
|
|
|
font-size: 32rpx; |
|
|
|
color: #90919C; |
|
|
|
} |
|
|
|
|
|
|
|
.num-box .total { |
|
|
|
color: #333; |
|
|
|
.total { |
|
|
|
font-size: 32rpx; |
|
|
|
color: #252744; |
|
|
|
font-weight: 400rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.num-box .price { |
|
|
|
color: #ff7911; |
|
|
|
font-weight: bold; |
|
|
|
.bottom-total-price { |
|
|
|
font-size: 32rpx; |
|
|
|
color: #252744; |
|
|
|
font-weight: 400rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.order-confirm-box .btn { |
|
|
|
width: 100%; |
|
|
|
height: 80rpx; |
|
|
|
line-height: 80rpx; |
|
|
|
height: 88rpx; |
|
|
|
line-height: 88rpx; |
|
|
|
background: #eee; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #FFEBC4; |
|
|
|
text-align: center; |
|
|
|
margin-top: 20rpx; |
|
|
|
border-radius: 50rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.order-confirm-box .btn.active { |
|
|
|
background: #333333; |
|
|
|
color: #FFEBC4; |
|
|
|
background: #252744; |
|
|
|
color: #FFFFFF; |
|
|
|
border-radius: 50rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.order-confirm-box .btn.unActive { |
|
|
|
background: #333333; |
|
|
|
color: #FFEBC4; |
|
|
|
background: #252744; |
|
|
|
color: #FFFFFF; |
|
|
|
border-radius: 50rpx; |
|
|
|
opacity: 0.7; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1641,6 +1655,7 @@ page { |
|
|
|
justify-content: space-between; |
|
|
|
padding: 0 20upx; |
|
|
|
background: white; |
|
|
|
border-radius: 30rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-type-item { |
|
|
|
@ -1771,17 +1786,17 @@ page { |
|
|
|
|
|
|
|
.discount-label, |
|
|
|
.discount-info1 { |
|
|
|
font-size: 26upx; |
|
|
|
color: #333; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.discount-info2 { |
|
|
|
color: #C5AA7B; |
|
|
|
color: #252744; |
|
|
|
} |
|
|
|
|
|
|
|
.discount-img { |
|
|
|
width: 30upx; |
|
|
|
height: 30upx; |
|
|
|
width: 16rpx; |
|
|
|
height: 28rpx; |
|
|
|
margin-left: 20upx; |
|
|
|
} |
|
|
|
|
|
|
|
@ -2005,7 +2020,7 @@ page { |
|
|
|
height: 291rpx; |
|
|
|
background: url("https://ceres.zkthink.com/static/images/couponsIcon.png") no-repeat center top; |
|
|
|
margin-top: 20upx; |
|
|
|
color: #C5AA7B; |
|
|
|
color: #252744; |
|
|
|
flex-shrink: 0; |
|
|
|
text-align: center; |
|
|
|
padding-top: 1rpx; |
|
|
|
@ -2032,6 +2047,7 @@ page { |
|
|
|
align-items: center; |
|
|
|
background: #FFFFFF; |
|
|
|
padding: 0 20rpx; |
|
|
|
border-radius: 30rpx; |
|
|
|
|
|
|
|
.maxDeduction { |
|
|
|
margin-right: 15rpx; |
|
|
|
@ -2041,8 +2057,8 @@ page { |
|
|
|
</style> |
|
|
|
<style> |
|
|
|
.pay-type-item /deep/ .uni-radio-input-checked { |
|
|
|
background-color: #C5AA7B !important; |
|
|
|
border-color: #C5AA7B !important; |
|
|
|
background-color: #252744 !important; |
|
|
|
border-color: #252744 !important; |
|
|
|
} |
|
|
|
|
|
|
|
.maxIntegral /deep/ .uni-checkbox-input { |
|
|
|
@ -2055,6 +2071,6 @@ page { |
|
|
|
} |
|
|
|
|
|
|
|
.maxIntegral /deep/ .uni-checkbox-input-checked { |
|
|
|
border: 2rpx solid #C5AA7B !important; |
|
|
|
border: 2rpx solid #252744 !important; |
|
|
|
} |
|
|
|
</style> |
dy-hu
10 months ago