Authored by yyq

fix

... ... @@ -14,19 +14,21 @@
</view>
</block>
<block wx:else>
<view class="tips-wrap">
<view wx:if="{{shippingCostTips || priceDownTips}}" class="fixed-top-tips">
<view wx:if="{{priceDownTips}}" class="price-down-tips">
<text>{{priceDownTips}}</text>
<text class="iconfont icon-cha close-price-down" bindtap="closePriceDownTips"></text>
</view>
<view wx:else class="shipping-cost-tips">{{shippingCostTips}}</view>
<view class="edit-cart-btn" bindtap="editCartStatus">{{isEditing ? '完成' : '编辑商品'}}</view>
</view>
</view>
<scroll-view scroll-y class="cart-scoll-wrap" bindtouchstart="touchStartAction">
<view class="tips-wrap" wx:if="{{priceDownTips || shippingCostTips}}">
<view class="hold-text">
<text>{{priceDownTips || shippingCostTips}}</text>
</view>
<view wx:if="{{shippingCostTips || priceDownTips}}" class="fixed-top-tips">
<view wx:if="{{priceDownTips}}" class="price-down-tips">
<text>{{priceDownTips}}</text>
<text class="iconfont icon-cha close-price-down" bindtap="closePriceDownTips"></text>
</view>
<view wx:else class="shipping-cost-tips">{{shippingCostTips}}</view>
<view class="edit-cart-btn" bindtap="editCartStatus">{{isEditing ? '完成' : '编辑商品'}}</view>
</view>
</view>
<!-- 商品池 -->
... ... @@ -57,32 +59,31 @@
<view class="total-cost">{{shoppingCartData.promotion_formula}}</view>
<view class="split-line"></view>
<view class="footer-wrap">
<view class="footer-fixed">
<view class="select-all-btn" bindtap="selectAllGoods">
<text class="iconfont icon-duihao-fill" wx:if="{{isSelectAll}}"></text>
<text class="iconfont icon-round" wx:else></text>
<text>全选</text>
</view>
<view class="settlement-block">
<view class="delete-btn footer-option-btn" bindtap="mutilRemoveGoods" wx:if="{{isEditing}}">
<text>删除</text>
</view>
<block wx:else>
<view class="footer-total-cost">
<text class="cost">总计¥{{helper.round(shoppingCartData.last_order_amount)}}({{shoppingCartData.selected_goods_count}})件</text>
<text class="no-freight">不含运费</text>
</view>
<view class="payment-btn footer-option-btn" bindtap="paymentAction" style="{{shoppingCartData.selected_goods_count > 0 ? '' : 'background-color: #b0b0b0'}}">
<text>结算</text>
</view>
</block>
</view>
</view>
</view>
<view class="footer-wrap"></view>
</block>
</scroll-view>
<view class="footer-fixed">
<view class="select-all-btn" bindtap="selectAllGoods">
<text class="iconfont icon-duihao-fill" wx:if="{{isSelectAll}}"></text>
<text class="iconfont icon-round" wx:else></text>
<text>全选</text>
</view>
<view class="settlement-block">
<view class="delete-btn footer-option-btn" bindtap="mutilRemoveGoods" wx:if="{{isEditing}}">
<text>删除</text>
</view>
<block wx:else>
<view class="footer-total-cost">
<text class="cost">总计¥{{helper.round(shoppingCartData.last_order_amount)}}({{shoppingCartData.selected_goods_count}})件</text>
<text class="no-freight">不含运费</text>
</view>
<view class="payment-btn footer-option-btn" bindtap="paymentAction" style="{{shoppingCartData.selected_goods_count > 0 ? '' : 'background-color: #b0b0b0'}}">
<text>结算</text>
</view>
</block>
</view>
</view>
<template is="Picker" data="{{pickerData, loadingForPayment}}"/>
</block>
... ...
... ... @@ -127,7 +127,7 @@ page {
background-color: #eee;
}
.footer-wrap .footer-fixed {
.footer-fixed {
width: 100%;
height: 130rpx;
padding: 20rpx 0;
... ...