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-20 18:30:09 +08:00
parent 95a2629e1b
commit 65c2e4fd18
11 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
View File

@ -740,13 +740,15 @@
// console.log(self['MealList']['sku'],'MealList').;
// return.
self.SETREPLACE(self['MealList']);
const cardFlag = this.MealList[0]?.subsidy_card_price == 0? false : true;
if( this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 5){
uni.navigateTo({
url: `/pages/restaurant/order/orders-settlement/settlement`
url: `/pages/restaurant/order/orders-settlement/settlement?cardFlag=${cardFlag}`
});
}else if(this['BrandInfor']['brand_id'] == 13 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 2){
uni.navigateTo({
url: `/pages/restaurant/order/orders-settlement/orders-settlement`
url: `/pages/restaurant/order/orders-settlement/orders-settlement?cardFlag=${cardFlag}`
});
}
return;

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

@ -94,7 +94,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">
<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>
@ -176,14 +176,14 @@
<template v-slot:default>
<view>
<view class="zero-content">
<view class="item flex" v-if="!isWx">
<view class="item flex">
<text>抵用券抵扣</text>
<text class="blod">
<text>-</text>
<text>{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}</text>
</text>
</view>
<view class="item flex">
<view class="item flex" v-if="Number(ZeroData.realSubsidy) && cardFlag">
<text>消费补贴卡抵扣</text>
<text class="blod">
<text>-</text>
@ -309,11 +309,12 @@
YingPrice: 0 ,// 应付
realPayment: 0, // 实际付款
ZeroData: {},
UserCard: {}
UserCard: {},
cardFlag: false // 消费补贴是否开启 数值不为0为开启
};
},
onLoad() {
self = this;
onLoad(e) {
this.cardFlag = e.cardFlag === "true"? true : false;
console.log(this['getPhone'],'手机号');
// 就餐类型
this['FormInfor']['eat_type'] = this['GetMODE'];

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

@ -117,10 +117,10 @@
<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">
<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="quantity">消费补贴卡：{{computedTotal}}</text>
<text lines="1" class="amount">(￥{{ UserCard.amount }} )</text>
</view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
@ -200,7 +200,7 @@
<text>{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}</text>
</text>
</view>
<view class="item flex">
<view class="item flex" v-if="Number(ZeroData.realSubsidy) && cardFlag">
<text>消费补贴卡抵扣</text>
<text class="blod">
<text>-</text>
@ -324,11 +324,12 @@
YingPrice: 0, // 应付
realPayment: 0, // 实际付款
ZeroData: {},
UserCard: {}
UserCard: {},
cardFlag: false // 消费补贴是否开启 数值不为0为开启
};
},
onLoad() {
self = this;
onLoad(e) {
this.cardFlag = e.cardFlag === "true"? true : false;
this['FormInfor']['eat_type'] = this['GetMODE'];
// 上次下单手机号
this['FormInfor']['phone_number'] = this['getPhone'];

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.ef52e3ce.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.f3af94ee.js></script></body></html>

2
unpackage/dist/build/web/static/js/index.ef52e3ce.js → unpackage/dist/build/web/static/js/index.f3af94ee.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.8f41cfb8.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-home-shop_home-shop_home.967c4a3a.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.1825c6ea.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.80516801.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.a6d869ef.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.f52d72d6.js vendored Normal file
View File

File diff suppressed because one or more lines are too long