Commit fa67fb2bcde0d8423acce160aaf270e5633d2133

Authored by yvan.ni
1 parent e556692d

1、样式优化的

2、组合购的购买优化
components/promate_pop/promate_pop.wxml
@@ -31,17 +31,17 @@ @@ -31,17 +31,17 @@
31 <view wx:else class="fs22" style="max-width: 430rpx; color: #b9b6b6"> 31 <view wx:else class="fs22" style="max-width: 430rpx; color: #b9b6b6">
32 <block wx:for="{{item.more}}" wx:for-item="bm"> 32 <block wx:for="{{item.more}}" wx:for-item="bm">
33 <text wx:if="{{bm.is_fir}}" class="tick pdr20" >{{bm.text}}</text> 33 <text wx:if="{{bm.is_fir}}" class="tick pdr20" >{{bm.text}}</text>
34 - <view wx:if="{{bm.is_quan}}">{{bm.text}}</view>  
35 - <view wx:if="{{bm.is_gift}}" bindtap="show_zp" 34 + <view class="tick pdr20" wx:if="{{bm.is_quan}}">{{bm.text}}</view>
  35 + <view class="tick pdr20 ellipsis-1x lh2 details " wx:if="{{bm.is_gift}}" bindtap="show_zp"
36 data-index="{{item.yh_index}}" data-prom="{{bm.prom_id}}" >{{bm.text}}</view> 36 data-index="{{item.yh_index}}" data-prom="{{bm.prom_id}}" >{{bm.text}}</view>
37 <!-- 旧礼包 --> 37 <!-- 旧礼包 -->
38 - <view wx:if="{{bm.lb_id}}" 38 + <view class="tick pdr20 ellipsis-1x lh2 details" wx:if="{{bm.lb_id}}"
39 data-id="{{bm.lb_id}}" bindtap="viewLbDetails">{{bm.text}}</view> 39 data-id="{{bm.lb_id}}" bindtap="viewLbDetails">{{bm.text}}</view>
40 <!-- 专享礼包 --> 40 <!-- 专享礼包 -->
41 - <view wx:if="{{bm.zxlb_id}}" 41 + <view class="tick pdr20 ellipsis-1x lh2 details" wx:if="{{bm.zxlb_id}}"
42 data-id="{{bm.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">{{bm.text}}</view> 42 data-id="{{bm.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">{{bm.text}}</view>
43 <!-- 月礼包 --> 43 <!-- 月礼包 -->
44 - <view wx:if="{{bm.monthgiftbag_id}}" 44 + <view class="tick pdr20 ellipsis-1x lh2 details" wx:if="{{bm.monthgiftbag_id}}"
45 data-id="{{bm.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">{{bm.text}}</view> 45 data-id="{{bm.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">{{bm.text}}</view>
46 46
47 </block> 47 </block>
components/promate_pop/promate_pop.wxss
@@ -201,13 +201,28 @@ @@ -201,13 +201,28 @@
201 display: inline-block; 201 display: inline-block;
202 vertical-align: middle; 202 vertical-align: middle;
203 margin-top: -4rpx; 203 margin-top: -4rpx;
204 - margin-right: 8rpx; 204 + margin-right: 12rpx;
205 width: 22rpx; 205 width: 22rpx;
206 height: 22rpx; 206 height: 22rpx;
207 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat; 207 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
208 background-size: 22rpx auto; 208 background-size: 22rpx auto;
209 } 209 }
210 210
  211 +.details::after {
  212 + content: '';
  213 + position: absolute;
  214 + right: 0;
  215 + top: 0;
  216 + bottom: 0;
  217 + margin: auto;
  218 + display: inline-block;
  219 + width: 40rpx;
  220 + height: 40rpx;
  221 + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTIyMjCYmJiYmJi0tLY+PjyYmJidnOsIAAAAGdFJOUwDt6aYcSSEXj/YAAAA8SURBVCjPY2AYBTQBLEbKDhiCTmlpKggeq2AAiDJLS0tGcBkFBUActbS0JAY4F6sgVu1YLcLnpFFAFQAATwgLKVhjC9UAAAAASUVORK5CYII=);
  222 + background-repeat: no-repeat;
  223 + background-size: 40rpx auto;
  224 +}
  225 +
211 .r_item_pro{ 226 .r_item_pro{
212 position: absolute; 227 position: absolute;
213 right: 18rpx; 228 right: 18rpx;
@@ -260,4 +275,6 @@ @@ -260,4 +275,6 @@
260 height: 22rpx; 275 height: 22rpx;
261 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat; 276 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
262 background-size: 22rpx auto; 277 background-size: 22rpx auto;
263 -}  
264 \ No newline at end of file 278 \ No newline at end of file
  279 +}
  280 +
  281 +.lh2 { line-height: 2; }
packageE/pages/cart/cart2/cart2.js
@@ -7795,6 +7795,9 @@ Page({ @@ -7795,6 +7795,9 @@ Page({
7795 7795
7796 if(ck_res.code==0){ 7796 if(ck_res.code==0){
7797 th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type; 7797 th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
  7798 + th.data.cartlist[idx].show_can_cx[gd_key].cur_act=ck_prom_type;
  7799 +
  7800 +
7798 var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y)); 7801 var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y));
7799 var goods=[]; 7802 var goods=[];
7800 for(var ik=0;ik<goods0.length;ik++){ 7803 for(var ik=0;ik<goods0.length;ik++){