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

updata

This commit is contained in:
whitechiina 2026-07-24 09:46:36 +08:00
parent d92b988545
commit 25fa2600e4
11 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/b-shop-infor-head/b-shop-infor-head.vue
View File

@ -181,7 +181,7 @@
// 瑞幸导航样式
.shop-top-rx {
width: 100%;
padding: 0 30rpx 30rpx 30rpx;
padding: 20rpx 30rpx 30rpx 30rpx;
&-infor {
display: flex;
align-items: center;

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

@ -85,6 +85,18 @@
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
</view>
</view> -->
<view class="Commodity Commodity-Item" style="padding-top: 0rpx; flex-direction: column; align-items: end" @click="isCard()" v-if="!isWx && cardFlag">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">消费补贴卡：</text>
<text lines="1" class="amount">({{ (Number(UserCard.amount || 0) - Number(ZeroData.realSubsidy || 0)).toFixed(2) }})</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
</view>
<view style="padding: 0rpx 0rpx; color: #EC0208; font-size: 20rpx; line-height: 50rpx" v-if="Number(UserCard.amount) == 0 || Number(ZeroData.realSubsidy) >= Number(UserCard.amount)">
*消费补贴卡余额已为零，请联系市场推广人员领取
</view>
</view>
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCoin()" v-if="!isWx">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
@ -94,19 +106,7 @@
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
</view>
</view>
<view class="Commodity Commodity-Item" style="padding-top: 0rpx; flex-direction: column; align-items: end" @click="isCard()" v-if="!isWx && cardFlag">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">消费补贴卡：</text>
<text lines="1" class="amount">({{ (Number(UserCard.amount || 0) - Number(ZeroData.realSubsidy || 0)).toFixed(2) }})</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
</view>
<view style="padding: 0rpx 0rpx; color: #EC0208; font-size: 20rpx; line-height: 50rpx" v-if="!Number(UserCard.amount) || 0">
*当前未使用消费补贴卡，请联系市场推广人员领取
</view>
</view>
<view style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx; font-size: 28rpx">
<view style="background-color: #fff; padding: 20rpx 30rpx; color: darkred; line-height: 50rpx; font-size: 28rpx">
<view>温馨提示</view>
<view>1、出餐后不支持退款，如需退款，请在出餐前联系客服；</view>
<view>2、 如遇点餐失败，1小时内自动退款；</view>
@ -740,7 +740,7 @@
background-color: rgba(255, 255, 255, 1.000000);
width: 100%;
display: flex;
padding: 32rpx;
padding: 0rpx 32rpx;
flex-direction: column;
border-radius: 15rpx;
margin-bottom: 20rpx;
@ -749,8 +749,9 @@
.text_5 {
width: 100%;
color: rgba(51, 51, 51, 1);
font-size: $FONTSIZE28;
font-size: $FONTSIZE32;
line-height: 86rpx;
font-weight: 800;
}
.commodity-item {
@ -861,7 +862,8 @@
width: 100%;
line-height: 86rpx;
color: rgba(51, 51, 51, 1);
font-size: $FONTSIZE28;
font-size: $FONTSIZE32;
font-weight: 800;
}
// 商品样式

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

@ -108,6 +108,18 @@
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
</view>
</view> -->
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCard()" v-if="!isWx && cardFlag">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">消费补贴卡：</text>
<text lines="1" class="amount">({{ (Number(UserCard.amount || 0) - Number(ZeroData.realSubsidy || 0)).toFixed(2) }})</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
</view>
<view style="padding: 0rpx 0rpx; color: #EC0208; font-size: 20rpx; line-height: 50rpx" v-if="Number(UserCard.amount) == 0 || Number(ZeroData.realSubsidy) >= Number(UserCard.amount)">
*消费补贴卡余额已为零，请联系市场推广人员领取
</view>
</view>
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCoin()" v-if="!isWx">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
@ -117,20 +129,7 @@
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
</view>
</view>
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCard()" v-if="!isWx && cardFlag">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view>
<text lines="1" class="quantity">消费补贴卡：</text>
<text lines="1" class="amount">({{ (Number(UserCard.amount || 0) - Number(ZeroData.realSubsidy || 0)).toFixed(2) }})</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
</view>
<view style="padding: 0rpx 0rpx; color: #EC0208; font-size: 20rpx; line-height: 50rpx" v-if="!Number(UserCard.amount || 0)">
*当前未使用消费补贴卡，请联系市场推广人员领取
</view>
</view>
<view style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx; font-size: 28rpx">
<view style="background-color: #fff; padding: 20rpx 30rpx; color: darkred; line-height: 50rpx; font-size: 28rpx">
<view>温馨提示</view>
<view>1、出餐后不支持退款，如需退款，请在出餐前联系客服；</view>
<view>2、 如遇点餐失败，1小时内自动退款；</view>
@ -719,15 +718,16 @@
background-color: rgba(255, 255, 255, 1.000000);
width: 100%;
display: flex;
padding: 32rpx;
padding: 0rpx 32rpx;
flex-direction: column;
}
.text_5 {
width: 100%;
color: rgba(51, 51, 51, 1);
font-size: $FONTSIZE28;
font-size: $FONTSIZE32;
line-height: 86rpx;
font-weight: 800;
}
.commodity-item {
@ -911,7 +911,8 @@
width: 100%;
line-height: 86rpx;
color: rgba(51, 51, 51, 1);
font-size: $FONTSIZE28;
font-size: $FONTSIZE32;
font-weight: 800;
border-bottom: 1rpx solid #E3E3E3;
}

2
unpackage/dist/build/web/index.html vendored
View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>在线点餐</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.c10040a9.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.eb798246.js></script></body></html>

2
unpackage/dist/build/web/static/js/index.c10040a9.js → unpackage/dist/build/web/static/js/index.eb798246.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-rx-orders-details~pages-restaurant-order-order-details-xbk-orde~6f79809c.1ed98b7e.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-rx-orders-details~pages-restaurant-order-order-details-xbk-orde~6f79809c.3d27ecff.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.1a01843c.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.d0010ef4.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.138888d0.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.68639b1d.js vendored
View File

File diff suppressed because one or more lines are too long