oa单商品详情领券优惠券

前端开发-罗建龙
1 parent dd8f695c
Showing 3 changed files with 32 additions and 9 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/user/assistance/task_assistance.wxml
@@ -379,7 +379,7 @@ Page({
         is_closecoupon: json_d.is_closecoupon,
         is_newsales_rules: json_d.is_newsales_rules
       });
-      ee.init(gid);
+      // ee.init(gid);
       //------几人评价-------
       //n.init(th, "", "comments");
  
@@ -569,12 +569,16 @@ Page({
           is_share: 0,
         },
       }).then(res1 => {
+        console.log('优惠券+++++++++++++++++');
+        console.log(res1);
         fir_quan = res1.data.data.pageData;
       })
     }
     //过滤不是本商品的单品优惠券-------------------
     if (fir_quan.length > 0) {
-      let goodInfo = ee.data.data || {}
+      let goodInfo = th.data.data || {}
+      console.log('商品++++++++++++++++++++++');
+      console.log(goodInfo);
       for (let index = fir_quan.length - 1; index >= 0; index--) {
         if (fir_quan[index].useobjecttype == 20) { //判断是单品优惠券
           if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
@@ -583,6 +587,7 @@ Page({
         }
       }
     }
+    
     let arr = []
     let length = fir_quan.length
     if (length <= 3) {
@@ -787,7 +792,7 @@ Page({
               sele_g: t.data.data,
               userInfo: getApp().globalData.userInfo,
             });
-
+            ee.init(gid);
             //获取门店
             ee.get_sto();
             ee.get_sku(o.stoid, t.data.data, gid);
@@ -846,7 +851,7 @@ Page({
       ee.data.enterAddressPage && (this.data.enterAddressPage = !1);
     })
  
-
+   
  
   },
   enterAddress: function () {
@@ -83,7 +83,7 @@
             <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
 <!--            <view class="word-line fs26 xc-qtunit-price">-->
 <!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
-<!--            </view>-->
+<!--            </view>--> 
           </view>
  
  
@@ -148,6 +148,24 @@
         </view>
         <view class="t_gz" wx:if="{{is_show_gz==1}}">{{prom_act.remark}}</view>
       </view>
+              <!-- 许程 7.24暂时注释 -->
+      <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
+          <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
+            <view class="cx-sizs fs30">领券</view>
+            <view class="flex ai_c f1 pdh20">
+              <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
+                <view class="circle xc-circular xc-one"></view>
+                <view class="xc-coupon t-c four-level-word">
+                  满{{item.condition}}减{{item.money}}
+                </view>
+                <view class="circle xc-circular xc-two"></view>
+              </view>
+            </view>
+            <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
+              <text class="bg_jj"></text>
+            </view>
+          </view>
+        </view>
       <!-- 门店收货地址 -->
       <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
         <view class="address_frame" bindtap="choice_store" data-ind="0">
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="container" style="background-color:#{{bg_color ? bg_color:'d01119'}}">
-	<view class="top-back"  style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
+	<view class="top-back"  style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:40rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
 	<!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> -->
 	  <!-- 助力活动头部 -->
 	  <view class="top-frame">
@@ -55,18 +55,18 @@
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	    就选它了
 	  </view>
-	  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
+	  <view wx:if="{{  is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	    好友拆一拆
 	  </view>
     <!-- 任务超时失效 -->
-    <view class="invalid" wx:if="{{ is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}">
+    <view class="invalid fs28" wx:if="{{   is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}">
       <text>距离失效:</text>
       <view class="invalid_info" wx:if="{{invalidState}}"><text>{{invalidObj.h}}</text>:<text>{{invalidObj.m}}</text>:<text>{{invalidObj.s}}</text></view>
       <view class="invalid_info" wx:else>该任务已失效</view>
     </view>
  
-	  <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
+	  <view wx:if="{{ is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	   立即兑换
 	  </view>