From fa67fb2bcde0d8423acce160aaf270e5633d2133 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 4 Jul 2023 14:07:56 +0800
Subject: [PATCH] 1、样式优化的 2、组合购的购买优化

---
 components/promate_pop/promate_pop.wxml | 10 +++++-----
 components/promate_pop/promate_pop.wxss | 21 +++++++++++++++++++--
 packageE/pages/cart/cart2/cart2.js      |  3 +++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/components/promate_pop/promate_pop.wxml b/components/promate_pop/promate_pop.wxml
index ce4bb0c..ce72320 100644
--- a/components/promate_pop/promate_pop.wxml
+++ b/components/promate_pop/promate_pop.wxml
@@ -31,17 +31,17 @@
                             <view wx:else class="fs22" style="max-width: 430rpx; color: #b9b6b6">
                                 <block  wx:for="{{item.more}}" wx:for-item="bm">
                                     <text wx:if="{{bm.is_fir}}" class="tick pdr20" >{{bm.text}}</text>
-                                    <view wx:if="{{bm.is_quan}}">{{bm.text}}</view>
-                                    <view wx:if="{{bm.is_gift}}"  bindtap="show_zp"
+                                    <view class="tick pdr20"  wx:if="{{bm.is_quan}}">{{bm.text}}</view>
+                                    <view class="tick pdr20 ellipsis-1x lh2 details  "  wx:if="{{bm.is_gift}}"  bindtap="show_zp"
                                           data-index="{{item.yh_index}}" data-prom="{{bm.prom_id}}" >{{bm.text}}</view>
                                     <!-- 旧礼包 -->
-                                    <view wx:if="{{bm.lb_id}}"
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.lb_id}}"
                                           data-id="{{bm.lb_id}}" bindtap="viewLbDetails">{{bm.text}}</view>
                                     <!-- 专享礼包 -->
-                                    <view wx:if="{{bm.zxlb_id}}"
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.zxlb_id}}"
                                           data-id="{{bm.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">{{bm.text}}</view>
                                     <!-- 月礼包 -->
-                                    <view wx:if="{{bm.monthgiftbag_id}}"
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.monthgiftbag_id}}"
                                           data-id="{{bm.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">{{bm.text}}</view>
 
                                 </block>
diff --git a/components/promate_pop/promate_pop.wxss b/components/promate_pop/promate_pop.wxss
index 1865299..cdfc171 100644
--- a/components/promate_pop/promate_pop.wxss
+++ b/components/promate_pop/promate_pop.wxss
@@ -201,13 +201,28 @@
     display: inline-block;
     vertical-align: middle;
     margin-top: -4rpx;
-    margin-right: 8rpx;
+    margin-right: 12rpx;
     width: 22rpx;
     height: 22rpx;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
     background-size: 22rpx auto;
 }
 
+.details::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    display: inline-block;
+    width: 40rpx;
+    height: 40rpx;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTIyMjCYmJiYmJi0tLY+PjyYmJidnOsIAAAAGdFJOUwDt6aYcSSEXj/YAAAA8SURBVCjPY2AYBTQBLEbKDhiCTmlpKggeq2AAiDJLS0tGcBkFBUActbS0JAY4F6sgVu1YLcLnpFFAFQAATwgLKVhjC9UAAAAASUVORK5CYII=);
+    background-repeat: no-repeat;
+    background-size: 40rpx auto;
+}
+
 .r_item_pro{
     position: absolute;
     right: 18rpx;
@@ -260,4 +275,6 @@
     height: 22rpx;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
     background-size: 22rpx auto;
-}
\ No newline at end of file
+}
+
+.lh2 { line-height: 2; }
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 6c78491..3998ee6 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -7795,6 +7795,9 @@ Page({
 
       if(ck_res.code==0){
         th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
+        th.data.cartlist[idx].show_can_cx[gd_key].cur_act=ck_prom_type;
+
+
         var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y));
         var goods=[];
         for(var ik=0;ik<goods0.length;ik++){
--
libgit2 0.21.4