diff --git a/components/b-rx-commodity-item/b-rx-commodity-item.vue b/components/b-rx-commodity-item/b-rx-commodity-item.vue
index 04ea596..57ae944 100644
--- a/components/b-rx-commodity-item/b-rx-commodity-item.vue
+++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue
@@ -45,8 +45,14 @@
￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}
- ￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
- (+{{item['add_price']}})
+
+ ￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}
+ (+{{item['add_price']}})
+
+
+ ￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
+ (+{{item['add_price']}})
+
@@ -88,7 +94,7 @@
height: 120rpx;
min-width: 120rpx;
min-height: 120rpx;
-
+ margin-right: 20rpx;
.img {
width: 100%;
height: 100%;
@@ -99,13 +105,12 @@
&-infor {
display: flex;
flex-direction: column;
- justify-content: space-between;
- padding-left: 22rpx;
-
+ justify-content: space-between;
+ width: 300rpx;
&-name {
font-size: $FONTSIZE30;
- max-width: 336rpx;
- min-width: 336rpx;
+ max-width: 300rpx;
+ min-width: 300rpx;
word-break: break-all;
display: -webkit-box;
-webkit-line-clamp: 1;
@@ -115,14 +120,21 @@
&-sku {
color: #999999;
- font-size: $FONTSIZE22;
+ font-size: $FONTSIZE22;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
}
&-money {
// max-width: 115rpx;
// min-width: 115rpx;
text-align: center;
-
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
&-yang {
font-size: $FONTSIZE22;
}
@@ -138,8 +150,9 @@
}
.quantity {
- // display: flex;
- // justify-content: space-between;
+ flex: 1;
+ display: flex;
+ justify-content: space-between;
font-size: 30rpx;
color: #3A6FE7;
.num {
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 5d0cfa4..96130dd 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -69,28 +69,29 @@
共{{shoptotalnum }}件
余额：￥{{ _amount(amount)}}
-->
-
- 应付
- ￥{{ YingPrice }}
-
-
-
-
-
-
- 余额：
- (￥{{ computedTotal.broker_balance }} )
-
-
+
+
+ 应付
+ ￥{{ YingPrice }}
-
-
-
-
- 抵用券
- (￥{{ computedTotal.coin_balance }} )
+
+
+
+
+ 余额：
+ (￥{{ computedTotal.broker_balance }} )
+
+
+
+
+
+
+
+ 抵用券
+ (￥{{ computedTotal.coin_balance }} )
+
+
-
@@ -347,6 +348,9 @@
// 修改数据格式
item['pay_price'] = item['product_price'];
+ // 星巴克计算补贴
+ item['bt_price'] = item['bt_price'];
+
products.push(item);
this['shoptotalnum'] += item['num'];
};
@@ -771,7 +775,6 @@
.Commodity-Item {
// margin-bottom: 20rpx;
padding: 32rpx 0;
-
// 抵扣区域样式
.discount {
display: flex;
@@ -780,9 +783,9 @@
.Checkbox {
margin-right: 20rpx;
- width: 24rpx;
- height: 24rpx;
- border: 1rpx solid #D3D6DB;
+ width: 30rpx;
+ height: 30rpx;
+ border: 2rpx solid #D3D6DB;
border-radius: 50%;
overflow: hidden;
}
@@ -795,8 +798,8 @@
&::after {
content: '';
position: absolute;
- width: 12rpx;
- height: 12rpx;
+ width: 18rpx;
+ height: 18rpx;
border-radius: 50%;
border: 3rpx solid #ffffff;
background-color: var(--aftercolor);
@@ -822,7 +825,8 @@
// 商品数量/余额
.Commodity {
color: #333333;
- font-size: 28rpx;
+ font-size: 30rpx;
+ font-weight: bold;
display: flex;
justify-content: space-between;
align-items: center;
@@ -840,7 +844,8 @@
flex-direction: row;
display: flex;
position: fixed;
- bottom: 0;
+ bottom: 0;
+ font-size: 30rpx !important;
left: 0;
z-index: 10;
padding: 20rpx 10rpx;
@@ -858,36 +863,35 @@
width: 211rpx;
height: 40rpx;
overflow-wrap: break-word;
- font-size: 0rpx;
font-family: PingFangSC-Semibold;
text-align: left;
white-space: nowrap;
line-height: $FONTSIZE28;
}
.itemamount{
- margin-bottom: 8rpx;
+ margin-bottom: 10rpx;
}
.text_24 {
width: 211rpx;
height: 27rpx;
color: rgba(51, 51, 51, 1);
- font-size: $FONTSIZE28;
+ font-size: $FONTSIZE30;
font-family: PingFangSC-Semibold;
text-align: left;
white-space: nowrap;
- line-height: $FONTSIZE28;
+ line-height: $FONTSIZE30;
}
.text_25 {
width: 211rpx;
height: 27rpx;
color: #00AF66;
- font-size: $FONTSIZE28;
+ font-size: $FONTSIZE30;
font-family: PingFangSC-Semibold;
text-align: left;
white-space: nowrap;
- line-height: $FONTSIZE28;
+ line-height: $FONTSIZE30;
}
.text_26 {