专区商品规格，专区和普通商品增加dliver相关，收入调整判断显示转为提货券

packageUser/pages/user/fund/fund.wxml

@@ -8,7 +8,7 @@
       <view class="fund__btn withdrawNot" wx:if="{{!cashTotal.available}}">暂无提现</view>
       <!--<view class="fund__btn recharge" bindtap="goRechargeClick">充值</view>-->
       
-      <view class="fund__btn withdraw" bindtap="toTransfer" disabled="{{cashTotal.available}}">转提货券</view>
+      <view class="fund__btn withdraw" bindtap="toTransfer" disabled="{{cashTotal.available && cashTotal.can_transfer}}">转提货券</view>
       <view class="clean"></view>
     </view>
     <view wx:if="{{false}}">

pages/areacart/areacart.js

@@ -19,6 +19,7 @@ Page({
     nowpage:1,
     cartMore:true,
 	showDialog: false,
+	checkbox:'',
   },
   handleMovableChange: function(e) {
     // this.data.currentX = e.detail.x;
@@ -66,6 +67,7 @@ Page({
     			res.data.list[i]['movex'] = 0;
     			res.data.list[i]['IsBuy'] = false;
     			res.data.list[i]['count'] = 1;
+				res.data.list[i]['overtype'] = res.data.list[i]['have_size'] ? false:true;
     		}
     		that.setData({
     			cartMore: res.data.list_count > that.data.cartList.length,
@@ -244,12 +246,31 @@ Page({
   	var nowitems = this.data.selectedItems;
   	let index = e.currentTarget.dataset.index;
   	var bool = this.data.cartList[index].IsBuy;
+	var overtype = this.data.cartList[index].overtype;
   	console.log('bool',bool)
-    this.setData({
-      ['cartList[' + index + '].IsBuy']: !bool
-    })
+	if(overtype){
+		if(this.data.cartList[index].is_deliver && (this.data.cartList[index].deliver_state == 1 || this.data.cartList[index].deliver_state == 3)){
+			var txt = this.data.cartList[index].deliver_state == 1 ? '商品正在预售中暂未开放购买~' : '商品已售罄~';
+			wx.showToast({
+			    title: txt,
+			    icon: 'none',
+			    duration: 3000
+			  })
+		}else{
+			this.setData({
+			  ['cartList[' + index + '].IsBuy']: !bool
+			})
+			
+			this.checkSelected();
+		}
+	}else{
+		wx.showToast({
+		    title: '商品 '+this.data.cartList[index].name+' 请先选择规格~',
+		    icon: 'none',
+		    duration: 3000
+		  })
+	}
     
-  	this.checkSelected();
   },
   allSelect:function(){
   	if(this.data.selectedall){
@@ -263,9 +284,26 @@ Page({
 	    })
   	}else{
   		for(var i in this.data.cartList){
-  			this.setData({
-		      ['cartList[' + i + '].IsBuy']: true
-		    })
+			if(this.data.cartList[i].overtype){
+				if(this.data.cartList[i].is_deliver && (this.data.cartList[i].deliver_state == 1 || this.data.cartList[i].deliver_state == 3)){
+					var txt = this.data.cartList[i].deliver_state == 1 ? '商品正在预售中暂未开放购买~' : '商品已售罄~';
+					wx.showToast({
+					    title: txt,
+					    icon: 'none',
+					    duration: 3000
+					  })
+				}else{
+					this.setData({
+					  ['cartList[' + i + '].IsBuy']: true
+					})
+				}
+			}else{
+				wx.showToast({
+				    title: '商品 '+this.data.cartList[i].name+' 请先选择规格~',
+				    icon: 'none',
+				    duration: 3000
+				  })
+			}
   		}
   		this.setData({
 	      selectedall: true
@@ -421,9 +459,11 @@ Page({
   },
   selectSize:function(val){
 	  var that = this
-	  var id = val.currentTarget.dataset.val
+	  var id = val.currentTarget.dataset.val;
+	  var item = val.currentTarget.dataset.item;
 	  that.setData({
-	    selectProjectid: id
+	    selectProjectid: id,
+		selectProjectItem: item
 	  });
 	  
 	  console.log('id',id);
@@ -461,7 +501,7 @@ Page({
         selectProject: val.data
       });
       if(val.data.have_size){
-      	that.getProductSize();
+      	// that.getProductSize();
       }
     }
     _request.$get(url, params, success)
@@ -482,5 +522,156 @@ Page({
       });
     }
     _request.$get(url, params, success)
-  }
+  },
+  hideDialog:function(e){
+	  var that = this
+	  that.data.showDialog = !that.data.showDialog
+	  if (that.data.showDialog) {
+	    that.showModal(1)
+	  } else {
+	    that.hideModal(1)
+	  }
+  },
+  // 显示弹框
+  showModal: function (type) {
+    var animation = wx.createAnimation({
+      duration: 200,
+      timingFunction: "ease-out"
+    })
+    this.animation = animation
+    animation.translateY(500).step()
+    if(type == 1){
+    	this.setData({
+  	      animationData: animation.export(),
+  	      showDialog: true
+  	    })
+    }else{
+    	this.setData({
+  	      animationData: animation.export(),
+  	      showCartDialog: true
+  	    })
+    }
+    
+    setTimeout(function () {
+      animation.translateY(0).step()
+      this.setData({
+        animationData: animation.export()
+      })
+    }.bind(this), 200)
+  },
+  // 隐藏弹框
+  hideModal: function (type = 1) {
+    var animation = wx.createAnimation({
+      duration: 200,
+      timingFunction: "ease-out"
+    })
+    this.animation = animation
+    animation.translateY(500).step()
+    this.setData({
+      animationData: animation.export(),
+    })
+    setTimeout(function () {
+      animation.translateY(0).step()
+      if(type == 1){
+      	this.setData({
+  	        animationData: animation.export(),
+  	        showDialog: false
+  	      })
+      }else{
+      	this.setData({
+  	        animationData: animation.export(),
+  	        showCartDialog: false
+  	      })
+      }
+      
+    }.bind(this), 200)
+  },
+  checkSize(event){
+    	var type = event.currentTarget.dataset.type;
+    	var id = event.currentTarget.dataset.id;
+    	var list = event.currentTarget.dataset.list;
+    	var tname = event.currentTarget.dataset.tname;
+  		var that = this;
+  		var tkey = type=='color_list'?'cname':'sname';
+  		var reproduct = this.data.selectProjectSize;
+  //		console.log('reproduct',reproduct)
+  		for(var i in reproduct[type]['attr_values']){
+  //			console.log('reproduct[type][i].is_select',reproduct[type]['attr_values'][i].is_select)
+  			reproduct[type]['attr_values'][i].is_select = false;
+  			if(reproduct[type]['attr_values'][i].id == id) reproduct[type]['attr_values'][i].is_select = true;
+  		}
+  //		console.log('reproduct',reproduct)
+  		
+  		that.setData({
+  			selectProjectSize :reproduct,
+  			[type]:id,
+  			[tkey]:tname
+		})
+  		console.log('that.data[type]',that.data[type])
+  		let cflag = true;
+  		for(let i in that.data.checkbox){
+  			if(that.data[that.data.checkbox[i]] == 0) cflag = false;
+  		}
+  		if(cflag){
+    		that.getProductDetail();
+  		}
+  
+    },
+	getProductDetail () {
+	  var that = this;
+	  console.log(that.data.size_list);
+	  console.log(that.data.color_list);
+	  var url = "v1/product_detail/" + that.data.selectProjectid + "/" + that.data.size_list + "/" + that.data.color_list;
+	  var params = {}
+	  var success = function (val) {
+		console.log('val',val)
+		if(val.data.product){
+			that.setData({
+				canpay:true,
+				selectProject:val.data.product,
+				selectProjectid:val.data.product.id,
+				noproduct:false
+			})
+			that.setData({
+				canpay:true,
+				selectProject:val.data.product,
+				selectProjectid:val.data.product.id,
+				noproduct:false
+			})
+		}else{
+			that.setData({
+				canpay:false,
+				noproduct:true
+			})
+		}
+	  }
+	  var fail = function(err){
+	  	
+	  }
+	  _request.$get(url, params, success, fail)
+	},
+	selectType:function(){
+		var that = this;
+		var itemindex = this.data.selectProjectItem;
+		var itemdata = this.data.selectProject;
+		console.log('xuanzzzzz')
+		console.log(this.data.cartList)
+		console.log(this.data.selectProject)
+		console.log(this.data.selectProjectItem)
+		itemdata['count']=1;
+		itemdata['IsBuy']=false;
+		itemdata['movex']=0;
+		itemdata['overtype']=true;
+		that.setData({
+			['cartList[' + itemindex + ']']:itemdata
+		})
+		that.hideModal(1);
+	},
+	selectTypeno:function(){
+		wx.showToast({
+		  title: '选中的规格暂无库存，请选择其他规格~',
+		  icon: 'none',
+		  duration: 2000
+		})
+	}
 })

pages/areacart/areacart.json

@@ -1,7 +1,8 @@
 {
   "navigationBarTitleText": "专区商品",
   "usingComponents": {
-    "currency": "../../component/currency/currency"
+    "currency": "../../component/currency/currency",
+	"format-time": "../../component/formatTime/formatTime"
   },
   "backgroundColor": "#f3f3f3"
 }

pages/areacart/areacart.wxml

@@ -56,15 +56,16 @@
 						        <image src="{{item.cover}}" />
 						      </view>
 						      <view class="cartlist_info">
-						        <view class="cartlist_title">{{item.name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
+						        <view class="cartlist_title">{{item.name}} <!-- <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}} --></view>
 								<view class="project-pack-list" wx:if="{{item.package}}">
 									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
 										<p>{{pack.item_title}} x{{pack.nums}}</p>
 									</view>
 								</view>
-								<!-- <view wx:if="{{item.have_size}}">
-									<view class="typeselect" bindtap="selectSize" data-val="{{item.id}}">未选择规格</view>
-								</view> -->
+								<view wx:if="{{item.have_size}}">
+									<view class="typeselect" bindtap="selectSize" data-val="{{item.id}}" data-item="{{index}}" wx:if="{{item.color_name || item.size_name}}">已选规格： {{item.color_name}} {{item.size_name}}</view>
+									<view class="typeselect" bindtap="selectSize" data-val="{{item.id}}" data-item="{{index}}" wx:else>商品规格：未选择</view>
+								</view>
 						        <view class="cartlist_type">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /> </view>
 						        <currency class="cartlist_price" symbol="￥" value="{{item.price}}" />
 						        <view class="cartlist_num">
@@ -73,6 +74,11 @@
 						        	<button bindtap="add" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="add">+</button>
 						        </view>
 						      </view>
+							  <view wx:if="{{item.is_deliver}}" class="project-miaosha">
+							  	<span wx:if="{{item.deliver_state == 1}}"><format-time type="formatTime" value="{{item.deliver_start_time}}" ></format-time>开售，敬请期待！</span>
+							  	<span wx:if="{{item.deliver_state == 2}}">进行中</span>
+							  	<span wx:if="{{item.deliver_state == 3}}">已售罄</span>
+							  </view>
 							  <button class="xqbtn" bindtap="toProject" data-val="{{item.id}}">查看详情 ></button> 
 						      <view class='clear'></view>
 						  </view>
@@ -173,7 +179,7 @@
 <view wx:if="{{showDialog}}">
   <view class="dialog-panel" animation="{{animationData}}" style="padding-bottom: {{value}}rpx;">
     <view class="dialog-project">
-      <image class="dialog-cancel" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/cancel.png" bindtap="toPay"></image>
+      <image class="dialog-cancel" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/cancel.png" bindtap="hideDialog"></image>
       <view class="dialog-content">
         <image class="dialog-img" src="{{selectProject.pics[0].img}}"></image>
         
@@ -187,11 +193,25 @@
         <view class="clean"></view>
       </view>
 
-      <form bindsubmit="pay" report-submit="{{true}}" >
-        <button class="dialog-btn" formType="submit" wx:if="{{showpay}}" disabled="{{canpay?'':'true'}}"><text wx:if="{{!noproduct}}">立即购买</text><text wx:if="{{noproduct}}">暂无库存</text></button>
+		<view wx:if="{{selectProject.have_size}}" class="select-count">
+			<view wx:for="{{selectProjectSize}}" wx:for-item="i" wx:key="{{index}}">
+				<view wx:if="{{index != 'product'}}">
+						<h5 class="sizeTitle">{{i.name}}</h5>
+						<view wx:for="{{i.attr_values}}" wx:for-index="index2" wx:for-item="j" class="checkList">
+							<span bindtap="checkSize" data-type='{{index}}' data-tname="{{j.name}}" data-list="{{index2}}" data-id="{{j.id}}" class="{{j.is_select?'active':''}}">
+							{{j.name}}
+							</span>
+						</view>
+					</view>
+		  </view>
+		</view>
+
+      <form  >
+        <button class="dialog-btn" bindtap="selectType" wx:if="{{!noproduct}}"><text>选定规格</text></button>
+		<button class="dialog-btn" wx:if="{{noproduct}}" disabled="disabled"><text>暂无库存</text></button>
       </form>
-      <button class="dialog-btn" open-type="share" wx:if="{{!showpay}}"><text wx:if="{{!noproduct}}">立即购买</text><text wx:if="{{noproduct}}">暂无库存</text></button>
+      <!-- <button class="dialog-btn" open-type="share" wx:if="{{!showpay}}"><text wx:if="{{!noproduct}}">选定规格</text><text wx:if="{{noproduct}}">暂无库存</text></button> -->
     </view>
   </view>
-  <view class="detail-dialog" bindtap="toPay"></view>
+  <view class="detail-dialog" bindtap="hideDialog"></view>
 </view>

pages/areacart/areacart.wxss

@@ -588,4 +588,146 @@ font-size: 22rpx;
     border-radius: 45px;
     color: #666;
     margin-top: 5rpx;
+}
+
+
+.detail-dialog {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0,0,0,0.4);
+  z-index: 99;
+}
+.dialog-panel {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background: #fff;
+  z-index: 100;
+}
+.dialog-project {
+  position: relative;
+  padding-top: 20rpx;
+}
+.dialog-content {
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #eee;
+}
+.dialog-info {
+  float: left;
+  margin-top: 80rpx;
+}
+.dialog-img {
+  float: left;
+  width: 220rpx;
+  height: 220rpx;
+  margin: 0 20rpx;
+}
+.dialog-word {
+  font-size: 28rpx;
+}
+.dialog-red {
+  color: #eab86a;
+  margin-bottom: 20rpx;
+}
+.dialog-gray {
+  color: #bbb;
+  margin-bottom: 10rpx;
+}
+.dialog-black {
+  color: #4c4c4c;
+}
+.dialog-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background: #eab86a;
+  color: #fff;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 0rpx;
+}
+.dialog-cancel {
+  position: absolute;
+  right: 20rpx;
+  top: 20rpx;
+  width: 36rpx;
+  height: 36rpx;
+}
+.select-count {
+  width: 100%;
+  margin-top: 30rpx;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  margin-bottom: 30rpx;
+}
+.select-word {
+  float: left;
+  font-size: 24rpx;
+  color: #4c4c4c;
+  line-height: 66rpx;
+}
+.select-input {
+  float: right;
+  height: 66rpx;
+  font-size: 0;
+}
+.select-input button {
+  width: 60rpx;
+  height: 66rpx;
+  color: #999;
+  font-size: 48rpx;
+  text-align: center;
+  padding: 0;
+  display: inline-block;
+  background: #fff;
+  border-radius: 0;
+  line-height: 50rpx;
+  box-sizing: border-box;
+}
+/*.select-input button:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.select-input button:last-child {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}*/
+.select-input button:after {
+  border-radius: 0;
+}
+.select-input input {
+  width: 154rpx;
+  height: 66rpx;
+  background-color: #f3f3f3;
+  color: #4c4c4c;
+  font-size: 28rpx;
+  text-align: center;
+  display: inline-block;
+  border-radius: 0;
+}
+.sizeTitle{display: block;font-size:24rpx}
+.checkList{display: inline-block;}
+.checkList span{
+display: inline-block;
+padding: 12rpx;
+margin: 15rpx;
+text-align: center;
+min-width: 45rpx;
+background: #eee;
+font-size:24rpx;
+}
+.checkList span.active{
+	background:#eab86a;
+	color:#FFF;
+}
+.project-miaosha{
+    position: absolute;
+    left: 25rpx;
+    bottom: 24rpx;
+    font-size: 24rpx;
+    background: #ddd;
+    padding: 2rpx 20rpx;
+    border-radius: 15rpx;
 }

pages/home/home.js

@@ -174,7 +174,7 @@ Page ({
     _request.$get(url, params, success)
   },
   toProject: function (val) {
-    var id = val.currentTarget.dataset.val
+    var id = val.currentTarget.dataset.val;
     wx.navigateTo({
       url: '/pages/projects/project-detail/project-detail?id=' + id
     })

pages/home/home.wxml

@@ -337,6 +337,12 @@
 				
 					<view class="project-count">已售{{item.sold_count}}件</view>
 					<image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
+					<view wx:if="{{item.is_deliver}}" class="project-miaosha">
+						<span wx:if="{{item.deliver_state == 1}}">预售</span>
+						<span wx:if="{{item.deliver_state == 2}}">进行中</span>
+						<span wx:if="{{item.deliver_state == 3}}">已售罄</span>
+					</view>
+					
 					<view class="project-price" style="padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
 					<view class="project-price" style="float: left;padding-top:10rpx;width:50%;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
 				<!--<image wx:if="{{item.mall_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/integralpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-left: 5rpx;margin-top: 95rpx;"></image>

pages/home/home.wxss

@@ -964,12 +964,19 @@
   border:1rpx solid #cccccc;
  }
  .project-miaosha {
-   width: 60rpx;
+   width: 85rpx;
    height: 28rpx;
    display: inline-block;
    float: left;
    padding-top: 95rpx;
    padding-right: 10rpx;
+   font-size: 20rpx;
+ }
+ .project-miaosha span{
+	     background: #f00;
+	     color: #FFF;
+	     padding: 5rpx 10rpx;
+	     border-radius: 15px;
  }
  .project-stop {
    height: 38rpx;

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

@@ -165,22 +165,42 @@
         <image src="../../../images/footer/shoppingcart.png" class="detail-footer-icon"></image>
         <text class="detail-footer-text">购物车</text>
       </view> -->
-      <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{project.seckill_show_price <= 0 && project.left_count > 0}}">
-        <text>加入购物车</text>
-      </button>
-      <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{project.left_count > 0 && project.seckill_state !='end'}}" class="detail-footer-item">
-        <button class=" detail-red"  formType="submit">
-          立即购买
-        </button>
-      </form>
-      <form wx:if="{{project.left_count > 0 && project.seckill_state =='end'}}" class="detail-footer-item">
-        <button class="detail-red" disabled="disabled" style="background: #ccc !important;color: #FFF !important;">
-          秒杀已结束
-        </button>
-      </form>
-      <view class="detail-footer-item detail-black" wx:if="{{project.left_count <= 0}}">
-        <text>已售罄</text>
-      </view>
+	  <!-- 判断isdeliver-->
+	  <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{project.is_deliver && project.left_count > 0 && project.deliver_state == 2}}">
+		<text>加入购物车</text>
+	  </button>
+	  <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{project.is_deliver &&project.left_count > 0 && project.deliver_state == 2}}" class="detail-footer-item">
+		<button class=" detail-red"  formType="submit">
+		  立即购买
+		</button>
+	  </form>
+	  <form wx:if="{{project.is_deliver &&project.deliver_state ==1}}" class="detail-footer-item" style="    flex: 1;">
+		<button class="detail-red" disabled="disabled" style="background: #ccc !important;color: #FFF !important;font-size: 24rpx;">
+		  <format-time type="formatTime" value="{{project.deliver_start_time}}" ></format-time>开售，敬请期待！
+		</button>
+	  </form>
+	  <view class="detail-footer-item detail-black" wx:if="{{project.is_deliver &&project.left_count <= 0 || project.deliver_state == 3}}">
+		<text>已售罄</text>
+	  </view>
+	  
+	  
+	  <!-- 正常流程-->
+	  <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>
+	  <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{!project.is_deliver &&project.left_count > 0 && project.seckill_state !='end'}}" class="detail-footer-item">
+				<button class=" detail-red"  formType="submit">
+				  立即购买
+				</button>
+	  </form>
+	  <form wx:if="{{!project.is_deliver &&project.left_count > 0 && project.seckill_state =='end'}}" class="detail-footer-item">
+				<button class="detail-red" disabled="disabled" style="background: #ccc !important;color: #FFF !important;">
+				  秒杀已结束
+				</button>
+	  </form>
+	  <view class="detail-footer-item detail-black" wx:if="{{!project.is_deliver &&project.left_count <= 0}}">
+				<text>已售罄</text>
+	  </view>
     </view>
   </view>
   <view class="detail-footer" wx:if="{{readOnly == 1}}">

