Skip to content

U
user
Commit 442340ee by 宋冰琦
Options

调整部分页面样式效果

parent 632be137
Showing with 44 additions and 27 deletions
components/Ticket/index.vue
...@@ -5,9 +5,18 @@ ...@@ -5,9 +5,18 @@
<view class="one_left"> <view class="one_left">
<view class="type" :style="[typeBackground]">{{info.typeDesc}}</view> <view class="type" :style="[typeBackground]">{{info.typeDesc}}</view>
<view class="price"> <view class="price">
<view :style="[priceColor]" v-if="info.couponType===1">{{info.price}}<span>元</span></view> <view class="price_box" :style="[priceColor]" v-if="info.couponType===1">
<view :style="[priceColor]" v-else-if="info.couponType===2">{{info.price}}<span>折</span></view> <view class="num">{{info.price}}</view>
<view :style="[priceColor]" class="dkStyle" v-else>{{info.price}}<span></span></view> <view class="dw">元</view>
</view>
<view class="price_box" :style="[priceColor]" v-else-if="info.couponType===2">
<view class="num">{{info.price}}</view>
<view class="dw">折</view>
</view>
<view class="price_box dkStyle" :style="[priceColor]" v-else>
<view class="num">{{info.price}}</view>
<view class="dw"></view>
</view>
</view> </view>
<view :style="[priceDescColor]" class="price_desc">{{info.priceDesc}}</view> <view :style="[priceDescColor]" class="price_desc">{{info.priceDesc}}</view>
</view> </view>
...@@ -181,7 +190,7 @@ export default { ...@@ -181,7 +190,7 @@ export default {
background: #FFFFFF; background: #FFFFFF;
.part { .part {
width: 100%; width: 100%;
margin-top: 32rpx; margin-top: 36rpx;
.partOne { .partOne {
width: 100%; width: 100%;
height: 241rpx; height: 241rpx;
...@@ -222,12 +231,18 @@ export default { ...@@ -222,12 +231,18 @@ export default {
line-height: 74rpx; line-height: 74rpx;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
margin-top: 40rpx; margin-top: 30rpx;
.price_box {
display: flex;
align-items: flex-end;
justify-content: center;
.dkStyle { .dkStyle {
font-size: 48rpx; font-size: 48rpx;
} }
span { .dw {
height: 34rpx; height: 40rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: Futura-Medium, Futura; font-family: Futura-Medium, Futura;
font-weight: 500; font-weight: 500;
...@@ -235,6 +250,7 @@ export default { ...@@ -235,6 +250,7 @@ export default {
line-height: 30rpx; line-height: 30rpx;
} }
} }
}
.price_desc { .price_desc {
height: 28rpx; height: 28rpx;
font-size: 20rpx; font-size: 20rpx;
...@@ -249,13 +265,14 @@ export default { ...@@ -249,13 +265,14 @@ export default {
.one_right { .one_right {
height: 198rpx; height: 198rpx;
width: calc(510rpx - 38rpx); width: calc(510rpx - 38rpx);
padding-left:68rpx;
.right_top { .right_top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-end;
padding-top: 42rpx; padding-top: 42rpx;
padding-bottom: 22rpx; padding-bottom: 22rpx;
margin-right: 32rpx; margin-right: 33rpx;
border-bottom: 1rpx solid #ECECEC; border-bottom: 1rpx solid #ECECEC;
.info { .info {
.title { .title {
...@@ -290,8 +307,9 @@ export default { ...@@ -290,8 +307,9 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 52rpx; line-height: 53rpx;
text-align: center; text-align: center;
margin-bottom: 6rpx;
} }
.gouse_dis { .gouse_dis {
width: 128rpx; width: 128rpx;
...@@ -303,8 +321,9 @@ export default { ...@@ -303,8 +321,9 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 52rpx; line-height: 53rpx;
text-align: center; text-align: center;
margin-bottom: 6rpx;
} }
.check{ .check{
width: 40rpx; width: 40rpx;
...@@ -321,7 +340,7 @@ export default { ...@@ -321,7 +340,7 @@ export default {
} }
} }
.right_bottom { .right_bottom {
padding-top: 22.96rpx; padding-top: 28.96rpx;
margin-right: 32rpx; margin-right: 32rpx;
.more_info { .more_info {
display: flex; display: flex;
......
components/menuAssembly/index.vue
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
let w = val[1].width let w = val[1].width
let h = val[1].height let h = val[1].height
if(w>80){ if(w>80){
w = 60 w = 80
} }
if(h>60){ if(h>60){
h = 60 h = 60
......
components/shopCar/shopCar.vue
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
} }
.scroll-Y { .scroll-Y {
max-height: 565rpx; max-height: 750rpx;
.container { .container {
flex: 1; flex: 1;
} }
......
mineSubPackage/pages/coupon/index.vue
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
} }
}) })
if(val){ if(val){
this.canuse = canuse.sort((a,b)=> {return a.status - b.status}) this.canuse = canuse
}else{ }else{
this.cantuse = canuse this.cantuse = canuse
} }
......
mineSubPackage/pages/userInfo/index.vue
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
} }
.infoItem { .infoItem {
height: 96rpx; height: 99rpx;
border-bottom: 1rpx solid #ECECEC; border-bottom: 1rpx solid #ECECEC;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -355,6 +355,8 @@ export default { ...@@ -355,6 +355,8 @@ export default {
background: #0050F6; background: #0050F6;
border-radius: 2px; border-radius: 2px;
font-size: 32rpx; font-size: 32rpx;
height: 96rpx;
line-height: 96rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
...@@ -363,6 +365,8 @@ export default { ...@@ -363,6 +365,8 @@ export default {
background: #0050F6; background: #0050F6;
border-radius: 2px; border-radius: 2px;
font-size: 32rpx; font-size: 32rpx;
height: 96rpx;
line-height: 96rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
......
orderSubPackage/pages/refundInfo/index.vue
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
{ {
skuName:'', skuName:'',
list: [{ list: [{
title:'待退款', title:'退款申请已提交',
time:'2022年6月2日09:35:27', time:'2022年6月2日09:35:27',
state:0, state:0,
}, },
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
const statusDesc = [ const statusDesc = [
{ {
state:0, state:0,
desc:'待退款' desc:'退款申请已提交'
}, },
{ {
state:1, state:1,
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
position: absolute; position: absolute;
top: -12rpx; top: -8rpx;
left: -10rpx; left: -10rpx;
.info_ciycle_action { .info_ciycle_action {
width: 22rpx; width: 22rpx;
......
orderSubPackage/pages/settlement/index.vue
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<div v-if="shopData.distance && shopData.distance!=-1" class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div> <div v-if="shopData.distance && shopData.distance!=-1" class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div>
<div v-else class="address_2">请确定门店后下单</div> <div v-else class="address_2">请确定门店后下单</div>
</div> </div>
<div class="take_order"></div>
<div> <div>
<div class="title">取单时间</div> <div class="title">取单时间</div>
<div class="time">现在下单，预计 <span class="min">{{ duration }}</span> 分钟后取餐</div> <div class="time">现在下单，预计 <span class="min">{{ duration }}</span> 分钟后取餐</div>
...@@ -649,6 +648,9 @@ export default { ...@@ -649,6 +648,9 @@ export default {
.address { .address {
margin-top: 17.81rpx; margin-top: 17.81rpx;
border-bottom: 0.1px solid #F4F4F4;
padding-bottom: 25.02rpx;
margin-bottom: 23.83rpx;
.address_1 { .address_1 {
...@@ -667,12 +669,6 @@ export default { ...@@ -667,12 +669,6 @@ export default {
} }
} }
.take_order {
margin-top: 25rpx;
padding-top: 23.83rpx;
border-top: 0.1px solid #F4F4F4;
height: 2rpx;
}
.title { .title {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
......
store/modules/order.js
...@@ -44,8 +44,6 @@ const order = { ...@@ -44,8 +44,6 @@ const order = {
couponAmount:item.couponAmount, couponAmount:item.couponAmount,
fitItem:item fitItem:item
} }
}).sort((a,b)=>{
return b.couponAmount - a.couponAmount
}) })
for(let i=0;i<canuse.length;i++){ for(let i=0;i<canuse.length;i++){
if(i===0){ if(i===0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment