From f42cc048b77a34660abfc1753c4b5571ce8bdc80 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 18 Apr 2023 15:05:26 +0800
Subject: [PATCH] ~~ 不显示搭配购，  幸运购的普通购买 ~~

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 29 ++---------------------------
 2 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index a8f25c2..c0638c6 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -2031,7 +2031,7 @@ Page({
                 if (res.data.code == 0 && res.data.data.total > 0) {
                   for (let j in res.data.data.pageData) {
                     let item_j = res.data.data.pageData[j];
-                    var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
+                    var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
                     getApp().request.delete(url, {});
                   }
                 }
@@ -6399,25 +6399,81 @@ Page({
 
   //积分购和拼团的普通购买的的时候，要判断有没有全场优惠活动
   check_nor_promgood(goods_id, back) {
-    getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, {
-      success: function (res) {
+    var th=this;
+    var user_id=getApp().globalData.user_id;
+    //调用接口判断订单优惠，
+    getApp().request.get("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + goods_id + "/0" + "/" + user_id, {
+      success: async function (res) {
         if (res.data.code == 0 && res.data.data) {
+
           var obj = {};
-          if(res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0){
+          var r_data = res.data.data;
+          //暂时积分够 不和 优惠，阶梯重叠
+          if(th.data.zh_act){
             obj = {
-              act_id: res.data.data.promGoodsLists[0].prom_id,
+              act_id: th.data.zh_act.id,
               prom_type:3
             }
-          }else if(res.data.data.ladderLists){
+            back(obj);
+            return false;
+          }
+
+          if (r_data.collocationList) {
             obj = {
-              act_id: res.data.data.ladderLists[0].form_id,
-              prom_type:10
+              act_id: r_data.collocationList[0].prom_id,
+              prom_type:5
             }
+            obj.is_coupon=r_data.collocationPromList.is_coupon;
+            back(obj);
+            return false;
           }
 
+
+          var is_ok=1;
+          if (r_data.ladderLists) {
+            var act_id = r_data.ladderLists[0].form_id;
+            //-- 判断会员能不能参与阶梯促销 --
+            await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
+
+
+              if (res.data.code == 0 && res.data.data) {
+                var prom_content = "";
+                //暂定优惠促销还不能重叠
+                if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){
+                  return false;
+                }
+
+                if(res.data.data.good_object==1){
+                  r_data.promGoodsLists=null;
+                }
+                obj = {
+                  act_id: act_id,
+                  prom_type:10
+                }
+                back(obj);
+                is_ok=0
+                return false;
+              }
+            })
+          }
+
+          if(!is_ok) return  false;
+          if(r_data.promGoodsLists){
+            obj = {
+              act_id: r_data.promGoodsLists[0].prom_id,
+              prom_type:3
+            }
+            back(obj);
+            return false;
+          }
+
+          obj = {
+            act_id: 0,
+            prom_type:0
+          }
           back(obj);
-        } else {
-          back(0)
+
+
         }
       }
     })
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index ead2ea1..5ec27fe 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -530,9 +530,6 @@
           </view>
         </block> -->
         <!-- 判断是不是有秒杀 -->
-
-				
-				
 				
         <!-- <view class="bz_view flex bdt16" wx:if="{{bconfig}}">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
@@ -545,30 +542,8 @@
             <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> -->
           <!-- </view>
         </view> -->
-        <!-- - 搭配促销 -- -->
-        <view class="dp_cx_view" wx:if="{{collocationGoods}}">
-          <view class="bb_view">
-            <view>优惠热配</view>
-            <view class="red_bb" bindtap="go_prom_list">
-              查看全部
-              <text class="bg_jj"></text>
-            </view>
-          </view>
-          <!-- 搭配的显示 -->
-          <view class="flex" bindtap="go_prom_list">
-            <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
-            <view class="act_content">
-              <view class="fs32">{{collocationGoods.title}}</view>
-              <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">
-                搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}
-              </view>
-              <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
-              <view class="fs30 color-gray">
-                活动至{{filters.format_time(collocationGoods.end_time,1)}}
-              </view>
-            </view>
-          </view>
-        </view>
+
+
         <!-- - 宝贝评价 -- -->
         <view class="bdt16">
           <view class="bb_view">
--
libgit2 0.21.4