订单管理支付样式调整

This commit is contained in:
2024-10-16 14:16:31 +08:00
parent 72d4862925
commit a221a1fc99
5 changed files with 26 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
<template> <template>
<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="data.length"> <view class="default-box-padding bg-fff border-r-24 u-m-t-32" v-if="data.length">
<view class="u-font-32 color-999"> <view class="u-font-32 color-999 border-bottom u-p-b-24">
<text></text> <text></text>
<text class="color-333 "> {{goodsNumber}}</text> <text class="color-333 "> {{goodsNumber}}</text>
<text>份菜品</text> <text>份菜品</text>
@@ -8,7 +8,7 @@
<view class="u-m-b-20 u-m-t-20" v-for="(order,orderIndex) in data" :key="orderIndex"> <view class="u-m-b-20 u-m-t-20" v-for="(order,orderIndex) in data" :key="orderIndex">
<view class="u-font-32"> {{ order.placeNum }}次下单 <view class="u-font-32"> {{ order.placeNum }}次下单
</view> </view>
<view class="u-m-t-20 list"> <view class="u-m-t-24 list">
<view class="item u-m-b-20" v-for="(item,index) in order.info" :key="index"> <view class="item u-m-b-20" v-for="(item,index) in order.info" :key="index">
<view class="u-flex u-col-top"> <view class="u-flex u-col-top">
<view> <view>
@@ -30,12 +30,12 @@
<view class="u-text-right"> <view class="u-text-right">
<template v-if="item.status=='return'"> <template v-if="item.status=='return'">
<view>0.00</view> <view>0.00</view>
<view class="line-th color-666 u-font-24">{{item.salePrice||item.price}}</view> <view class="line-th color-666 ">{{item.salePrice||item.price}}</view>
</template> </template>
<template v-else> <template v-else>
<view>{{item.salePrice||item.price}}</view> <view>{{item.salePrice||item.price}}</view>
</template> </template>
<view class="u-m-t-10 u-font-24">X{{item.number||item.num}}</view> <view class="u-m-t-10 color-999 u-font-24">X{{item.number||item.num}}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -192,12 +192,15 @@
.img { .img {
width: 152rpx; width: 152rpx;
height: 152rpx; height: 152rpx;
border-radius: 6px;
} }
.border-top { .border-top {
border-color: #F6F6F6; border-color: #F6F6F6;
} }
.border-r-24{
border-radius: 24rpx;
}
.border-bottom { .border-bottom {
// border-color: rgb(240, 240, 240); // border-color: rgb(240, 240, 240);
border-color: #F6F6F6; border-color: #F6F6F6;

View File

@@ -5,9 +5,9 @@
<view> <view>
{{data.productName}} {{data.productName}}
</view> </view>
<!-- <view class="u-flex u-m-t-32"> <view class="u-flex u-m-t-32">
<up-number-box :buttonSize="44" :inputWidth="220" v-model="number"></up-number-box> <up-number-box :buttonSize="44" :inputWidth="220" v-model="number"></up-number-box>
</view> --> </view>
<view class="u-m-t-32"> <view class="u-m-t-32">
<view class="u-font-24"> <view class="u-font-24">
<text class="color-999">退菜理由</text> <text class="color-999">退菜理由</text>
@@ -15,8 +15,8 @@
</view> </view>
<view class="u-flex u-flex-wrap u-m-t-24"> <view class="u-flex u-flex-wrap u-m-t-24">
<view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index"> <view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index">
<up-tag @click="changeTagSel(item)" :text="item.label" plain v-if="item.checked"> </up-tag> <up-tag @click="changeTagSel(item)" :text="item.label" plain borderColor="#E6FOFF" color="#318AFE" v-if="item.checked"> </up-tag>
<up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#999" :text="item.label" plain v-else> </up-tag> <up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#666" :text="item.label" plain v-else> </up-tag>
</view> </view>
</view> </view>
<view class="u-m-t-24"> <view class="u-m-t-24">
@@ -96,5 +96,8 @@
} }
</script> </script>
<style> <style lang="scss" scoped>
::v-deep .u-border{
border-width: 1px!important;
}
</style> </style>

View File

@@ -25,18 +25,18 @@
</view> </view>
</view> </view>
</template> </template>
<view class="u-flex u-m-t-20 u-row-between"> <view class="u-flex u-m-t-20 u-row-between u-font-28">
<view class=""> <view class="">
<view class="font-bold ">{{user.amount}}</view> <view class="font-bold ">{{user.amount}}</view>
<view class="color-666 u-m-t-10">余额</view> <view class="color-666 u-m-t-10 u-font-24">余额</view>
</view> </view>
<view class=""> <view class="">
<view class="font-bold">{{user.totalScore}}</view> <view class="font-bold">{{user.totalScore}}</view>
<view class="color-666 u-m-t-10">积分</view> <view class="color-666 u-m-t-10 u-font-24">积分</view>
</view> </view>
<view class=""> <view class="">
<view class="font-bold">0.00</view> <view class="font-bold">0.00</view>
<view class="color-666 u-m-t-10">已消费</view> <view class="color-666 u-m-t-10 u-font-24">已消费</view>
</view> </view>
</view> </view>
</view> </view>

View File

@@ -1,7 +1,7 @@
<template> <template>
<view class="min-page bg-gray u-font-28 u-p-30"> <view class="min-page bg-gray u-font-28 u-p-30">
<user-vue :orderInfo="orderDetail.info" :user="user"></user-vue> <user-vue :orderInfo="orderDetail.info" :user="user"></user-vue>
<view class="default-box-padding bg-fff border-r-12 u-m-t-20"> <view class="default-box-padding bg-fff border-r-12 u-m-t-32">
<text class="">桌位号</text> <text class="">桌位号</text>
<text class="">{{orderDetail.info.tableName}}</text> <text class="">{{orderDetail.info.tableName}}</text>
</view> </view>
@@ -25,11 +25,11 @@
<template v-else> <template v-else>
<template v-if="orderDetail.info.status=='unpaid'"> <template v-if="orderDetail.info.status=='unpaid'">
<view class="u-flex-1"> <view class="u-flex-1">
<my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" <my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" fontWeight="700" fontSize="32"
shape="circle" plain type="primary">加菜</my-button> shape="circle" plain type="primary">加菜</my-button>
</view> </view>
<view class="u-flex-1"> <view class="u-flex-1">
<my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" <my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" fontWeight="700" fontSize="32"
type="primary">结账</my-button> type="primary">结账</my-button>
</view> </view>
</template> </template>

View File

@@ -13,7 +13,7 @@
<view @click="showModel('editMoney',true)">修改</view> <view @click="showModel('editMoney',true)">修改</view>
</view> </view>
</view> </view>
<view class="content bg-fff box-shadow border-r-12"> <view class="content bg-fff border-r-12">
<view class=" u-p-t-30 u-p-l-26 u-p-r-26 card top u-m-t-30"> <view class=" u-p-t-30 u-p-l-26 u-p-r-26 card top u-m-t-30">
<view class="u-flex u-p-l-24 u-p-r-24 border-bottom-dashed u-row-between u-p-b-30"> <view class="u-flex u-p-l-24 u-p-r-24 border-bottom-dashed u-row-between u-p-b-30">
<view>优惠券</view> <view>优惠券</view>