Skip to content

G
gxpt_wechat
Commit 75073c0c by zhangzhen
Options

优惠券列表、优惠券选择和订单套餐展示优化

parent 705ad9a5
Showing with 25 additions and 10 deletions
pages/couponList/index.vue
...@@ -7,10 +7,14 @@ ...@@ -7,10 +7,14 @@
</view> </view>
<view class="part-right"> <view class="part-right">
<view class="coupon-name"> <view class="coupon-name">
<text class="text-title text-lg text-bold">{{item.name}}</text> <text class="text-title text-lg text-bold" style="width: 64%;">{{item.name}}</text>
<text class="text-lg" :class="item.useStatus==0?'text-pink':'text-gray'">{{item.useStatus==0?'待使用':'已使用'}}</text> <text class="text-lg" :class="item.useStatus==0?'text-pink':'text-gray'">{{item.useStatus==0?'待使用':'已使用'}}</text>
</view> </view>
<view class="flex-row margin-top"> <view v-if="item.couponType == 4" class="flex-row margin-top">
<text class="">使用说明：</text>
<text>{{item.remark}}</text>
</view>
<view v-else class="flex-row margin-top">
<text class="">使用说明：</text> <text class="">使用说明：</text>
<text class="">满{{item.minPrice}}元，优惠{{item.subPrice}}元</text> <text class="">满{{item.minPrice}}元，优惠{{item.subPrice}}元</text>
</view> </view>
...@@ -153,6 +157,9 @@ ...@@ -153,6 +157,9 @@
align-items: center; align-items: center;
} }
} }
.margin-top{
margin-top: 12upx;
}
} }
} }
} }
......
pages/order/order.vue
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
<view v-for="(item,index) in packageMode" :key="index" class="flex-col item" <view v-for="(item,index) in packageMode" :key="index" class="flex-col item"
:class="{active: modeIndex===index}" :class="{active: modeIndex===index}"
@tap="onChangeMode(index)"> @tap="onChangeMode(index)">
<text class="text-title">{{item.name}}</text> <text class="text-title text-sm">{{item.duration}}小时套餐</text>
<view class="flex-row" style="margin-top: 8upx;"> <view class="flex-row" style="margin-top: 8upx;">
<text>{{item.duration}}小时/</text> <!-- <text>{{item.duration}}小时/</text>-->
<text >￥</text> <text >￥</text>
<text class="text-title text-bold text-xl">{{item.price}}</text> <text class="text-title text-bold text-xl">{{item.price}}</text>
</view> </view>
</view> </view>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</view> </view>
</view> </view>
<view class="flex-between price use-coupon-box"> <view class="flex-between price use-coupon-box">
<text class="text-black text-left">优惠券</text> <text class="text-black text-left">{{useCouponList[selectCouponIndex].couponType==2? '团购券':'优惠券'}}</text>
<view class="flex-row" @tap="onNavToSelectCoupon"> <view class="flex-row" @tap="onNavToSelectCoupon">
<text class="" :class="useCouponList.length?'text-pink':'text-gray'"> <text class="" :class="useCouponList.length?'text-pink':'text-gray'">
{{selectCouponIndex === -1 ? '请选择' : useCouponList.length && selectCouponIndex>=0? useCouponList[selectCouponIndex].name: '暂无可用'}}</text> {{selectCouponIndex === -1 ? '请选择' : useCouponList.length && selectCouponIndex>=0? useCouponList[selectCouponIndex].name: '暂无可用'}}</text>
...@@ -2029,10 +2029,10 @@ ...@@ -2029,10 +2029,10 @@
flex: 1; flex: 1;
height: 100%; height: 100%;
.text-title{ .text-title{
font-size: 25upx; // font-size: 25upx;
} }
.flex-row{ .flex-row{
font-size: 23upx; // font-size: 23upx;
} }
} }
} }
......
pages/useCoupon/index.vue
...@@ -8,10 +8,18 @@ ...@@ -8,10 +8,18 @@
<view class="coupon-name"> <view class="coupon-name">
<text class="text-title text-lg text-bold">{{item.name}}</text> <text class="text-title text-lg text-bold">{{item.name}}</text>
</view> </view>
<view class="flex-row margin-top"> <view v-if="item.couponType == 4" class="flex-row margin-top">
<text class="">使用说明：</text>
<text>{{item.remark}}</text>
</view>
<view v-else class="flex-row margin-top">
<text class="">使用说明：</text>
<text class="">满{{item.minPrice}}元，优惠{{item.subPrice}}元</text>
</view>
<!-- <view class="flex-row margin-top">
<text class="text-black">使用说明：</text> <text class="text-black">使用说明：</text>
<text class="text-black">满{{item.minPrice}}元，优惠{{item.subPrice}}元</text> <text class="text-black">满{{item.minPrice}}元，优惠{{item.subPrice}}元</text>
</view> </view> -->
<view v-if="item.couponTimeStart && item.couponTimeEnd" class="des margin-top"> <view v-if="item.couponTimeStart && item.couponTimeEnd" class="des margin-top">
<view class="flex-row"> <view class="flex-row">
<text class="text-black">可用时段：</text> <text class="text-black">可用时段：</text>
......
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