Merge branch 'master' into dev_delivery

pages/user/user.vue

@@ -18,12 +18,12 @@
 					<view class="username" v-else>请登录/注册 ></view>
 				</view>
 					
-				<view class="flex-column-center">
+				<view class="flex-column-center" @click="gotoPath('/subPackages/user/coupon')">
 					<view class="title">优惠券</view>
 					<view class="num">{{couponNum}}</view>
 				</view>
 				<view style="height: 35rpx;width: 2rpx;background:#E3E3E3;"></view>
-				<view class="flex-column-center">
+				<view class="flex-column-center" @click="qidai()">
 					<view class="title">积分</view>
 					<view class="num">{{userInfo.score||0}}</view>
 				</view>
@@ -44,7 +44,7 @@
 						<img :src="item.src" alt="">
 						<view>{{item.title}}</view>
 						
-						<view class="count" v-if="item.needCount">{{item.count}}</view>
+						<view class="count" v-if="item.needCount&&item.count>0">{{item.count}}</view>
 					</view>
 				</view>
 				<!-- 待付款轮播 -->