2023-3-20

This commit is contained in:
2023-03-20 17:09:43 +08:00
parent c09649f5d5
commit fd201d9dc9
10 changed files with 65 additions and 47 deletions

View File

@@ -38,7 +38,7 @@
<image :src="item.productPic"></image>
<view class="right">
<text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
<!-- <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> -->
<view class="price-box">
<text class="price">{{ item.price }}</text>
<text class="number">x {{ item.quantity }}</text>
@@ -564,8 +564,8 @@
image {
flex-shrink: 0;
display: block;
width: 140upx;
height: 140upx;
width: 100upx;
height: 100upx;
border-radius: 4upx;
}
@@ -576,7 +576,7 @@
}
.title {
font-size: 30upx;
font-size: 28upx;
color: $font-color-dark;
}
@@ -588,9 +588,7 @@
.price-box {
display: flex;
align-items: center;
font-size: 32upx;
color: $font-color-dark;
padding-top: 25upx;
padding-top: 10upx;
.price {
margin-bottom: 4upx;

View File

@@ -29,10 +29,10 @@
</view>
<!-- 商品列表 -->
<view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
<image :src="item.productPic"></image>
<image style="width: 50px; height: 50px;" :src="item.productPic"></image>
<view class="right">
<text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
<!-- <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> -->
<view class="price-box">
<text class="price">{{ item.price }}</text>
<text class="number">x {{ item.quantity }}</text>
@@ -439,7 +439,7 @@ import Api from '@/common/api';
}
.title {
font-size: 30 upx;
font-size: 28 upx;
color: $font-color-dark;
}
@@ -451,8 +451,6 @@ import Api from '@/common/api';
.price-box {
display: flex;
align-items: center;
font-size: 32 upx;
color: $font-color-dark;
padding-top: 10 upx;
.price {

View File

@@ -37,7 +37,7 @@
</view> -->
<!-- 商品列表 -->
<view class="g-item" v-for="(item, index) in item1.cartPromotionItemList" :key="index">
<image :src="item.productPic"></image>
<image :src="item.productPic"></image>
<view class="right">
<text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
@@ -531,13 +531,14 @@
.g-item {
display: flex;
padding-top: 15px;
margin: 20upx 30upx;
image {
flex-shrink: 0;
display: block;
width: 140upx;
height: 140upx;
width: 100upx;
height: 100upx;
border-radius: 4upx;
}
@@ -548,7 +549,6 @@
}
.title {
margin-top: 10px;
font-size: 30upx;
color: $font-color-dark;
}

View File

@@ -35,8 +35,9 @@
<view class="right" @click="navToDetailPage(item)">
<text class="title clamp">{{ goodsItem.productName }}</text>
<view class="num_price">
<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
<text class="price">{{ goodsItem.productPrice }}</text>
<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
</view>
@@ -537,13 +538,14 @@
margin-top: 5px;
.attr-box {
flex: 1;
font-size: $font-sm + 2upx;
color: $font-color-light;
margin: 0 2upx 0 8upx;
}
.price {
flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;

View File

@@ -22,8 +22,9 @@
<view class="right">
<text class="title clamp">{{ goodsItem.productName }}</text>
<view class="num_price">
<text class="price">{{ goodsItem.productPrice }}</text>
<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
<text class="price">{{ goodsItem.productPrice }}</text>
</view>
<view style="display: flex;flex-direction: row;">
<text style="color: #c1c1c1;font-size: 13px;"
@@ -49,10 +50,11 @@
</view> -->
<view style="display: flex;flex-direction: column; margin-right: 13px;margin-bottom: 10px;">
<view class="price-box">
<!-- <view class="price-box">
<text class="num">{{ orderInfo.orderItemList.length }}</text>
件商品, 会员折扣
件商品
, 会员折扣
<text class="price">{{ orderInfo.vipAmount }}</text>
, 优惠券抵扣
<text class="price">{{ orderInfo.couponAmount }}</text>
@@ -62,13 +64,30 @@
<text class="price">{{ orderInfo.integrationAmount }}</text>
, 运费
<text class="price">{{ orderInfo.freightAmount }}</text>
<!-- <view class="yt-list-cell b-b" v-if="groupActivity">
<view class="yt-list-cell b-b" v-if="groupActivity">
<text class="cell-tit clamp">活动金额</text>
<text class="cell-tip">{{ groupActivity.price }}</text>
</view>
, 实付款
<text class="price">{{ orderInfo.payAmount }}</text>
</view> -->
<view class="price-box">
<text class="num">{{ orderInfo.orderItemList.length }}</text>
件商品
</view>
<view class="price-box">
优惠券抵扣
<text class="price">{{ orderInfo.couponAmount }}</text>
, 运费
<text class="price">{{ orderInfo.freightAmount }}</text>
, 实付款
<text class="price">{{ orderInfo.payAmount }}</text>
</view>
</view>
<view class="action-box b-t" v-if="orderInfo.status==12||orderInfo.status==3">
<button v-if="orderInfo.status == 12" class="action-btn"
@@ -442,7 +461,6 @@
.title {
font-size: $font-base + 2upx;
color: $font-color-dark;
line-height: 1;
}
.num_price {
@@ -452,13 +470,14 @@
margin-top: 5px;
.attr-box {
flex: 1;
font-size: $font-sm + 2upx;
color: $font-color-light;
margin: 0 2upx 0 8upx;
}
.price {
flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;