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-17 16:03:12 +08:00
parent f0d2f6dfca
commit dad1523bb7
12 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,14 @@
</u-badge>
</view>
<view class="price">
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
<view>
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
</view>
<view class="yuanjia">
¥{{__amount(lastPrice)}}
</view>
</view>
</view>
<view class="right" @tap="create" :class="[Shoplength > 0?'right2':'']">
@ -179,9 +184,14 @@
</u-badge>
</view>
<view class="MDL-Cart-left-price">
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
<view>
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
</view>
<view class="yuanjia">
¥{{__amount(lastPrice)}}
</view>
</view>
</view>
<view class="MDL-Cart-right theme-Union-Class-5-1" @tap="create" :class="[Shoplength > 0?'right2':'']">
@ -259,9 +269,14 @@
</u-badge>
</view>
<view class="XBK-Cart-left-price">
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
<view>
<text class="yang">￥</text>
<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
<text class="amount">{{__amount(totalPrice)}}</text>
</view>
<view class="yuanjia">
¥{{__amount(lastPrice)}}
</view>
</view>
</view>
<view class="XBK-Cart-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
@ -348,8 +363,13 @@
</u-badge>
</view>
<view class="RX-Cart-left-price">
<text class="yang">￥</text>
<text class="amount">{{__amount(totalPrice)}}</text>
<view>
<text class="yang">￥</text>
<text class="amount">{{__amount(totalPrice)}}</text>
</view>
<view class="yuanjia">
¥{{__amount(lastPrice)}}
</view>
</view>
</view>
<view class="RX-Cart-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
@ -465,7 +485,8 @@
// 购物车
MealList: [],
// 购物车合计
totalPrice: 0,
totalPrice: 0,
lastPrice: 0,
// 购物车弹框显示变量
shoppingshow: false,
// 购物车弹框距离购物车定位距离
@ -529,6 +550,7 @@
let shoparr = [];
let newArr = [];
let Price = 0;
let lastPrice = 0;
this['tabbar'].map(item => {
shoparr.push(...item['foods'])
});
@ -560,6 +582,7 @@
// 原价 + 加料价格
item['adj_pay'] = (+item['product_price']) + (+item['add_price']);
Price += item['bt_price'] * item['num'];
lastPrice += item['adj_pay'] * item['num'];
newArr.push(item);
console.log(this['GetCartList'][id],'是否规格商品');
// 此处逻辑是将同商品下的不同规格数据取出来
@ -580,6 +603,7 @@
};
_item['adj_pay'] = (+_item['product_price']) + (+_item['add_price']);
Price += _item['bt_price'] * _item['num'];
lastPrice += _item['adj_pay'] * _item['num'];
this['GetCartList'][id]['Differentskulist'][i] = _item;
};
newArr.push(...this['GetCartList'][id]['Differentskulist']);
@ -592,7 +616,8 @@
console.log(Price,'Price');
console.log(newArr, 'newArrnewArrnewArrnewArr');
this['MealList'] = newArr;
this['totalPrice'] = Price;
this['totalPrice'] = Price;
this['lastPrice'] = lastPrice;
// console.timeEnd()
console.log('结束initCategoryNum');
// if(this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 2 || this['BrandInfor']['brand_id'] == 5 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 13){
@ -798,5 +823,9 @@
font-weight: 500;
}
}
.yuanjia {
color: gray;
padding-left: 20rpx;
text-decoration: line-through;
}
</style>

1
pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
View File

@ -381,6 +381,7 @@
text-decoration: line-through;
.price {
font-size: 24rpx !important;
font-weight: 300 !important;
}
}

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

@ -125,7 +125,7 @@
<text lines="1" class="text_24">实际付款：</text>
<text lines="1" class="text_25" :style="{color:Brand()['ThemeColor']}">￥{{realPayment}}</text>
</view>
<view class="text-wrapper_4 itemamount" v-if="!isWx">
<view class="text-wrapper_4 itemamount" v-if="!isWx && Number(computedTotal.integral)">
<text lines="1" class="text_24">积分：</text>
<text lines="1" class="text_25" :style="{color:Brand()['ThemeColor']}">{{computedTotal.integral}}</text>
</view>

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

@ -144,7 +144,7 @@
<text lines="1" class="text_24">实际付款：</text>
<text lines="1" class="text_25" :style="{color:Brand()['ThemeColor']}">￥{{realPayment}}</text>
</view>
<view class="text-wrapper_4 itemamount" v-if="!isWx">
<view class="text-wrapper_4 itemamount" v-if="!isWx && Number(computedTotal.integral)">
<text lines="1" class="text_24">积分：</text>
<text lines="1" class="text_25" :style="{color:Brand()['ThemeColor']}">￥{{computedTotal.integral}}</text>
</view>

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.04e4b496.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.150fc6e5.js></script></body></html>

2
unpackage/dist/build/web/static/js/index.04e4b496.js → unpackage/dist/build/web/static/js/index.150fc6e5.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.77bd7ffe.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.9a7fac33.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.9343f61d.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.e73a9dc9.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.32614db9.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.a6d869ef.js vendored Normal file
View File

File diff suppressed because one or more lines are too long