导航图标和其他调整

app.json

@@ -136,7 +136,7 @@
   "sitemapLocation": "sitemap.json",
   "plugins": {
 	    "live-player-plugin": {
-	        "version": "1.3.0",
+	        "version": "1.3.2",
 	        "provider": "wx2b03c6e691cd7370"
 	    }
 	}

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" wx:if="{{cashTotal.can_transfer}}" disabled="{{cashTotal.available}}">转提货券</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}}">

packageUser/pages/user/newAddress/newAddress.wxml

@@ -7,7 +7,7 @@
   </view>
   <view class="newAddress-line">
     <view class="newAddress-title">联系电话</view>
-    <input type="number" maxlength="12" class="nameText" placeholder="请填写收件人联系电话" placeholder-class="text-placeholder" bindinput="bindTel" value="{{tel}}"/>
+    <input type="number" maxlength="12" class="nameText" placeholder="请填写收件人联系电话" placeholder-class="text-placeholder" bindinput="bindTel" value="{{tel!=0?tel:''}}"/>
     <view class="clean"></view>
   </view>
   <picker mode="region" bindchange="bindRegionChange" value="{{region}}" >

pages/home/home.js

@@ -243,7 +243,7 @@ Page ({
   //     url: '/pages/activity/redpacket/redpacket?rid=1'
   //   })
   // }
-  toview (val) {
+  toviewfunc (val) {
     var type = val.currentTarget.dataset.val.url_type
     var url = val.currentTarget.dataset.val.url
     var id = val.currentTarget.dataset.val.product_cat_index
@@ -257,9 +257,15 @@ Page ({
           url: url
         })
       } else {
-        wx.navigateTo({
-          url: url
-        })
+		  if(id == 0){
+			  wx.navigateTo({
+			    url: url
+			  })
+		  }else{
+			  wx.reLaunch({
+			    url: url+id
+			  })
+		  }
       }
     }
     if (type === 1) {
@@ -479,11 +485,36 @@ Page ({
       })
 //  }
   },
+  tofhvd () {
+      wx.navigateTo({
+        url: '/pages/parse/parse?id=2'
+      })
+  },
   toyszq () {
       wx.reLaunch({
+        url: '/pages/projects/projects?currentTab=4'
+      })
+  },
+  togrhl () {
+      wx.reLaunch({
+        url: '/pages/projects/projects?currentTab=2'
+      })
+  },
+  tojjry () {
+      wx.reLaunch({
         url: '/pages/projects/projects?currentTab=3'
       })
   },
+  toygyp () {
+      wx.reLaunch({
+        url: '/pages/projects/projects?currentTab=5'
+      })
+  },
+  tothzq () {
+      wx.reLaunch({
+        url: '/pages/projects/projects?currentTab=1'
+      })
+  },
   todz () {
   	if(this.data.userinfo.rank < 2){
   		wx.navigateTo({

pages/home/home.wxml

@@ -17,22 +17,20 @@
       </view>-->
     </view>
     <view class="selectitem">
-      <view wx:key="{{index}}" wx:for="{{iconslist}}">
         <!--<navigator url="{{item.url}}" hover-class="none" open-type="switchTab" wx:if="{{}}">
         </navigator>-->
-        <view bindtap="toview" data-val="{{item}}">
+        <view wx:key="{{index}}" bindtap="toviewfunc" data-val="{{item}}" wx:for="{{iconslist}}" class="item-box">
           <image src="{{item.cover}}" class="item-index" />
           <view class="item-name">{{item.name}}</view>
         </view>
-      </view>
-      <view bindtap="tocentcart">
+      <!-- <view bindtap="tocentcart" class="item-box">
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png" class="item-index" />
         <view class="item-name">积分专区</view>
       </view>
-      <view bindtap="tolive">
+      <view bindtap="tolive"  class="item-box">
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/zhibo.jpg" class="item-index" />
         <view class="item-name">直播</view>
-      </view>
+      </view> -->
       
       <!-- <view bindtap="todz">
       	<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/shop_apply.png" class="item-index"  wx:if="{{userinfo.rank < 2}}"/>
@@ -41,20 +39,42 @@
         <view class="item-name" wx:if="{{userinfo.rank >= 2}}">店长专区</view>
       </view> -->
 	  
-	  <view bindtap="toyszq">
-	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/yszq.png" class="item-index" />
-	    <view class="item-name">养生专区</view>
+	 <!-- <view bindtap="tofhvd" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/newicon5.png" class="item-index" />
+	    <view class="item-name">凤凰V雕</view>
 	  </view>
       
-      <view bindtap="toabout">
+      <view bindtap="toabout" class="item-box">
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/about.png" class="item-index" />
         <view class="item-name">关于商城</view>
       </view>
       
-      <view bindtap="topyq">
+      <view bindtap="topyq" class="item-box">
         <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/pyq.png" class="item-index" />
         <view class="item-name">发圈素材</view>
-      </view>
+      </view> -->
+	  
+	  <!-- 新增 -->
+	  <!-- <view bindtap="togrhl" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/newicon2.png" class="item-index" />
+	    <view class="item-name">个人护理</view>
+	  </view>
+	  <view bindtap="tojjry" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/newicon1.png" class="item-index" />
+	    <view class="item-name">家居日用</view>
+	  </view>
+	  <view bindtap="toyszq" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/yszq.png" class="item-index" />
+	    <view class="item-name">养生食品</view>
+	  </view>
+	  <view bindtap="toygyp" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/newicon4.png" class="item-index" />
+	    <view class="item-name">一国一品</view>
+	  </view>
+	  <view bindtap="tothzq" class="item-box">
+	    <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/newicon3.png" class="item-index" />
+	    <view class="item-name">特惠专区</view>
+	  </view> -->
     </view>
     <view class="column" wx:if="{{vershow}}" wx:if="{{firstProject.length > 0}}">
       <view class="first-project">

pages/home/home.wxss

@@ -419,6 +419,12 @@
   padding: 40rpx 40rpx 0rpx;
   width: 100%;
   overflow: hidden;
+  flex-wrap: wrap;
+}
+.item-box{
+	text-align: center;
+	width: 20%;
+	margin-bottom: 25rpx;
 }
 .selectitem-index {
   display: inline-block;
@@ -428,8 +434,8 @@
   height: 96rpx;
   background: #fff;
   /* border-radius: 35%; */
-  margin-right: 50rpx;
-  margin-bottom: 20rpx;
+  /* margin-right: 50rpx; */
+  /* margin-bottom: 20rpx; */
   /* display: inline-block; */
 }
 .item-index:nth-child(5) {
@@ -439,7 +445,8 @@
   font-size: 20rpx;
   color: #000;
   text-align: center;
-  width: 96rpx;
+  /* width: 96rpx; */
+  margin-top: 10rpx;
 }
 .seckill {
   width: 100%;

pages/pay/pay.js

@@ -130,7 +130,7 @@ Page({
         cache: false,
 //      curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
 				curPayway:'weixinpay',
-				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0)? true:false,
+				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0 && that.data.payData.pv >= that.data.payData.total_price)? true:false,
 				afterdec:parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
       });
     }

pages/pay/pay.wxml

@@ -25,6 +25,7 @@
       <image class="pay-project-img" src="{{item.cover}}"></image>
       <view class="pay-project-info">
         <text class="pay-project-title ellipsisLn">{{item.product_name}}</text>
+		 <p wx:if="{{payData.pv < payData.total_price && item.pv < item.price}}" style="color:#F00">[该商品无法使用提货券兑换]</p>
 		<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>
@@ -110,7 +111,7 @@
         <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-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == '' && payData.pv >= payData.total_price}}">
 		<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>
           <text bindtap="selectClick" data-payway="balance">提货券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
@@ -120,6 +121,12 @@
         </view>
 	</view>
 	
+	<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == '' && payData.pv < payData.total_price}}">
+		<view class="pay-payway-balance fr">
+	      <text bindtap="selectClick" data-payway="balance" >订单中存在不能使用提货券兑换的商品</text>
+	    </view>
+	</view>
+	
 	<view class="pay-payway-item" wx:if="{{payData.order_type == 3}}">
 		<view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png" bindtap="selectClick" data-payway="balance"></image>

pages/projects/project-detail/project-detail.wxss

@@ -584,6 +584,9 @@ margin-right: 2px;
 .wxParse-p .w33{
 	width:33% !important;
 }
+.wxParse-p .w50{
+	width:50% !important;
+}
 
 
 .sizeTitle{display: block;font-size:24rpx}