From baf330218b0777a51f1d2bd60a66e62dd48bd88f Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 29 Oct 2019 10:01:43 +0800
Subject: [PATCH] 购买积分购商品，团购商品按照普通商品价格进行购买

---
 pages/goods/goodsInfo/goodsInfo.js   | 4 ++--
 pages/goods/goodsInfo/goodsInfo.wxml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index aa58d65..07ed823 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1501,9 +1501,9 @@ Page({
   async check_prom(gid, prom_type, prom_id) {
     var ee = this,
       th = ee;
-    if (prom_type == 3 || prom_type == 0) {
+    if (prom_type == 3 || prom_type == 0 ||  prom_type == 2 ||  prom_type == 4) {
       this.setData({
-        prom_type: prom_type,
+        prom_type: 0,
         isshow: 1,
       });
       return false;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 8c274b5..a7e6615 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -689,7 +689,7 @@
     <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
 
     <!---- 普通商品购买 ----->
-    <block wx:if="{{prom_type==0}}">
+    <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
 
     <block wx:if="{{sele_g.store_count>0}}">
       <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
--
libgit2 0.21.4