pages/projects/projects.wxml

@@ -14,6 +14,11 @@
           <view class="project-count">已售{{item.sold_count}}件</view>
           <view class="project-price" style="padding-top:25rpx">
             <image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
+			<view wx:if="{{item.is_deliver}}" class="project-miaosha">
+				<span wx:if="{{item.deliver_state == 1}}">预售</span>
+				<span wx:if="{{item.deliver_state == 2}}">进行中</span>
+				<span wx:if="{{item.deliver_state == 3}}">已售罄</span>
+			</view>
             <view class="project-price" style="margin-bottom: 10rpx;padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /></view>
             <currency symbol="￥" value="{{item.price}}" style="font-size:35rpx" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency> <text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> -->
             <!--<image wx:if="{{item.mall_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/integralpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-left: 5rpx;margin-top: 5rpx;"></image>

pages/projects/projects.wxss

@@ -106,14 +106,21 @@
 .nav-item.active{
     color: #eab86a;
 }
-.project-miaosha {
-  width: 60rpx;
-  height: 28rpx;
-  display: inline-block;
-  float: left;
-  padding-top: 5rpx;
-  padding-right: 10rpx;
-}
+ .project-miaosha {
+   width: 85rpx;
+   height: 28rpx;
+   display: inline-block;
+   float: left;
+   padding-top: 95rpx;
+   padding-right: 10rpx;
+   font-size: 20rpx;
+ }
+ .project-miaosha span{
+	     background: #f00;
+	     color: #FFF;
+	     padding: 5rpx 10rpx;
+	     border-radius: 15px;
+ }
 .project-stop {
   height: 38rpx;
   width: 258rpx;