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

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

@ -685,7 +685,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-restaurant-order-status/b-restaurant-order-status.vue
View File

@ -195,7 +195,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
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;

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
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;

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

@ -6,32 +6,37 @@
<!-- 麦当劳/肯德基 --> <!-- 麦当劳/肯德基 -->
<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"> <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> -->
<!-- 价格 -->
<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"> <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">{{item['bt_price']}}</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="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"> <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 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)">
<view class="shop_home-commodity-infor-cart-sku-btn" :style="Brand()['customStyle']['BtnStyle'][0]"> <view class="shop_home-commodity-infor-cart-sku-btn" :style="Brand()['customStyle']['BtnStyle'][0]">
@ -57,6 +62,7 @@
<!-- 星巴克/瑞幸 --> <!-- 星巴克/瑞幸 -->
<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>
<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>
@ -72,8 +78,8 @@
</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>
@ -83,6 +89,7 @@
<text class="price">{{item['integral']}}</text> <text class="price">{{item['integral']}}</text>
</view> </view>
</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)">
<view class="shop_home-commodity-infor-cart-sku-btn" :style="Brand()['customStyle']['BtnStyle'][0]"> <view class="shop_home-commodity-infor-cart-sku-btn" :style="Brand()['customStyle']['BtnStyle'][0]">
@ -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 {
@ -382,6 +388,11 @@
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: {