秒杀图标调整，收入显示转提货券调整

packageUser/pages/user/fund/fund.js

@@ -50,6 +50,7 @@ Page({
     var params = {
     }
     var success = function (res) {
+		console.log('res.data',res.data)
       that.setData({
         cashTotal: res.data
       })

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 && cashTotal.can_transfer}}">转提货券</view>
+      <view class="fund__btn withdraw" bindtap="toTransfer" wx:if="{{cashTotal.can_transfer}}" disabled="{{cashTotal.available}}">转提货券</view>
       <view class="clean"></view>
     </view>
     <view wx:if="{{false}}">

pages/areacart/areacart.wxml

@@ -76,7 +76,7 @@
 						      </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 == 2}}">预售</span>
 							  	<span wx:if="{{item.deliver_state == 3}}">已售罄</span>
 							  </view>
 							  <button class="xqbtn" bindtap="toProject" data-val="{{item.id}}">查看详情 ></button> 

pages/home/home.wxml

@@ -336,10 +336,10 @@
 					<view class="project-title ellipsisLn">{{item.name}}</view>
 				
 					<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"/>
+					<image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha-img"/>
 					<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 == 2}}">预售</span>
 						<span wx:if="{{item.deliver_state == 3}}">已售罄</span>
 					</view>
 					

pages/home/home.wxss

@@ -963,6 +963,15 @@
   background:linear-gradient(to right, #d8dfe5, #aab6c2);
   border:1rpx solid #cccccc;
  }
+ .project-miaosha-img {
+   width: 60rpx;
+   height: 28rpx;
+   display: inline-block;
+   float: left;
+   padding-top: 95rpx;
+   padding-right: 10rpx;
+   font-size: 20rpx;
+ }
  .project-miaosha {
    width: 85rpx;
    height: 28rpx;

pages/projects/projects.wxml

@@ -13,10 +13,10 @@
           <view class="project-title ellipsisLn">{{item.name}}</view>
           <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"/>
+            <image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha-img"/>
 			<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 == 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>

pages/projects/projects.wxss

@@ -106,6 +106,15 @@
 .nav-item.active{
     color: #eab86a;
 }
+ .project-miaosha-img {
+   width: 60rpx;
+   height: 28rpx;
+   display: inline-block;
+   float: left;
+   padding-top: 95rpx;
+   padding-right: 10rpx;
+   font-size: 20rpx;
+ }
  .project-miaosha {
    width: 85rpx;
    height: 28rpx;