修改布局

This commit is contained in:
whitechiina 2026-07-17 10:36:28 +08:00
parent 86beddf2fa
commit 55c67d08e8
16 changed files with 1781 additions and 1770 deletions

File diff suppressed because it is too large Load Diff

View File

@ -386,7 +386,7 @@
padding: 15rpx 32rpx;
}
.confirmButton{
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 43px;
color: #ffffff;
font-size: 30rpx;

View File

@ -1,268 +1,268 @@
<template>
<view class="b-restaurant-order-status">
<!-- 订单状态 -->
<!-- 瑞幸订单状态 -->
<template v-if="InforData['brand_id'] == 13">
<view class="rx-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
:src="qnyurl('Unpaid.png','rx')" mode=""></image>
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
:src="qnyurl('NotServed.png','rx')" mode=""></image>
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
:src="qnyurl('cancel.png','rx')" mode=""></image>
<!-- 订单状态 -->
<view class="rx-Order-status-Title">
{{InforData['status'] | OrderState}}
</view>
<!-- 未支付 -->
<template v-if="InforData['status'] == OrderStatus0">
<view class="rx-Order-status-time">
剩余付款时间 {{wait_for}}
</view>
<view class="rx-Order-status-pay" :style="BtnStyle" @tap="payments">
立即支付
</view>
<view class="rx-Order-status-wait">
若您已支付请耐心等待商家结算
</view>
</template>
<!-- 待出餐 -->
<template v-if="InforData['status'] == OrderStatus1">
<view class="rx-Order-status-wait">
下单成功取餐码生成中请稍后查看
</view>
</template>
</view>
<!-- 已经出餐 -->
<view class="rx-Order-status-take style" v-else>
<view class="rx-Order-status-take-code">
<text class="text1">取餐码</text>
<text class="text2">{{InforData['codes'].join('')}}</text>
</view>
<view class="rx-Order-status-take-codeimg">
<img class="img" :src="InforData['qrcode']" alt="">
</view>
</view>
</template>
<template v-if="InforData['brand_id'] == 10">
<view class="xbk-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
:src="qnyurl('cancel.png','xbk')" mode=""></image>
<!-- 订单状态 -->
<view class="xbk-Order-status-Title">
{{InforData['status'] | OrderState}}
</view>
<!-- 未支付 -->
<template v-if="InforData['status'] == OrderStatus0">
<view class="xbk-Order-status-time">
剩余付款时间 {{wait_for}}
</view>
<view class="xbk-Order-status-pay" @tap="payments">
立即支付
</view>
<view class="xbk-Order-status-wait">
若您已支付请耐心等待商家结算
</view>
</template>
<!-- 待出餐 -->
<template v-if="InforData['status'] == OrderStatus1">
<view class="xbk-Order-status-wait">
排队下单中请耐心等待
</view>
<view class="xbk-Order-status-Tips">
本页面可关闭将短信通知取单号或稍后查询我的订单
</view>
</template>
</view>
<!-- 已经出餐 -->
<view class="xbk-Order-status-take style" v-else>
<view class="codes" v-for="(item,index) in InforData['codes']">
<view class="codes-img">
<image class="img" :src="qnyurl('Password.png','xbk')" mode=""></image>
</view>
<view class="codes-Password">
口令{{index+1}}{{item}}
</view>
</view>
</view>
</template>
</view>
</template>
<script>
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
export default {
mixins: [mixin,restaurantmixins],
name: "b-restaurant-order-status",
props: {
InforData: {
type: Object,
default: () => {}
}
},
computed: {
BtnStyle() {
let style = {};
switch (this['InforData']['brand_id']) {
case 1:
style['color'] = uni.$u.addUnit('#C63836');
style['border'] = uni.$u.addUnit('1px solid #DC7473');
break;
case 10:
style['color'] = uni.$u.addUnit('#ffffff');
style['background-color'] = uni.$u.addUnit('#00AF66');
// style['border'] = uni.$u.addUnit('1px solid #00AF66');
break;
case 13:
style['color'] = uni.$u.addUnit('#ffffff');
style['border'] = uni.$u.addUnit('1px solid #4A6FE7');
break;
};
return style;
}
},
mounted() {
if (this['InforData']['status'] == this['OrderStatus0']) {
this.tiem(this['InforData']['status'], this['InforData']['createtime'])
};
},
data() {
return {};
},
methods: {
payments() {
this.$emit('payments', {
order_sn: this['InforData']['order_sn'],
restaurant_id: this['InforData']['restaurant_id']
});
},
}
}
</script>
<style lang="scss">
page {
background-color: #f8f8f8;
padding: 32rpx;
box-sizing: border-box;
}
.b-restaurant-order-status {
width: 100%;
height: 100%;
.style {
border-radius: 20rpx;
background-color: #ffffff;
}
// //
.rx-Order-status {
display: flex;
flex-direction: column;
align-items: center;
padding: 35rpx 0;
&-Img {
width: 108rpx;
height: 108rpx;
}
&-Title {
font-size: 36rpx;
margin-bottom: 20rpx;
}
&-time {
color: #666666;
font-size: 26rpx;
margin-bottom: 20rpx;
}
&-pay {
width: 220rpx;
height: 60rpx;
color: #ffffff;
font-size: 28rpx;
background: #0122A4;
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;
}
&-wait {
background: #F7F8FA;
border-radius: 28rpx;
padding: 15rpx 30rpx;
color: #666666;
font-size: 26rpx;
}
//
&-Tips {
color: #999999;
font-size: 24rpx;
}
}
//
.rx-Order-status-take {
display: flex;
flex-direction: column;
align-items: center;
padding: 15rpx 0;
&-code {
display: flex;
align-items: center;
.text1 {
color: #000000;
font-size: 26rpx;
margin-right: 15rpx;
}
.text2 {
color: #4B6FE7;
font-size: 52rpx;
}
}
&-codeimg {
width: 234rpx;
height: 235rpx;
.img {
width: 100%;
height: 100%;
}
}
}
}
.b-restaurant-order-status {
width: 100%;
height: 100%;
.style {
border-radius: 20rpx;
background-color: #ffffff;
}
}
</style>
<template>
<view class="b-restaurant-order-status">
<!-- 订单状态 -->
<!-- 瑞幸订单状态 -->
<template v-if="InforData['brand_id'] == 13">
<view class="rx-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
:src="qnyurl('Unpaid.png','rx')" mode=""></image>
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
:src="qnyurl('NotServed.png','rx')" mode=""></image>
<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
:src="qnyurl('cancel.png','rx')" mode=""></image>
<!-- 订单状态 -->
<view class="rx-Order-status-Title">
{{InforData['status'] | OrderState}}
</view>
<!-- 未支付 -->
<template v-if="InforData['status'] == OrderStatus0">
<view class="rx-Order-status-time">
剩余付款时间 {{wait_for}}
</view>
<view class="rx-Order-status-pay" :style="BtnStyle" @tap="payments">
立即支付
</view>
<view class="rx-Order-status-wait">
若您已支付请耐心等待商家结算
</view>
</template>
<!-- 待出餐 -->
<template v-if="InforData['status'] == OrderStatus1">
<view class="rx-Order-status-wait">
下单成功取餐码生成中请稍后查看
</view>
</template>
</view>
<!-- 已经出餐 -->
<view class="rx-Order-status-take style" v-else>
<view class="rx-Order-status-take-code">
<text class="text1">取餐码</text>
<text class="text2">{{InforData['codes'].join('')}}</text>
</view>
<view class="rx-Order-status-take-codeimg">
<img class="img" :src="InforData['qrcode']" alt="">
</view>
</view>
</template>
<template v-if="InforData['brand_id'] == 10">
<view class="xbk-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
:src="qnyurl('cancel.png','xbk')" mode=""></image>
<!-- 订单状态 -->
<view class="xbk-Order-status-Title">
{{InforData['status'] | OrderState}}
</view>
<!-- 未支付 -->
<template v-if="InforData['status'] == OrderStatus0">
<view class="xbk-Order-status-time">
剩余付款时间 {{wait_for}}
</view>
<view class="xbk-Order-status-pay" @tap="payments">
立即支付
</view>
<view class="xbk-Order-status-wait">
若您已支付请耐心等待商家结算
</view>
</template>
<!-- 待出餐 -->
<template v-if="InforData['status'] == OrderStatus1">
<view class="xbk-Order-status-wait">
排队下单中请耐心等待
</view>
<view class="xbk-Order-status-Tips">
本页面可关闭将短信通知取单号或稍后查询我的订单
</view>
</template>
</view>
<!-- 已经出餐 -->
<view class="xbk-Order-status-take style" v-else>
<view class="codes" v-for="(item,index) in InforData['codes']">
<view class="codes-img">
<image class="img" :src="qnyurl('Password.png','xbk')" mode=""></image>
</view>
<view class="codes-Password">
口令{{index+1}}{{item}}
</view>
</view>
</view>
</template>
</view>
</template>
<script>
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
export default {
mixins: [mixin,restaurantmixins],
name: "b-restaurant-order-status",
props: {
InforData: {
type: Object,
default: () => {}
}
},
computed: {
BtnStyle() {
let style = {};
switch (this['InforData']['brand_id']) {
case 1:
style['color'] = uni.$u.addUnit('#C63836');
style['border'] = uni.$u.addUnit('1px solid #DC7473');
break;
case 10:
style['color'] = uni.$u.addUnit('#ffffff');
style['background-color'] = uni.$u.addUnit('#00AF66');
// style['border'] = uni.$u.addUnit('1px solid #00AF66');
break;
case 13:
style['color'] = uni.$u.addUnit('#ffffff');
style['border'] = uni.$u.addUnit('1px solid #4A6FE7');
break;
};
return style;
}
},
mounted() {
if (this['InforData']['status'] == this['OrderStatus0']) {
this.tiem(this['InforData']['status'], this['InforData']['createtime'])
};
},
data() {
return {};
},
methods: {
payments() {
this.$emit('payments', {
order_sn: this['InforData']['order_sn'],
restaurant_id: this['InforData']['restaurant_id']
});
},
}
}
</script>
<style lang="scss">
page {
background-color: #f8f8f8;
padding: 32rpx;
box-sizing: border-box;
}
.b-restaurant-order-status {
width: 100%;
height: 100%;
.style {
border-radius: 20rpx;
background-color: #ffffff;
}
// //
.rx-Order-status {
display: flex;
flex-direction: column;
align-items: center;
padding: 35rpx 0;
&-Img {
width: 108rpx;
height: 108rpx;
}
&-Title {
font-size: 36rpx;
margin-bottom: 20rpx;
}
&-time {
color: #666666;
font-size: 26rpx;
margin-bottom: 20rpx;
}
&-pay {
width: 220rpx;
height: 60rpx;
color: #ffffff;
font-size: 28rpx;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;
}
&-wait {
background: #F7F8FA;
border-radius: 28rpx;
padding: 15rpx 30rpx;
color: #666666;
font-size: 26rpx;
}
//
&-Tips {
color: #999999;
font-size: 24rpx;
}
}
//
.rx-Order-status-take {
display: flex;
flex-direction: column;
align-items: center;
padding: 15rpx 0;
&-code {
display: flex;
align-items: center;
.text1 {
color: #000000;
font-size: 26rpx;
margin-right: 15rpx;
}
.text2 {
color: #4B6FE7;
font-size: 52rpx;
}
}
&-codeimg {
width: 234rpx;
height: 235rpx;
.img {
width: 100%;
height: 100%;
}
}
}
}
.b-restaurant-order-status {
width: 100%;
height: 100%;
.style {
border-radius: 20rpx;
background-color: #ffffff;
}
}
</style>

View File

@ -329,7 +329,7 @@
&-right {
width: 254rpx;
height: 86rpx;
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
border-radius: 43rpx;
text-align: center;

View File

@ -1,271 +1,271 @@
<template>
<view class="b-rx-shop-item">
<view class="b-rx-shop-item-commodity">
<image class="b-rx-shop-item-commodity-img" :src="item['product_img']" mode=""></image>
</view>
<view class="b-rx-shop-item-commodity-infor">
<!-- 商品标题 -->
<view class="b-rx-shop-item-commodity-infor-title b-rx-shop-item-commodity-infor-bottom">
{{item['product_name']}}
</view>
<!-- 补贴金额 -->
<view v-if="item['max_deduction'] > 0"
class="b-rx-shop-item-commodity-infor-discount b-rx-shop-item-commodity-infor-bottom">
最高补贴{{RetainDecimalPoint(item['max_deduction'])}}面额
</view>
<!-- 价格 -->
<view class="b-rx-shop-item-commodity-infor-original-price b-rx-shop-item-commodity-infor-bottom">
<text class="yang">原价:</text>
<text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text>
</view>
<!-- 优惠补贴后的价格 -->
<view class="b-rx-shop-item-commodity-infor-price b-rx-shop-item-commodity-infor-bottom">
<text class="yang">补贴后价格:</text>
<text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text>
</view>
<!-- 直接添加商品 -->
<!-- <view class="b-kfc-shop-item-commodity-infor-shopping-cart" v-if="shopCart['num'] > 0">
<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
@tap="reducecommodity"></image>
<view class="num">
{{shopCart['num']}}
</view>
<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="GetCommodity"></image>
</view> -->
<!-- 需要选择规格 -->
<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku" @tap="$u.debounce(GetCommodity, 800,true)">
<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku-btn" :style="[Btnstyle]">
<u-badge v-if="NumValu > 0" :offset="[-6,-5]" max="99" absolute :value="NumValu"></u-badge>
选规格
</view>
</view>
</view>
</view>
</template>
<script>
/**
* @肯德基店铺商品组件
* */
//
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
//
import {
menuDetailsAPI,
} from '@/request/restaurant/index.js';
import {
mapMutations
} from 'vuex'
export default {
mixins: [mixin, restaurantmixins],
name: "b-rx-shop-item",
props: {
item: {
type: Object,
default: () => {}
}
},
data() {
return {};
},
computed: {
//
shopCart: function() {
try {
return this['GetCartList'][this['item']['product_id']];
} catch (e) {
return 0
}
},
NumValu(){
try{
return this['GetCartList'][this['item']['product_id']]['num']
}catch(e){
return 0
}
},
//
Btnstyle() {
if (this['BrandInfor']['brand_id'] == 10) {
return {
'background': '#00AF66'
};
}
if (this['BrandInfor']['brand_id'] == 13) {
return {
'background': '#0122A4'
};
}
}
},
methods: {
...mapMutations({
SetcommodityInfor: 'shopping/SETINFOR'
}),
//
GetCommodity() {
uni.showLoading({
title: '加载中...'
});
let parameters = {
brand_id: this['BrandInfor']['brand_id'],
restaurant_id: this['GetShopInfor']['restaurant_id'],
product_id: this['item']['product_id']
}
menuDetailsAPI(parameters).then(res => {
uni.hideLoading();
//
res['data']['num'] = 1;
this.SetcommodityInfor(res['data']);
if (this['BrandInfor']['brand_id'] == 10) {
// H5
// this['$parent']['$parent']['$parent']['$refs']['b-xbk-sku-popup']['show'] = true;
this.$emit('skupopup','b-xbk-sku-popup');
console.log(this['BrandInfor']['brand_id'],'执行1')
};
if (this['BrandInfor']['brand_id'] == 13) {
this.$emit('skupopup','b-rx-sku-popup');
// H5
// this['$parent']['$parent']['$parent']['$refs']['b-rx-sku-popup']['show'] = true;
console.log(this['BrandInfor']['brand_id'],'执行2')
}
})
}
}
}
</script>
<style lang="scss">
.b-rx-shop-item {
width: 100%;
height: auto;
display: flex;
justify-content: flex-start;
&-commodity {
width: 220rpx;
height: 195rpx;
max-width: 220rpx;
max-height: 195rpx;
min-width: 220rpx;
min-height: 195rpx;
border-radius: 10rpx;
overflow: hidden;
&-img {
width: 100%;
height: 100%;
}
}
&-commodity-infor {
flex: 1;
padding-left: 22rpx;
&-bottom {
margin-bottom: 15rpx;
}
&-title {
font-size: $FONTSIZE26;
color: $THEMECOLOR4;
}
&-discount {
background-color: #FFDADA;
border-radius: 50rpx;
color: $THEMECOLOR1;
font-size: $FONTSIZE22;
padding: 5rpx 15rpx;
display: inline-block;
}
&-original-price {
.yang {
font-size: $FONTSIZE22;
}
.price {
font-size: $FONTSIZE22;
}
}
&-price {
color: $THEMECOLOR1;
.yang {
font-size: $FONTSIZE22;
}
.price {
font-size: $FONTSIZE30;
}
}
&-shopping-cart {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
.num {
max-width: 100rpx;
min-width: 100rpx;
text-align: center;
}
.img {
width: 42rpx;
height: 42rpx;
}
}
&-shopping-cart-sku {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
&-btn {
width: 106rpx;
height: 50rpx;
position: relative;
border-radius: 25rpx;
color: #ffffff;
text-align: center;
line-height: 50rpx;
font-size: 24rpx;
}
}
}
}
.b-kfc-shop-item-commodity-infor-shopping-cart {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
.num {
max-width: 100rpx;
min-width: 100rpx;
text-align: center;
}
.img {
width: 42rpx;
height: 42rpx;
}
}
</style>
<template>
<view class="b-rx-shop-item">
<view class="b-rx-shop-item-commodity">
<image class="b-rx-shop-item-commodity-img" :src="item['product_img']" mode=""></image>
</view>
<view class="b-rx-shop-item-commodity-infor">
<!-- 商品标题 -->
<view class="b-rx-shop-item-commodity-infor-title b-rx-shop-item-commodity-infor-bottom">
{{item['product_name']}}
</view>
<!-- 补贴金额 -->
<view v-if="item['max_deduction'] > 0"
class="b-rx-shop-item-commodity-infor-discount b-rx-shop-item-commodity-infor-bottom">
最高补贴{{RetainDecimalPoint(item['max_deduction'])}}面额
</view>
<!-- 价格 -->
<view class="b-rx-shop-item-commodity-infor-original-price b-rx-shop-item-commodity-infor-bottom">
<text class="yang">原价:</text>
<text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text>
</view>
<!-- 优惠补贴后的价格 -->
<view class="b-rx-shop-item-commodity-infor-price b-rx-shop-item-commodity-infor-bottom">
<text class="yang">补贴后价格:</text>
<text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text>
</view>
<!-- 直接添加商品 -->
<!-- <view class="b-kfc-shop-item-commodity-infor-shopping-cart" v-if="shopCart['num'] > 0">
<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
@tap="reducecommodity"></image>
<view class="num">
{{shopCart['num']}}
</view>
<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="GetCommodity"></image>
</view> -->
<!-- 需要选择规格 -->
<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku" @tap="$u.debounce(GetCommodity, 800,true)">
<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku-btn" :style="[Btnstyle]">
<u-badge v-if="NumValu > 0" :offset="[-6,-5]" max="99" absolute :value="NumValu"></u-badge>
选规格
</view>
</view>
</view>
</view>
</template>
<script>
/**
* @肯德基店铺商品组件
* */
//
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
//
import {
menuDetailsAPI,
} from '@/request/restaurant/index.js';
import {
mapMutations
} from 'vuex'
export default {
mixins: [mixin, restaurantmixins],
name: "b-rx-shop-item",
props: {
item: {
type: Object,
default: () => {}
}
},
data() {
return {};
},
computed: {
//
shopCart: function() {
try {
return this['GetCartList'][this['item']['product_id']];
} catch (e) {
return 0
}
},
NumValu(){
try{
return this['GetCartList'][this['item']['product_id']]['num']
}catch(e){
return 0
}
},
//
Btnstyle() {
if (this['BrandInfor']['brand_id'] == 10) {
return {
'background': '#00AF66'
};
}
if (this['BrandInfor']['brand_id'] == 13) {
return {
'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
};
}
}
},
methods: {
...mapMutations({
SetcommodityInfor: 'shopping/SETINFOR'
}),
//
GetCommodity() {
uni.showLoading({
title: '加载中...'
});
let parameters = {
brand_id: this['BrandInfor']['brand_id'],
restaurant_id: this['GetShopInfor']['restaurant_id'],
product_id: this['item']['product_id']
}
menuDetailsAPI(parameters).then(res => {
uni.hideLoading();
//
res['data']['num'] = 1;
this.SetcommodityInfor(res['data']);
if (this['BrandInfor']['brand_id'] == 10) {
// H5
// this['$parent']['$parent']['$parent']['$refs']['b-xbk-sku-popup']['show'] = true;
this.$emit('skupopup','b-xbk-sku-popup');
console.log(this['BrandInfor']['brand_id'],'执行1')
};
if (this['BrandInfor']['brand_id'] == 13) {
this.$emit('skupopup','b-rx-sku-popup');
// H5
// this['$parent']['$parent']['$parent']['$refs']['b-rx-sku-popup']['show'] = true;
console.log(this['BrandInfor']['brand_id'],'执行2')
}
})
}
}
}
</script>
<style lang="scss">
.b-rx-shop-item {
width: 100%;
height: auto;
display: flex;
justify-content: flex-start;
&-commodity {
width: 220rpx;
height: 195rpx;
max-width: 220rpx;
max-height: 195rpx;
min-width: 220rpx;
min-height: 195rpx;
border-radius: 10rpx;
overflow: hidden;
&-img {
width: 100%;
height: 100%;
}
}
&-commodity-infor {
flex: 1;
padding-left: 22rpx;
&-bottom {
margin-bottom: 15rpx;
}
&-title {
font-size: $FONTSIZE26;
color: $THEMECOLOR4;
}
&-discount {
background-color: #FFDADA;
border-radius: 50rpx;
color: $THEMECOLOR1;
font-size: $FONTSIZE22;
padding: 5rpx 15rpx;
display: inline-block;
}
&-original-price {
.yang {
font-size: $FONTSIZE22;
}
.price {
font-size: $FONTSIZE22;
}
}
&-price {
color: $THEMECOLOR1;
.yang {
font-size: $FONTSIZE22;
}
.price {
font-size: $FONTSIZE30;
}
}
&-shopping-cart {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
.num {
max-width: 100rpx;
min-width: 100rpx;
text-align: center;
}
.img {
width: 42rpx;
height: 42rpx;
}
}
&-shopping-cart-sku {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
&-btn {
width: 106rpx;
height: 50rpx;
position: relative;
border-radius: 25rpx;
color: #ffffff;
text-align: center;
line-height: 50rpx;
font-size: 24rpx;
}
}
}
}
.b-kfc-shop-item-commodity-infor-shopping-cart {
flex: 1;
height: 60rpx;
display: flex;
justify-content: flex-end;
font-size: 36rpx;
align-items: center;
.num {
max-width: 100rpx;
min-width: 100rpx;
text-align: center;
}
.img {
width: 42rpx;
height: 42rpx;
}
}
</style>

View File

@ -233,7 +233,7 @@
// .btn {
// width: 470rpx;
// height: 86rpx;
// background: #0122A4;
// background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
// border-radius: 43rpx;
// font-size: 30rpx;
// color: #ffffff;

View File

@ -607,7 +607,7 @@
&-right {
width: 225rpx;
height: 77rpx;
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
border-radius: 48rpx;
text-align: center;

View File

@ -386,7 +386,7 @@
padding: 15rpx 32rpx;
}
.confirmButton{
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 43px;
color: #ffffff;
font-size: 30rpx;

View File

@ -96,7 +96,7 @@
}
if (this['BrandInfor']['brand_id'] == 13) {
return {
'background': '#0122A4'
'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
};
}
}

View File

@ -233,7 +233,7 @@
// .btn {
// width: 470rpx;
// height: 86rpx;
// background: #0122A4;
// background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
// border-radius: 43rpx;
// font-size: 30rpx;
// color: #ffffff;

View File

@ -503,7 +503,7 @@
height: 60rpx;
color: #ffffff;
font-size: 28rpx;
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;

View File

@ -1198,7 +1198,7 @@
}
.confirmButton {
// background: #0122A4;
// background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 43px;
color: #ffffff;
font-size: 30rpx;

View File

@ -48,7 +48,7 @@
&-right {
width: 225rpx;
height: 77rpx;
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
border-radius: 48rpx;
text-align: center;

View File

@ -6,31 +6,36 @@
<!-- 麦当劳/肯德基 -->
<view class="shop_home-commodity-infor" v-if="BrandInfor['brand_id'] == 1 || BrandInfor['brand_id'] == 5">
<!-- 商品标题 -->
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
{{item['product_name']}}
</view>
<!-- 补贴金额 -->
<!-- <view class="shop_home-commodity-infor-discount shop_home-commodity-infor-bottom">
最高补贴{{RetainDecimalPoint(item['max_deduction'])}}
</view> -->
<!-- 价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="yang">原价:</text>
<text class="price">{{item['product_price']}}</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
</view>
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="yang">补贴后价格:</text>
<text class="price">{{item['bt_price']}}</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
</view>
<!-- 积分 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<text class="yang">预估积分:</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="price">{{item['integral']}}</text>
<view>
<!-- 商品标题 -->
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
{{item['product_name']}}
</view>
<view class="flex">
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="price">¥{{item['bt_price']}}</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
</view>
<!-- 价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
<text class="price">{{item['product_price']}}</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
</view>
</view>
<!-- 消费补贴卡 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
<text class="yang">消费补贴:</text>
<text class="price">{{item['subsidy_card_price']}}</text>
</view>
<!-- 积分 -->
<view v-else>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<text class="yang">预估积分:</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" v-if="ISSpecifications" @tap="$u.debounce(Addcommodity, 800,true)">
@ -57,30 +62,32 @@
<!-- 星巴克/瑞幸 -->
<view class="shop_home-commodity-infor" v-if="BrandInfor['brand_id'] == 10 || BrandInfor['brand_id'] == 13">
<!-- 商品标题 -->
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
{{item['product_name']}}
</view>
<view class="flex">
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="price">¥{{item['bt_price']}}</text>
<view>
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
{{item['product_name']}}
</view>
<!-- 价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
<text class="price">¥{{item['product_price']}}</text>
<view class="flex">
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="price">¥{{item['bt_price']}}</text>
</view>
<!-- 价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
<text class="price">¥{{item['product_price']}}</text>
</view>
</view>
</view>
<!-- 消费补贴卡 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
<text class="yang">消费补贴卡:</text>
<text class="price">{{item['subsidy_card_price']}}</text>
</view>
<!-- 积分 -->
<view v-else>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<text class="yang">预估积分:</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="price">{{item['integral']}}</text>
<!-- 消费补贴卡 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
<text class="yang">消费补贴:</text>
<text class="price">{{item['subsidy_card_price']}}</text>
</view>
<!-- 积分 -->
<view v-else>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<text class="yang">预估积分:</text>
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="price">{{item['integral']}}</text>
</view>
</view>
</view>
<!-- 选规格 -->
@ -366,7 +373,6 @@
flex-direction: column;
justify-content: space-between;
&-bottom {
// margin-bottom: 12rpx;
}
.huaxian {
@ -381,7 +387,12 @@
&-title {
font-size: $FONTSIZE30;
color: $THEMECOLOR4;
font-weight: 600;
font-weight: 600;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
&-discount {

View File

@ -702,7 +702,7 @@
height: 60rpx;
color: #ffffff;
font-size: 28rpx;
background: #0122A4;
background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;

View File

@ -620,7 +620,7 @@ const config = {
// 自定义普通按钮样式
BtnStyle: [{
color: '#FFFFFF',
background: '#0122A4',
background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
}],
// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
OrderStatus: {
@ -772,7 +772,7 @@ const config = {
// 自定义普通按钮样式
BtnStyle: [{
color: '#FFFFFF',
background: '#0122A4',
background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
}],
// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
OrderStatus: {