Authored by yyq

tips

@@ -83,6 +83,11 @@ Page({ @@ -83,6 +83,11 @@ Page({
83 83
84 this._allGoodsList = resData.allGoodsList; 84 this._allGoodsList = resData.allGoodsList;
85 delete resData.allGoodsList; 85 delete resData.allGoodsList;
  86 +
  87 + if (this._closePriceDownTips) {
  88 + resData.priceDownTips = '';
  89 + }
  90 +
86 this.setData(resData); 91 this.setData(resData);
87 this._oldOrdinaryCartData = resData; 92 this._oldOrdinaryCartData = resData;
88 93
@@ -113,6 +118,10 @@ Page({ @@ -113,6 +118,10 @@ Page({
113 this._removeGoodsList = {}; 118 this._removeGoodsList = {};
114 this.setData(data); 119 this.setData(data);
115 }, 120 },
  121 + closePriceDownTips() {
  122 + this._closePriceDownTips = true;
  123 + this.setData({priceDownTips: ''});
  124 + },
116 editCart(list, selected) { 125 editCart(list, selected) {
117 list = cartHandle.changeGoodsListData(list, selected); 126 list = cartHandle.changeGoodsListData(list, selected);
118 127
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view wx:if="{{shippingCostTips || priceDownTips}}" class="fixed-top-tips"> 22 <view wx:if="{{shippingCostTips || priceDownTips}}" class="fixed-top-tips">
23 <view wx:if="{{priceDownTips}}" class="price-down-tips"> 23 <view wx:if="{{priceDownTips}}" class="price-down-tips">
24 <text>{{priceDownTips}}</text> 24 <text>{{priceDownTips}}</text>
25 - <text class="iconfont icon-top" bindtap='tapPriceDownTipsAction'></text> 25 + <text class="iconfont icon-cha close-price-down" bindtap="closePriceDownTips"></text>
26 </view> 26 </view>
27 <view wx:else class="shipping-cost-tips">{{shippingCostTips}}</view> 27 <view wx:else class="shipping-cost-tips">{{shippingCostTips}}</view>
28 <view class="edit-cart-btn" bindtap="editCartStatus">{{isEditing ? '完成' : '编辑商品'}}</view> 28 <view class="edit-cart-btn" bindtap="editCartStatus">{{isEditing ? '完成' : '编辑商品'}}</view>
@@ -68,8 +68,23 @@ page { @@ -68,8 +68,23 @@ page {
68 .tips-wrap .price-down-tips, 68 .tips-wrap .price-down-tips,
69 .tips-wrap .shipping-cost-tips { 69 .tips-wrap .shipping-cost-tips {
70 display: inline-block; 70 display: inline-block;
71 - max-width: 70%; 71 + width: 70%;
72 vertical-align: middle; 72 vertical-align: middle;
  73 + position: relative;
  74 +}
  75 +
  76 +.tips-wrap .close-price-down {
  77 + width: 36rpx;
  78 + height: 36rpx;
  79 + line-height: 36rpx;
  80 + border-radius: 18rpx;
  81 + background-color: #fff;
  82 + color: #444;
  83 + text-align: center;
  84 + position: absolute;
  85 + right: -40rpx;
  86 + top: 50%;
  87 + margin-top: -18rpx;
73 } 88 }
74 89
75 .tips-wrap .edit-cart-btn { 90 .tips-wrap .edit-cart-btn {