秒杀加购，支付混合2

pages/cart/cart.js

@@ -40,10 +40,15 @@ Page({
       });
     }
   },
+  onHide:function(){
+	 clearInterval(this.data.timer); 
+  },
   onLoad: function (options) {
-  	this.getCartList();
+	  clearInterval(this.data.timer);
+  	// this.getCartList();
   },
   onShow: function () {
+	  clearInterval(this.data.timer);
   	this.getCartList();
   	this.setData({submitlock: false});
   	this.setData({selectedall: false});
@@ -399,7 +404,7 @@ Page({
 	var runtime = setInterval(function () {
 		var _cartlist = that.data.cartList;
 		for(var index = 0;index<_cartlist.length;index++){
-			if(_cartlist[index].seckill_end > 0){
+			if(_cartlist[index].seckill_show_price > 0){
 				if(Date.parse(new Date()) / 1000 < _cartlist[index].seckill_end && Date.parse(new Date()) / 1000 > _cartlist[index].seckill_start){
 					var __cartdata = that.data.cartList[index];
 					var __cartindex = index;
@@ -469,7 +474,7 @@ Page({
 						
 					}else{
 						that.setData({
-							['seckillruntimearr['+index+']']:'秒杀已结束'
+							['seckillruntimearr['+index+']']:'秒杀已结束，左滑商品从购物车删除'
 						})
 					}
 				}

pages/pay/pay.js

@@ -322,7 +322,7 @@ Page({
       	if(that.data.useBalance && that.data.afterdec > 0){
       		wx.showModal({
 		      title: '提示',
-		      content: '当前使用提货券抵扣 '+ (that.data.balanceInfo.total / 100)+' 后，还需支付 '+(that.data.afterdec / 100)+' 使用微信支付?' ,
+		      content: '订单将抵扣 '+ (that.data.payData.coupon_price>0?that.data.payData.coupon_price/100:((that.data.total+that.data.yunfei)-that.data.afterdec) / 100)+' 元提货券，剩下 '+(that.data.afterdec / 100)+' 元将由微信支付，祝您购物愉快!' ,
 		      success: function (sm) {
 		        if (sm.confirm) {
 		            that.pay()

pages/pay/pay.wxml

@@ -140,6 +140,9 @@
         <view class="clean"></view>
       </view>
 -->
+	
+	
+	
 	<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == ''}}">
 		<view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
@@ -225,6 +228,10 @@
 	  </view>
 	  
 	  <view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
+	  	订单总金额 <text style="color:#F00">{{(payData.total_price + payData.freight) / 100}}</text>
+	  </view>
+	  
+	  <view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
 	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:((total+yunfei)-afterdec) / 100}}</text> 提货券
 	  </view>
 	  

pages/projects/project-detail/project-detail.wxml

@@ -188,7 +188,7 @@
 	  <!-- <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{!project.is_deliver && project.seckill_show_price <= 0 && project.left_count > 0}}">
 				<text>加入购物车</text>
 	  </button> -->
-	  <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{!project.is_deliver && project.seckill_show_price <= 0 && project.left_count > 0}}">
+	  <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{!project.is_deliver &&project.left_count > 0 && project.seckill_state !='end'}}">
 	  				<text>加入购物车</text>
 	  </button>
 	  <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{!project.is_deliver &&project.left_count > 0 && project.seckill_state !='end'}}" class="detail-footer-item">