From d09da57a5ce4aada8bb7021aeb890b20cf9f8143 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 7 Jul 2023 09:05:05 +0800
Subject: [PATCH] 小程序bug优化

---
 packageE/pages/cart/cart2/cart2.js   |  27 +++++++++++++++++++++++++--
 packageE/pages/cart/cart2/cart2.wxml | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
 pages/goods/goodsList/goodsList.js   |  22 ++++++++++++++++++++++
 pages/goods/goodsList/goodsList.wxml |   2 ++
 4 files changed, 126 insertions(+), 67 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 25ab894..45addc6 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -168,6 +168,8 @@ Page({
 
     bconfig: null,
     showFold:true,
+
+    ly_map:{}
   },
 
 
@@ -1036,8 +1038,11 @@ Page({
                 }
 
               }
-              arr[j].exp_type = e_t;
-              if (e_t == 0) th.setData({ is_all_zt: 0 });
+              if(car_item.is_gift != 1){
+                  arr[j].exp_type = e_t;
+                 if (e_t == 0) th.setData({ is_all_zt: 0 });
+              }
+
               //else if (e_t == 1) th.setData({ is_all_zt: 1 });
             }
 
@@ -2094,6 +2099,8 @@ Page({
       payWithPoints: !(t.detail.value.length > 0)
     });
   },
+
+
   keyUpChangeNum: function (t) {
     var index = t.currentTarget.dataset.index;
     var txt = "user_note." + index;
@@ -2104,6 +2111,22 @@ Page({
   },
 
 
+  show_ly:function (t){
+     var index = t.currentTarget.dataset.index;
+     var txt='ly_map['+index+']';
+     this.setData({
+       [txt]:1
+     })
+  },
+
+  hide_ly:function (t){
+      var index = t.currentTarget.dataset.index;
+      var txt='ly_map['+index+']';
+      this.setData({
+        [txt]:0
+      })
+  },
+
   //寻找活动在列表中的最后一个
   find_pro_last(ord_goods,prom_type,prom_id){
        if(!ord_goods || ord_goods.length==0) return -1;
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index ced56d9..17eaaed 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -251,6 +251,68 @@
           <view bindtap="buycard" class="card_op">立即开通</view>
         </view>
 
+        <!-- 有送礼包 -->
+        <view wx:if="{{send_lb[item.pickup_id]}}">
+          <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.l_id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
+                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+              </view>
+              <view class="flex ai_c">
+                x{{send.num}}<text class="bg_jj"></text>
+              </view>
+            </view>
+          </block>
+        </view>
+        <!-- 每月礼包 -->
+        <view wx:if="{{month_lb[item.pickup_id]}}">
+          <block wx:for="{{month_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.month_id}}" data-flag="2" bindtap="viewLbDetails">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{send.monthlbtitle}}
+                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+              </view>
+              <view class="flex ai_c">
+                x{{send.monthnum}}<text class="bg_jj"></text>
+              </view>
+            </view>
+          </block>
+        </view>
+        <!-- 赠品的显示 -->
+        <view wx:if="{{send_gf[item.pickup_id]}}">
+          <block wx:for="{{send_gf[item.pickup_id]}}" wx:for-item="iter">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{item.pickup_id}}" data-index="{{index}}" bindtap="show_sele_gift">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
+              </view>
+
+              <view class="flex ai_c" wx:if="{{iter.selected}}">
+                已选择<text class="bg_jj"></text>
+              </view>
+
+              <view class="flex ai_c" wx:else="{{}}">
+                未选择<text class="bg_jj"></text>
+              </view>
+
+            </view>
+          </block>
+        </view>
+
+        <!-----使用优惠券------>
+        <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{!(yh_is_xz_yh[item.pickup_id]) && ((item.quan_list && item.quan_list.length>0  ) || get_by_quan_list_cart[item.pickup_id]!=null && item.can_num>0)}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
+          <view class="work-frame flex-space-between">
+            <view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view>
+            <view class="xc-right-frame">
+              <text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text>
+              <text wx:if="{{using_quan[item.pickup_id].money}}">￥{{using_quan[item.pickup_id].money}}元优惠券</text>
+              <text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text>
+              <view class="xc-right"></view>
+            </view>
+          </view>
+        </view>
+
+
         <view class="set-mes bdr_b-14">
           <view wx:if="{{order.store_prom}}">
             <icon color="#f23030" size="16" type="info"></icon>
@@ -322,70 +384,8 @@
           </block>
         </view>
 
-        <!-- 有送礼包 -->
-        <view wx:if="{{send_lb[item.pickup_id]}}">
-          <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
-            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.l_id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
-              <view class="flex ai_c">
-                <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
-                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
-              </view>
-              <view class="flex ai_c">
-                x{{send.num}}<text class="bg_jj"></text>
-              </view>
-            </view>
-          </block>
-        </view>
-        <!-- 每月礼包 -->
-        <view wx:if="{{month_lb[item.pickup_id]}}">
-          <block wx:for="{{month_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
-            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.month_id}}" data-flag="2" bindtap="viewLbDetails">
-              <view class="flex ai_c">
-                <view class="circle1">赠</view>{{send.monthlbtitle}}
-                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
-              </view>
-              <view class="flex ai_c">
-                x{{send.monthnum}}<text class="bg_jj"></text>
-              </view>
-            </view>
-          </block>
-        </view>
-        <!-- 赠品的显示 -->
-        <view wx:if="{{send_gf[item.pickup_id]}}">
-          <block wx:for="{{send_gf[item.pickup_id]}}" wx:for-item="iter">
-            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-pk="{{item.pickup_id}}" data-index="{{index}}" bindtap="show_sele_gift">
-              <view class="flex ai_c">
-                <view class="circle1">赠</view>{{iter.name}} 可选赠品{{iter.zp_num}}个
-              </view>
-
-              <view class="flex ai_c" wx:if="{{iter.selected}}">
-                已选择<text class="bg_jj"></text>
-              </view>
-
-              <view class="flex ai_c" wx:else="{{}}">
-                未选择<text class="bg_jj"></text>
-              </view>
-
-            </view>
-          </block>
-        </view>
-
-        <!-----使用优惠券------>
-        <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{!(yh_is_xz_yh[item.pickup_id]) && ((item.quan_list && item.quan_list.length>0  ) || get_by_quan_list_cart[item.pickup_id]!=null && item.can_num>0)}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
-          <view class="work-frame flex-space-between">
-            <view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view>
-            <view class="xc-right-frame">
-              <text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text>
-              <text wx:if="{{using_quan[item.pickup_id].money}}">￥{{using_quan[item.pickup_id].money}}元优惠券</text>
-              <text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text>
-              <view class="xc-right"></view>
-            </view>
-          </view>
-        </view>
-
-
-              <!-- 保障服务 -->
-         <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+        <!-- 保障服务 -->
+        <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
           <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
           <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
             <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
