theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2020.08.10

Browse Source
This commit is contained in:
Niujiawei 2020-08-11 21:18:34 +08:00
parent 9a9276fc94
commit 21d3201c4b
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/mine/order-item/index.vue
View File

@ -13,7 +13,7 @@
<view class="goods-text"> <view class="goods-text">
<view class="goods-name u-line-2">{{ goods.goods_name }}</view> <view class="goods-name u-line-2">{{ goods.goods_name }}</view>
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec"> <view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text> <text v-for="(spec, index) in goods.goods_spec" :key="index" class="goods-sku-text">{{ spec + ';' }}</text>
</view> </view>
<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view> <view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view> <view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
@ -173,11 +173,22 @@ export default {
.goods-sku { .goods-sku {
display: inline-block; display: inline-block;
max-width: 230rpx; max-width: 230rpx;
background: rgba(236,236,236,1); // background: rgba(236,236,236,1);
border-radius: 6rpx; border-radius: 6rpx;
padding: 10rpx 15rpx; // padding: 10rpx 15rpx;
font-size: 24rpx; font-size: 24rpx;
color: rgba(153,153,153,1); color: rgba(153,153,153,1);
.goods-sku-text:first-child{
padding: 10rpx 4rpx 10rpx 15rpx;
}
.goods-sku-text{
background: rgba(236,236,236,1);
padding: 10rpx 4rpx 10rpx 4rpx;
display: inline-block;
}
.goods-sku-text:last-child{
padding: 10rpx 15rpx 10rpx 4rpx;
}
} }
.goods-time { .goods-time {
font-size: 24rpx; font-size: 24rpx;

2
components/remaining/remaining.vue
View File

@ -311,7 +311,7 @@
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
display: block; display: block;
text-align: left; text-align: left;
margin: 80rpx auto 33rpx; margin: 33rpx auto 33rpx;
letter-spacing: 1rpx; letter-spacing: 1rpx;
text-align: justify; text-align: justify;
line-height: 36rpx; line-height: 36rpx;

16
pageB/sdetails/index.vue
View File

@ -115,6 +115,7 @@
<!-- 选择规格数量 --> <!-- 选择规格数量 -->
<u-popup v-model="showSpec" mode="bottom"> <u-popup v-model="showSpec" mode="bottom">
<scroll-view scroll-y="true" class="spec-popup"> <scroll-view scroll-y="true" class="spec-popup">
<button class="button"></button>
<view> <view>
<view class="head"> <view class="head">
<image class="image" :src="goodsInfo.goods_image"></image> <image class="image" :src="goodsInfo.goods_image"></image>
@ -949,9 +950,22 @@ export default {
} }
} }
.spec-popup { .spec-popup {
padding: 30rpx; padding:30rpx;
box-sizing: border-box; box-sizing: border-box;
max-height: 750rpx; max-height: 750rpx;
.button{
height: 30rpx;
position: fixed;
left: 0;
top: 0;
width: 100%;
z-index: 999;
background: #fff;
border: none !important;
&::after{
border: none !important;
}
}
.head{ .head{
display: flex; display: flex;
margin-bottom: 30rpx; margin-bottom: 30rpx;