Merge branch 'dev' into 'test'

Dev See merge request !1157

Merge branch 'dev' into 'test'
Dev See merge request !1157
后端研发-苏明海
2 parents 09721c16 3b02e2b2
Showing 3 changed files with 54 additions and 5 deletions
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -545,7 +545,16 @@ Page({
                 }
               }).then(res => {
                 if (res.data.code == 0) {
-                  prom = res.data.data
+                   //开始时间已经开始的情况
+                   for(var i=0;i<res.data.data.length;i++){
+                        var a_item=res.data.data[i];
+                        if(a_item.s_time<now) {
+                          if(!prom) prom=[];
+                          prom.push(a_item);
+                        }
+                   }
+
+                   
                 }
               })
               let prom_true = 0
@@ -3215,6 +3215,13 @@ Page({
           prom = res.data.data;
         }
       })
+      let times = new Date().getTime()
+      prom.show_time_off=""  
+      let atimes= prom.start_time*1000   
+       
+      if(atimes>times){
+        prom.show_time_off=ut.formatTime(prom.start_time)
+      }
     }
     console.log('活动详情------------');
     console.log(prom);
@@ -4197,6 +4204,14 @@ Page({
         if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
           var inte_data = res.data.data.pageData[0];
           var can_integral = (parseFloat(integrals) >= parseFloat(inte_data.integral));
+          let times = new Date().getTime()
+          inte_data.show_time_off=""  
+          let atimes= inte_data.start_time*1000   
+           
+          if(atimes>times){
+            inte_data.show_time_off=ut.formatTime(inte_data.start_time)
+          }
+          
           ee.setData({
             prom_price: parseFloat(inte_data.addmoney),
             prom_integral: parseFloat(inte_data.integral),
@@ -282,6 +282,9 @@
                 <view class="fs22 c-7b">分享</view>
               </view>
             </view>
+            <view class="goods-num" style="font-size: 30rpx;margin: 18rpx 0;" wx:if="{{ prom_act.show_time_off}}">
+              {{prom_act.show_time_off}}开始兑换
+            </view>
             <view class="goods-title">
               <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
               <view class="goods-name elli">{{data.goods_name}}</view>
@@ -1167,15 +1170,37 @@
           </view>
           <view>单独购买</view>
         </view>
-        <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}">
-          立即兑换
+        <!-- <block wx:if="{{can_integral}}">        
+          <view  class="buy-btn cart-btn" wx:if="{{false && prom_act.show_time_off}}" style="background-color: #aaa;" >
+            即将开始1
+          </view>
+          <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:else>
+            立即兑换1
+          </view>
+
+        </block> -->
+        <view  class="buy-btn-all cart-btn" style="width: 30%; margin-left:1%;" wx:if="{{can_integral}}">
+          <!-- 立即兑换 -->
+          <!-- <view wx:if="{{ prom_act.show_time_off}}" >即将开始</view> -->
+          <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;">即将开始</view>
+          <view bindtap="go_pay_integral" wx:else>立即兑换</view>
         </view>
         <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else>积分不足</view>
       </block>
       <block wx:else>
-        <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}">
-          立即兑换
+        <view  class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}">         
+          <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;" >即将开始</view>
+          <view bindtap="go_pay_integral" wx:else>立即兑换</view>
         </view>
+        <!-- <block wx:if="{{can_integral}}">        
+          <view  class="buy-btn cart-btn" wx:if="{{false && prom_act.show_time_off}}" style="background-color: #aaa;" >
+            即将开始
+          </view>
+          <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:else>
+            立即兑换1
+          </view> -->
+
+        <!-- </block> -->
         <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else>
           积分不足
         </view>