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

修改样式

This commit is contained in:
whitechiina 2026-07-17 10:18:17 +08:00
parent cd98744baf
commit 86beddf2fa
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,32 +60,28 @@
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom"> <view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
{{item['product_name']}} {{item['product_name']}}
</view> </view>
<!-- 补贴金额 --> <view class="flex">
<!-- <view class="shop_home-commodity-infor-discount shop_home-commodity-infor-bottom"> <!-- 优惠补贴后的价格 -->
最高补贴{{RetainDecimalPoint(item['max_deduction'])}}元 <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
</view> --> <text class="price">¥{{item['bt_price']}}</text>
<!-- 价格 --> </view>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom"> <!-- 价格 -->
<text class="yang">原价:￥</text> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> --> <text class="price">¥{{item['product_price']}}</text>
<text class="price">{{item['product_price']}}</text> </view>
</view>
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="yang">补贴后价格:￥</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="price">{{item['bt_price']}}</text>
</view> </view>
<!-- 消费补贴卡 --> <!-- 消费补贴卡 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom"> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
<text class="yang">消费补贴卡:￥</text> <text class="yang">消费补贴卡:￥</text>
<text class="price">{{item['subsidy_card_price']}}</text> <text class="price">{{item['subsidy_card_price']}}</text>
</view> </view>
<!-- 积分 --> <!-- 积分 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx"> <view v-else>
<text class="yang">预估积分:</text> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> --> <text class="yang">预估积分:</text>
<text class="price">{{item['integral']}}</text> <!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="price">{{item['integral']}}</text>
</view>
</view> </view>
<!-- 选规格 --> <!-- 选规格 -->
<view class="shop_home-commodity-infor-cart-sku" @tap="$u.debounce(Addcommodity, 800,true)"> <view class="shop_home-commodity-infor-cart-sku" @tap="$u.debounce(Addcommodity, 800,true)">
@ -364,16 +360,28 @@
} }
&-commodity-infor { &-commodity-infor {
flex: 1; flex: 1;
display: flex;
padding-left: 22rpx; padding-left: 22rpx;
flex-direction: column;
justify-content: space-between;
&-bottom { &-bottom {
// margin-bottom: 12rpx; // margin-bottom: 12rpx;
}
.huaxian {
margin-left: 20rpx;
color: gray;
text-decoration: line-through;
.price {
font-size: 24rpx !important;
}
} }
&-title { &-title {
font-size: $FONTSIZE26; font-size: $FONTSIZE30;
color: $THEMECOLOR4; color: $THEMECOLOR4;
font-weight: 600;
} }
&-discount { &-discount {
@ -387,13 +395,14 @@
&-price { &-price {
color: $THEMECOLOR1; color: $THEMECOLOR1;
.yang { .yang {
font-size: $FONTSIZE22; font-size: $FONTSIZE22;
} }
.price { .price {
font-size: $FONTSIZE30; font-size: $FONTSIZE30;
font-weight: 600;
} }
} }
@ -418,13 +427,10 @@
} }
&-cart-sku { &-cart-sku {
flex: 1;
height: 60rpx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
font-size: 36rpx; font-size: 36rpx;
align-items: center; align-items: center;
&-btn { &-btn {
width: 106rpx; width: 106rpx;
height: 50rpx; height: 50rpx;

2
pages/restaurant/home/shop_home/shop_home.vue
View File

@ -107,7 +107,7 @@
return { return {
// 肯德基 // 肯德基
// 顶部通知 // 顶部通知
topNotice: '当前6人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～', topNotice: '当前5人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～',
show: false, show: false,
suspend: config['suspend'], suspend: config['suspend'],

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

@ -468,6 +468,8 @@
// 创建订单 // 创建订单
createFoodOrder(from).then(res => { createFoodOrder(from).then(res => {
console.log(res, '创建订单返回')
let redirect_url = '/pages/restaurant/order/order-details/details'; let redirect_url = '/pages/restaurant/order/order-details/details';
uni.hideLoading(); uni.hideLoading();

2
request/request.js
View File

@ -134,7 +134,7 @@ class Request {
// #ifdef H5 // #ifdef H5
if (infor['data']['status'] == 110002) { if (infor['data']['status'] == 110002) {
window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`; window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`;
// window.location.href = `http://10.210.254.176:8081/JXH5/#/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`; // window.location.href = `https://10.210.254.143:1024/JXH5/#/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`;
} }
// #endif // #endif
if (infor['data']['msg'] == '产品错误' || infor['data']['msg'] == '产品不存在') { if (infor['data']['msg'] == '产品错误' || infor['data']['msg'] == '产品不存在') {