From 21f10250c5164dbad7755097f4d62b98d50ff142 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 7 Jul 2023 14:53:47 +0800
Subject: [PATCH] 商品详情页面点击跳转

---
 packageE/pages/cart/cart2/cart2.wxml          | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-------------------
 packageE/pages/cart/cart2/filter.wxs          |  2 +-
 packageE/pages/cart/cart2/ladder_calculate.js | 25 ++++++++++++++++++-------
 pages/goods/goodsInfo/goodsInfo.js            |  4 +---
 4 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index bec5f7b..7fb0fa7 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -119,26 +119,55 @@
              <!-- 验证活动是不是多个，要不要显示切换 -->
              <!-- 新增促销多活动的排版,单商品的时候 -->
              <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1)}}">
-               <view class="bdb16" wx:if="{{util.check_show(items,item.show_can_cx[items.goods_id].cur_act.prom_type)}}">
-                 
-                 <view bindtap="switch_cx_group"
-                       data-index="{{pidx}}"
-                       data-gd_key="{{items.goods_id}}"
-                       class="cx-frame flex" style="position: relative">
-                   <view class="cx-sizs fs30">促销</view>
-                   <view class="flex ai_c f1 pdh20">
-                     <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                       <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                       <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                       <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                       <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+
+               <!-- 组合购和阶梯促销要特殊出来 -->
+               <block wx:if="{{item.show_can_cx[items.goods_id].sele_prom_type==7 || item.show_can_cx[items.goods_id].sele_prom_type==10 }}">
+                 <!-- 是不是活动的最后一个商品 -->
+                 <view class="bdb16" wx:if="{{items.is_act_last}}"  >
+                   <view bindtap="switch_cx_group"
+                         data-index="{{pidx}}"
+                         data-gd_key="{{items.goods_id}}"
+                         class="cx-frame flex" style="position: relative">
+                     <view class="cx-sizs fs30">促销</view>
+                     <view class="flex ai_c f1 pdh20">
+                       <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
+                         <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                       </view>
+                     </view>
+                     <view class="cx-obtain-coupon wsize">
+                       <text class="bg_jj"></text>
                      </view>
                    </view>
-                   <view class="cx-obtain-coupon wsize">
-                     <text class="bg_jj"></text>
+                 </view>
+
+               </block>
+               <block wx:else>
+                   <view class="bdb16">
+                   <view bindtap="switch_cx_group"
+                         data-index="{{pidx}}"
+                         data-gd_key="{{items.goods_id}}"
+                         class="cx-frame flex" style="position: relative">
+                     <view class="cx-sizs fs30">促销</view>
+                     <view class="flex ai_c f1 pdh20">
+                       <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
+                         <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                       </view>
+                     </view>
+                     <view class="cx-obtain-coupon wsize">
+                       <text class="bg_jj"></text>
+                     </view>
                    </view>
                  </view>
-               </view>
+               </block>
+
+
+
              </block>
 
              <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换，同时要最后一个商品显示 -->
@@ -146,9 +175,9 @@
              <block wx:if="{{item.show_can_cx}}">
                     <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
 
+                      <!-- 组合购和阶梯促销要特殊出来 -->
                       <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
-
-
+                        <!-- 是不是活动的最后一个商品 -->
                         <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
 
                           <view bindtap="switch_cx_group"
@@ -171,7 +200,7 @@
                         </view>
                       </block>
                       <block wx:else>
-                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id,items.is_act_last) }}" >
+                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) }}" >
                           <view bindtap="switch_cx_group"
                                 data-index="{{pidx}}"
                                 data-gd_key="{{index}}"
diff --git a/packageE/pages/cart/cart2/filter.wxs b/packageE/pages/cart/cart2/filter.wxs
index fe1b3c5..d217310 100644
--- a/packageE/pages/cart/cart2/filter.wxs
+++ b/packageE/pages/cart/cart2/filter.wxs
@@ -26,7 +26,7 @@ function check_show(items,sele_prom_type){
 //index多活动的索引
 //is_act_last 是不是最后一个
 
-function check_is_last(index,goods_id,is_act_last){
+function check_is_last(index,goods_id){
     var gd_arr=index.split(',');
     var idx=-1;
     //-- 判断有没有包含商品 --
diff --git a/packageE/pages/cart/cart2/ladder_calculate.js b/packageE/pages/cart/cart2/ladder_calculate.js
index d9889cb..6beb282 100644
--- a/packageE/pages/cart/cart2/ladder_calculate.js
+++ b/packageE/pages/cart/cart2/ladder_calculate.js
@@ -101,6 +101,9 @@ module.exports = {
                 }
             }
 
+
+            //-- 暂存的数组 --
+            var temp_arr=[];
             if (Object.keys(goods_map).length) {
                 //这里就开始拆分提交订单时的列表
                 for (let j in goods_map) {
@@ -116,8 +119,8 @@ module.exports = {
                     new_g.prom_type = 0;
                     new_g.prom_id = 0;
                     new_g.is_ld_split=1;
-                    goods.push(new_g);
-                    //goods.splice(idx, 1);
+                    temp_arr.push(new_g);
+
                 }
             }
 
@@ -130,20 +133,28 @@ module.exports = {
                 goods.splice(idx, 1);
             }
 
-
-
+            var ls=-1;
             //-- 只统计是参与活动的商品 --
             for (var ij in goods) {
-                goods[ij].is_act_last=0;
-
                 var iter = goods[ij];
                 if (iter.prom_type != 10 || iter.prom_id != act_item.id) {
                     continue;
                 }
+                goods[ij].is_act_last=0;
                 all_price0 += iter.goods_num * iter.goods_price;
+                ls= parseInt(ij);
+            }
+
+            //-- 要在特定的位置插入商品 --
+            if(temp_arr){
+                for(var gh=0;gh<temp_arr.length;gh++){
+                    var idx=gh+ls+1;
+                    goods.splice(idx, 0,temp_arr[gh]);
+                }
+                ls+=temp_arr.length;
             }
+            goods[ls].is_act_last=1;
 
-            goods[goods.length-1].is_act_last=1;
 
             if(!c_item.ladder_prom_goods) c_item.ladder_prom_goods={};
             if(!c_item.ladder_prom_goods[act_item.id]) c_item.ladder_prom_goods[act_item.id]={};
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index eea6664..43d8d6e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2066,8 +2066,6 @@ Page({
           });
 
         } else {
-            newd.prom_type = 0;
-            newd.id = 0;
 
             newd['pick_name'] = th.data.sto_sele_name;
             newd['pick_dis'] = th.data.sto_sele_distr;
@@ -2138,7 +2136,7 @@ Page({
                 s.set_b_now(e);
                 getApp().goto("/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
               } else {
-
+                
                 //----其他就按照公众号的购物车立即购买形式来修改，先看会员在购物车中是否加入了该商品,立即购买的-----
                 getApp().request.get("/api/weshop/cart/page", {
                   data: {
--
libgit2 0.21.4