@@ -395,11 +395,23 @@
             </view>
           </view>
         </view>
+
         <!-- 留言 -->
         <view class="coupon-mes flex-vertical">
           <view>留言</view>
           <view class="leave-word">
-            <input placeholder="给商家留言，最多100字" bindinput="keyUpChangeNum" data-index="{{pidx}}" value="{{user_note[pidx]}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}" />
+
+            <block wx:if="{{ly_map[pidx]}}">
+                <input bindblur="hide_ly" bindinput="keyUpChangeNum"
+                       data-index="{{pidx}}" focus="{{ly_map[pidx]}}"  style="color:#8c8c8c"
+                       value="{{user_note[pidx]}}" class="word-box"
+                       maxlength="100" name="user_note_{{item.pickup_id}}" />
+            </block>
+            <block wx:else>
+               <text bindtap="show_ly"   style="color:#8c8c8c;font-size:26rpx;"
+                     data-index="{{pidx}}">{{user_note[pidx]?user_note[pidx]:'给商家留言，最多100字'}}</text>
+            </block>
+
 
           </view>
         </view>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 2216961..765e2e7 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -279,6 +279,28 @@ Page({
                         arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
                 })
             }
+
+            //--送专享礼包--
+            if(parseInt(content.is_zxlibao)) {
+                //-- 获取 --
+                await getApp().request.promiseGet("/api/weshop/marketing/giftbag/detail/getNew1?storeId="+oo.stoid+"&giftBagId="+content.zxlibao, {
+                }).then(res => {
+                    if(res.data.code==0 && res.data.data)
+                        arr[i].content.zxlb_name=res.data.data.lbTitle;
+                })
+            }
+
+            //--送专享礼包--
+            if(parseInt(content.is_monthgiftbag)) {
+                //-- 获取 --
+                await getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagForm/get/"+oo.stoid+"/"+content.monthgiftbag, {
+                }).then(res => {
+                    if(res.data.code==0 && res.data.data)
+                        arr[i].content.monthgift_name=res.data.data.act_name;
+                })
+            }
+
+
         }
         th.setData({prom_goods_list:arr});
     },
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 143baad..d130efb 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -13,6 +13,8 @@
            <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text>
            <text space="{{true}}" wx:if="{{item.content.is_gift  && item.content.is_gift!='0'}}">送{{item.content.zp_mode==1?'多赠品':item.content.gift_name}} </text>
            <text space="{{true}}" wx:if="{{item.content.is_libao && item.content.is_libao!='0'}}">送{{item.content.lb_name}} </text>
+           <text space="{{true}}" wx:if="{{item.content.is_zxlibao && item.content.is_zxlibao!='0'}}">送{{item.content.zxlb_name}} </text>
+           <text space="{{true}}" wx:if="{{item.content.is_monthgiftbag && item.content.is_monthgiftbag!='0'}}">送{{item.content.monthgift_name}} </text>
          </view>
      </block>
      <!-- 新增 -->
--
libgit2 0.21.4