diff --git a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue index 50891ab..c13ea88 100644 --- a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue +++ b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue @@ -60,32 +60,28 @@ {{item['product_name']}} - - - - - 原价:¥ - - {{item['product_price']}} - - - - 补贴后价格:¥ - - {{item['bt_price']}} + + + + ¥{{item['bt_price']}} + + + + ¥{{item['product_price']}} + - + 消费补贴卡:¥ {{item['subsidy_card_price']}} - - 预估积分: - - {{item['integral']}} + + + 预估积分: + + {{item['integral']}} + @@ -364,16 +360,28 @@ } &-commodity-infor { - flex: 1; + flex: 1; + display: flex; padding-left: 22rpx; - + flex-direction: column; + justify-content: space-between; &-bottom { // margin-bottom: 12rpx; + } + + .huaxian { + margin-left: 20rpx; + color: gray; + text-decoration: line-through; + .price { + font-size: 24rpx !important; + } } &-title { - font-size: $FONTSIZE26; - color: $THEMECOLOR4; + font-size: $FONTSIZE30; + color: $THEMECOLOR4; + font-weight: 600; } &-discount { @@ -387,13 +395,14 @@ &-price { color: $THEMECOLOR1; - + .yang { font-size: $FONTSIZE22; } .price { - font-size: $FONTSIZE30; + font-size: $FONTSIZE30; + font-weight: 600; } } @@ -418,13 +427,10 @@ } &-cart-sku { - flex: 1; - height: 60rpx; display: flex; justify-content: flex-end; font-size: 36rpx; align-items: center; - &-btn { width: 106rpx; height: 50rpx; diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue index 78e004f..8f10d28 100644 --- a/pages/restaurant/home/shop_home/shop_home.vue +++ b/pages/restaurant/home/shop_home/shop_home.vue @@ -107,7 +107,7 @@ return { // 肯德基 // 顶部通知 - topNotice: '当前6人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~', + topNotice: '当前5人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~', show: false, suspend: config['suspend'], diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index 1cd5ec8..acc0ca9 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -468,6 +468,8 @@ // 创建订单 createFoodOrder(from).then(res => { + console.log(res, '创建订单返回') + let redirect_url = '/pages/restaurant/order/order-details/details'; uni.hideLoading(); diff --git a/request/request.js b/request/request.js index a5e47e9..ff550d7 100644 --- a/request/request.js +++ b/request/request.js @@ -134,7 +134,7 @@ class Request { // #ifdef H5 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://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 if (infor['data']['msg'] == '产品错误' || infor['data']['msg'] == '产品不存在') {