whitechiina
/
H5-ThreeDoorder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改星巴克下单

This commit is contained in:
whitechiina 2025-04-14 11:50:33 +08:00
parent 72443535cf
commit 1d52f29c89
2 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/b-rx-commodity-item/b-rx-commodity-item.vue
View File

@ -45,8 +45,14 @@
<view class="last">￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}</view>
</view>
<view class="num" v-else-if="!item['original_price'] && BrandInfor['brand_id'] == 10">
￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
<text v-if="item['add_price']">(+{{item['add_price']}})</text>
<view class="now">
<text>￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}</text>
<text v-if="item['add_price']">(+{{item['add_price']}})</text>
</view>
<view class="last">
<text>￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}</text>
<text v-if="item['add_price']">(+{{item['add_price']}})</text>
</view>
</view>
</view>
</view>
@ -88,7 +94,7 @@
height: 120rpx;
min-width: 120rpx;
min-height: 120rpx;
margin-right: 20rpx;
.img {
width: 100%;
height: 100%;
@ -100,12 +106,11 @@
display: flex;
flex-direction: column;
justify-content: space-between;
padding-left: 22rpx;
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;
@ -116,13 +121,20 @@
&-sku {
color: #999999;
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 {

70
pages/restaurant/order/orders-settlement/orders-settlement.vue
View File

@ -69,28 +69,29 @@
<text lines="1" class="quantity">共{{shoptotalnum }}件</text>
<text lines="1" class="amount">余额：￥{{ _amount(amount)}}</text>
</view> -->
<view class="Commodity">
<text lines="1" class="quantity">应付</text>
<text lines="1" class="amount">￥{{ YingPrice }}</text>
</view>
<!-- 新增计算抵扣逻辑 -->
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">余额：</text>
<text lines="1" class="amount">(￥{{ computedTotal.broker_balance }} )</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
<view style="border: 120rpx; overflow: hidden">
<view class="Commodity">
<text lines="1" class="quantity">应付</text>
<text lines="1" class="amount">￥{{ YingPrice }}</text>
</view>
</view>
<view class="Commodity Commodity-Item" @click="isCoin()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">抵用券</text>
<text lines="1" class="amount">(￥{{ computedTotal.coin_balance }} )</text>
<!-- 新增计算抵扣逻辑 -->
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">余额：</text>
<text lines="1" class="amount">(￥{{ computedTotal.broker_balance }} )</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
</view>
</view>
<view class="Commodity Commodity-Item" @click="isCoin()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">抵用券</text>
<text lines="1" class="amount">(￥{{ computedTotal.coin_balance }} )</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
</view>
</view>
@ -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;
@ -841,6 +845,7 @@
display: flex;
position: fixed;
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 {