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:36:28 +08:00
parent 86beddf2fa
commit 55c67d08e8
16 changed files with 1781 additions and 1770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2338
components/b-Shopping-Cart/b-Shopping-Cart.vue
View File

File diff suppressed because it is too large Load Diff

2
components/b-page-home/b-page-home-rx.vue
View File

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

536
components/b-restaurant-order-status/b-restaurant-order-status.vue
View File

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

2
components/b-rx-sku-popup/b-rx-sku-popup.vue
View File

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

542
components/b-shop-item/b-rx-shop-item.vue
View File

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

2
components/b-shop-list-item/b-shop-list-item.vue
View File

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

2
components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue
View File

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

2
components/新建文件夹/b-page-home/b-page-home-rx.vue
View File

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

2
components/新建文件夹/b-shop-item/b-rx-shop-item.vue
View File

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

2
components/新建文件夹/b-shop-list-item/b-shop-list-item.vue
View File

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

2
pages/diy/orders/order-infor/order-infor.vue
View File

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

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

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

2
pages/restaurant/home/shop_home/components/shop-cart/rx.scss
View File

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

109
pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
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" v-if="BrandInfor['brand_id'] == 1 || BrandInfor['brand_id'] == 5">
<!-- 商品标题 --> <view>
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom"> <!-- 商品标题 -->
{{item['product_name']}} <view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
</view> {{item['product_name']}}
<!-- 补贴金额 --> </view>
<!-- <view class="shop_home-commodity-infor-discount shop_home-commodity-infor-bottom"> <view class="flex">
最高补贴{{RetainDecimalPoint(item['max_deduction'])}}元 <!-- 优惠补贴后的价格 -->
</view> --> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<!-- 价格 --> <text class="price">¥{{item['bt_price']}}</text>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom"> <!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<text class="yang">原价:￥</text> </view>
<text class="price">{{item['product_price']}}</text> <!-- 价格 -->
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> --> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
</view> <text class="price">￥{{item['product_price']}}</text>
<!-- 优惠补贴后的价格 --> <!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom"> </view>
<text class="yang">补贴后价格:￥</text> </view>
<text class="price">{{item['bt_price']}}</text> <!-- 消费补贴卡 -->
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> --> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
</view> <text class="yang">消费补贴:</text>
<!-- 积分 --> <text class="price">￥{{item['subsidy_card_price']}}</text>
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx"> </view>
<text class="yang">预估积分:</text> <!-- 积分 -->
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> --> <view v-else>
<text class="price">{{item['integral']}}</text> <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>
<!-- 该商品为套餐商品并且套餐中有可选商品则显示为选规格 --> <!-- 该商品为套餐商品并且套餐中有可选商品则显示为选规格 -->
<view class="shop_home-commodity-infor-cart-sku" v-if="ISSpecifications" @tap="$u.debounce(Addcommodity, 800,true)"> <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" v-if="BrandInfor['brand_id'] == 10 || BrandInfor['brand_id'] == 13">
<!-- 商品标题 --> <!-- 商品标题 -->
<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom"> <view>
{{item['product_name']}} <view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
</view> {{item['product_name']}}
<view class="flex">
<!-- 优惠补贴后的价格 -->
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
<text class="price">¥{{item['bt_price']}}</text>
</view> </view>
<!-- 价格 --> <view class="flex">
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian"> <!-- 优惠补贴后的价格 -->
<text class="price">¥{{item['product_price']}}</text> <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> <!-- 消费补贴卡 -->
<!-- 消费补贴卡 --> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
<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 v-else>
<view v-else> <view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx"> <text class="yang">预估积分:</text>
<text class="yang">预估积分:</text> <!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> --> <text class="price">{{item['integral']}}</text>
<text class="price">{{item['integral']}}</text> </view>
</view> </view>
</view> </view>
<!-- 选规格 --> <!-- 选规格 -->
@ -366,7 +373,6 @@
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
&-bottom { &-bottom {
// margin-bottom: 12rpx;
} }
.huaxian { .huaxian {
@ -381,7 +387,12 @@
&-title { &-title {
font-size: $FONTSIZE30; font-size: $FONTSIZE30;
color: $THEMECOLOR4; 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 { &-discount {

2
pages/restaurant/order/order-details/details.vue
View File

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

4
static/js/config.js
View File

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