Commit fb494d72 by zhangzhen

细节优化

parent 5d8b91a7
<template>
<view class="home" @touchstart="onTouchStart" @touchend="onTouchEnd">
<f-navbar :title="'凑角-'+storeInfo.name" :isShowTransparentTitle="false" :isShowLeft="false" fontColor="#ffffff"
:fontSize="38" bgColor="#E40583" :scrollTop="scrollTop" navbarType='5'></f-navbar>
:fontSize="38" bgColor="#f73573" :scrollTop="scrollTop" navbarType='5'></f-navbar>
<view class="header-content" :style="{paddingTop:statusBarHeight+'px' }">
<image class="logo-bg" :src="assetsPath +'/logo_v1.png'" mode="widthFix"></image>
......
......@@ -268,7 +268,7 @@
<text class="text-pink text-bold">{{computePriceInfo.availableBalance}}</text>
</view>
<view class="flex-row-center margin-right-sm">
<!-- <text>{{userInfo.memberConfig.levelName}}: <textclass="text-pink text-bold">{{userInfo.memberConfig.discountRatio}}</text></text> -->
<!-- <text>{{userInfo.memberConfig.levelName}}: <text class="text-pink text-bold">{{userInfo.memberConfig.discountRatio}}</text></text> -->
</view>
</view>
<view class="flex-row-center">
......@@ -287,7 +287,7 @@
</view>
<view class="flex-row-center">
<text
class="text-pink text-bold margin-right-sm">{{Number(computePriceInfo.duration)? '-'+Number(computePriceInfo.duration).toFixed(1) : 0}}</text>
class="text-pink text-bold margin-right-sm">{{Number(computePriceInfo.duration)? '-'+Number(computePriceInfo.duration).toFixed(1)+'小时' : 0}}</text>
</view>
</label>
......@@ -308,15 +308,7 @@
<text class="cuIcon-right " :class="useCouponList.length?'text-pink':'text-gray'"></text>
</view>
</view>
<view v-if="computePriceInfo.totalFeeNow" class="flex-between price">
<text class="text-black text-left">应付金额</text>
<view class="flex-row">
<text class="text-pink"></text>
<text class="text-pink text-lg text-bold">{{computePriceInfo.totalFeeNow||0}}</text>
</view>
</view>
<view v-if="computePriceInfo.discount > 0 && computePriceInfo.discount < 100" class="flex-between price">
<!-- <view v-if="computePriceInfo.discount > 0 && computePriceInfo.discount < 100" class="flex-between price">
<view class="flex-row-center">
<text class="text-black text-left">会员折扣</text>
<view class="vip-tag-box">
......@@ -329,6 +321,27 @@
<text class="text-pink text-bold"></text>
<text class="text-pink text-lg text-bold">{{ Number(computePriceInfo.memberDiscount).toFixed(2)}}</text>
</view>
</view> -->
<view class="flex-between price">
<view class="flex-row-center">
<text class="text-black text-left">实付金额:</text>
<text class="text-pink"></text>
<text class="text-pink text-lg text-bold">{{computePriceInfo.payFee||0}}</text>
</view>
<view class="flex-row-center">
<view v-if="computePriceInfo.discount > 0 && computePriceInfo.discount < 100" class="flex-row-center">
<view class="vip-tag-box">
<image :src="assetsPath+'/huiyuan.png'" mode="widthFix"></image>
<text>{{userInfo.memberConfig.levelName}}{{computePriceInfo.discountText || computePriceInfo.discount}}</text>
</view>
</view>
<view v-else class="">
<text>无会员折扣</text>
</view>
</view>
</view>
<!-- <view v-if="userInfo && computePriceInfo.availableDuration" class="flex-between price">
......@@ -364,15 +377,20 @@
</view>
<view class="pay-content-box">
<view class="flex-row">
<text class="text-title">实付</text>
<view class="flex-row margin-left">
<text class="text-pink"></text>
<text class="text-xxl text-bold amount">{{computePriceInfo.payFee}}</text>
<view class="flex-col">
<view v-if="computePriceInfo.discount > 0 && computePriceInfo.discount < 100" class="flex-row-center">
<text class="text-sm text-title">优惠金额:</text>
<text class="text-pink text-sm margin-left-sm"></text>
<text class="text-pink text-bold">{{ Number(computePriceInfo.memberDiscount).toFixed(2)}}</text>
</view>
<view class="flex-row-center">
<text class="text-title">待支付:</text>
<text class="text-pink margin-left-sm"></text>
<text class="text-xxl text-pink text-bold amount">{{computePriceInfo.payFee}}</text>
</view>
</view>
<view class="btn-box">
<button class="cu-btn cu-btn-1 margin-right" @tap="onNavToCheckedCoupon">团购验券</button>
<button class="cu-btn cu-btn-1 margin-right-sm" @tap="onNavToCheckedCoupon">团购验券</button>
<button class="cu-btn cu-btn-2 " @tap="onOrderConfirmBefore">{{orderType===1?'预约':'续单'}} </button>
</view>
</view>
......@@ -455,7 +473,7 @@
<text class="text-des">充值会员后,每一次消费的积分可自动 累计,用于升级订房折扣,最高打88折</text>
</view>
<button class="cu-btn" @tap="onNavToRecharge">
<button class="cu-btn" @tap="onNavToRecharge(1)">
立即充值
</button>
</view>
......@@ -803,7 +821,10 @@
}
})
},
onNavToRecharge() {
onNavToRecharge(val) {
if(val ==1){
uni.setStorageSync('rechargeTip', true)
}
uni.switchTab({
url: '/pages/vipCreate/vipCreate'
})
......@@ -819,7 +840,7 @@
if (this.radioChecked === e) {
this.radioChecked = ''
if (this.useCouponList && this.useCouponList.length) {
this.selectCouponIndex = 0;
this.selectCouponIndex = this.useCouponList.findIndex(item => item.isAvailable === 0)
}
} else {
this.radioChecked = e
......@@ -2802,7 +2823,7 @@
}
.text-left {
width: 120upx;
// width: 120upx;
text-align-last: justify;
font-weight: 600;
font-size: 30rpx;
......@@ -2834,16 +2855,16 @@
align-items: center;
background: linear-gradient(to right, rgba(255, 255, 255, 0.2), rgba(157, 18, 196, 0.3));
color: #9D1260;
font-size: 16upx;
height: 34upx;
border-radius: 18upx;
font-size: 24upx;
height: 48upx;
border-radius: 24upx;
padding: 0 12upx;
margin-left: 6upx;
image {
width: 22upx;
max-height: 22upx;
margin-right: 4upx;
width: 28upx;
max-height: 28upx;
margin-right: 8upx;
}
}
}
......@@ -2876,7 +2897,7 @@
height: 120rpx;
background: #FFFFFF;
box-shadow: 0rpx 5rpx 25rpx 0rpx rgba(0, 0, 0, 0.1);
padding: 0 30upx;
padding: 0 20upx;
z-index: 66;
>.flex-row {
......@@ -2898,12 +2919,12 @@
.btn-box {
.cu-btn-1 {
width: 159rpx;
width: 154rpx;
line-height: 58rpx;
background: linear-gradient(97deg, #FADB4A, #FFA751);
box-shadow: 0rpx 5rpx 9rpx 0rpx rgba(54, 4, 9, 0.42);
opacity: 0.95;
border-radius: 29rpx;
border-radius: 33rpx;
font-size: 30upx;
text-align: center;
color: #ffffff;
......@@ -2911,7 +2932,7 @@
}
.cu-btn-2 {
width: 159rpx;
width: 154rpx;
line-height: 58rpx;
background: linear-gradient(97deg, #E5268B, #FD5661);
box-shadow: 0rpx 5rpx 9rpx 0rpx rgba(54, 4, 9, 0.42);
......
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