1.修改确认订单页面 2.0

yj-dev
杨杰 2 years ago
parent 033c8ff68b
commit 8676e52307
  1. 14
      pages/goods/refuel-confirm/refuel-confirm.vue
  2. 4
      pages/order/confirmation.vue
  3. 11
      pages/tabBar/home/home.vue

@ -203,25 +203,25 @@
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items.highDiscount,items)"> @click="radioChanges(items,items)">
<image mode="widthFix" :src="imageUrl+items.highDiscount.discountImg"></image> <image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="alijus width60 margle10"> <view class="alijus width60 margle10">
<view class="width80p"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5"> <view class="font13 fcor999 mart5">
有效期:{{items.highDiscount.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} 有效期:{{items.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="width20 fotrt"> <view class="width20 fotrt">
<view> <view>
<radio <radio
v-if="items.highDiscount.discountCondition && orderPrice >= items.highDiscount.discountCondition" v-if="items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" /> color="#c72a20" :checked="items.id == memDiscountId" />
<radio <radio
v-if="items.highDiscount.discountCondition && orderPrice < items.highDiscount.discountCondition" v-if="items.discountCondition && orderPrice < items.discountCondition"
color="#c72a20" disabled="true" :checked="items.id == memDiscountId" /> color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
<radio v-if="!items.highDiscount.discountCondition" color="#c72a20" <radio v-if="!items.discountCondition" color="#c72a20"
:checked="items.id == memDiscountId" /> :checked="items.id == memDiscountId" />
</view> </view>
</view> </view>

@ -169,12 +169,12 @@
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items" <view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
@click="radioChanges(items)"> @click="radioChanges(items)">
<image mode="widthFix" class="flleft" :src="imageUrl+items.highDiscount.discountImg"></image> <image mode="widthFix" class="flleft" :src="imageUrl+items.discountImg"></image>
<view class="tcrig"> <view class="tcrig">
<view class="yhprice"> <view class="yhprice">
<radio :checked="items.id == memDiscountId" color="#0083f5" /> <radio :checked="items.id == memDiscountId" color="#0083f5" />
</view> </view>
<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期至{{items.useEndTime | formatDate('-')}}</view> <view class="font13 fcor999 mart5">有效期至{{items.useEndTime | formatDate('-')}}</view>
</view> </view>

@ -31,7 +31,7 @@
<!-- #endif --> <!-- #endif -->
</view> </view>
</view> </view>
<view style="height: 100%;background-color: red;" v-if="isdisplay"> <view v-if="isdisplay">
<image :src="imagewxUrl+imgadres5" class="width40w mart90" mode="widthFix"></image> <image :src="imagewxUrl+imgadres5" class="width40w mart90" mode="widthFix"></image>
</view> </view>
@ -112,8 +112,8 @@
<view class="width30 font14 fotrt fcor666">更多</view> <view class="width30 font14 fotrt fcor666">更多</view>
</view> </view>
<view class="width94 alijus mart20" v-if="item.type == 6 "> <view class="width94 alijus mart20" v-if="item.type == 6 ">
<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index"> <view class="backcorfff spcarea border-r" v-for="(goods,index) in item.childDate" :key="index">
<image mode="widthFix" class="width100" :src="imageUrl+goods.couponImg"></image> <image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0" :src="imageUrl+goods.couponImg"></image>
<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view> <view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
<view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
@ -121,8 +121,8 @@
</view> </view>
</view> </view>
<view class="width94 alijus mart20" v-if="item.type == 9 "> <view class="width94 alijus mart20" v-if="item.type == 9 ">
<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index"> <view class="backcorfff spcarea border-r" v-for="(goods,index) in item.childDate" :key="index">
<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image> <image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0" :src="imageUrl+goods.listImg"></image>
<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view> <view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
<view class="width96 fcor999 font11" v-if="goods.effectiveTiem"> <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}} {{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
@ -952,7 +952,6 @@
width: 31%; width: 31%;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
border-radius: 10px 10px 0px 0px;
padding-bottom: 10px; padding-bottom: 10px;
} }

Loading…
Cancel
Save