commit -m 优惠券

pages/tabBar/user/user.vue

@@ -31,7 +31,7 @@
 					</view>
 				</view>
 				<!-- 我的资产 -->
-				<view class="header-main-account" v-if="hasLogin">
+				<view class="header-main-account">
 					<view class="main-account">
 						<view class="main-account-le">
 							<view class="main-account-icon">
@@ -41,18 +41,25 @@
 						</view>
 						<view class="main-account-ri">
 							<view class="main-account-ri-view" @click="navigator('/pages/user/account/account')">
-								<view class="main-account-icon">{{ userMoney }}</view>
+								<view class="main-account-icon" v-if="hasLogin">{{ userMoney }}</view>
+								<view class="main-account-icon none" v-else>-</view>
 								<view class="main-account-text">账户余额</view>
 							</view>
 							<view class="main-account-ri-view" @click="navigator('/pages/user/account/account-bean')">
-								<view class="main-account-icon">{{ userBeans ? userBeans : 0  }}</view>
+								<view class="main-account-icon" v-if="hasLogin">{{ userBeans ? userBeans : 0  }}</view>
+								<view class="main-account-icon none" v-else>-</view>
 								<view class="main-account-text">采美豆</view>
 							</view>
+							<view class="main-account-ri-view" @click="navigator('/pages/user/account/account-bean')">
+								<view class="main-account-icon" v-if="hasLogin">{{ userBeans ? userBeans : 0  }}</view>
+								<view class="main-account-icon none" v-else>-</view>
+								<view class="main-account-text">优惠券</view>
+							</view>
 						</view>
 					</view>
 				</view>
 				<!-- 订单 -->
-				<view class="header-main-order" :style="{ marginTop: hasLogin ? '0rpx': '20rpx' }">
+				<view class="header-main-order" :style="{ marginTop: hasLogin ? '0rpx': '0rpx' }">
 					<view class="user-order">
 						<view class="tab-title" @click="navigator('/pages/user/order/order-list?state=0')">
 							<text class="cell-tit">我的订单</text>
@@ -118,70 +125,71 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<!-- 底部跳转 -->
-			<view class="foot-list" :style="{paddingTop: hasLogin ? '370rpx': '170rpx'}">
-			<!-- 	<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
-					<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
-				</view> -->
-				<view class="list-cell-item" v-show="hasLogin">
-					<view class="list-cell" v-show="userIdentity == 4" @click="navigatorClubUpgrade(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_8@2x.png" mode=""></image>
+				<!-- 底部跳转 -->
+				<view class="header-main-listcell">
+				<!--<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
+						<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
+					</view> -->
+					<view class="list-cell-item" v-show="hasLogin">
+						<view class="list-cell" v-show="userIdentity == 4" @click="navigatorClubUpgrade(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_8@2x.png" mode=""></image>
+							</view>
+							<text class="cell-tit">
+								升级会员机构
+								<text class="cell-tips">采美豆</text>
+							</text>
+							<text class="cell-more">
+								<text class="txt">{{clubStatusText(clubStatus)}}</text>
+								<text class="iconfont icon-xiayibu"></text>
+							</text>
 						</view>
-						<text class="cell-tit">
-							升级会员机构
-							<text class="cell-tips">采美豆</text>
-						</text>
-						<text class="cell-more">
-							<text class="txt">{{clubStatusText(clubStatus)}}</text>
-							<text class="iconfont icon-xiayibu"></text>
-						</text>
-					</view>
-					<view class="list-cell" @click="navigator('/pages/user/regularPurchase/regularPurchase')" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_9@2x.png" mode=""></image>
+						<view class="list-cell" @click="navigator('/pages/user/regularPurchase/regularPurchase')" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_9@2x.png" mode=""></image>
+							</view>
+							<text class="cell-tit">再次购买</text>
+							<text class="cell-more iconfont icon-xiayibu"></text>
 						</view>
-						<text class="cell-tit">再次购买</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
-				</view>
-				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" :src="item.icon" mode=""></image>
+					<view class="list-cell-item">
+						<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" :src="item.icon" mode=""></image>
+							</view>
+							<text class="cell-tit">
+								{{item.name}}
+								<text class="cell-tips" v-if="index == 2 && isModify">采美豆</text>
+							</text>
+							<text class="cell-more iconfont icon-xiayibu"></text>
 						</view>
-						<text class="cell-tit">
-							{{item.name}}
-							<text class="cell-tips" v-if="index == 2 && isModify">采美豆</text>
-						</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
-				</view>
-				<view class="list-cell-item">
-					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png" mode=""></image>
+					<view class="list-cell-item">
+						<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png" mode=""></image>
+							</view>
+							<text class="cell-tit cont">联系我们</text>
+							<text class="cell-more cont" @click="toPhone">{{contactNumber}}</text>
 						</view>
-						<text class="cell-tit cont">联系我们</text>
-						<text class="cell-more cont" @click="toPhone">{{contactNumber}}</text>
-					</view>
-					<view class="list-cell" @click="this.$api.navigateTo('/pages/user/about/about')" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_6@2x.png" mode=""></image>
+						<view class="list-cell" @click="this.$api.navigateTo('/pages/user/about/about')" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_6@2x.png" mode=""></image>
+							</view>
+							<text class="cell-tit">关于我们</text>
+							<text class="cell-more iconfont icon-xiayibu"></text>
 						</view>
-						<text class="cell-tit">关于我们</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-					<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
-						<view class="cell-icon">
-							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
+						<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
+							<view class="cell-icon">
+								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
+							</view>
+							<text class="cell-tit">帮助中心</text>
+							<text class="cell-more iconfont icon-xiayibu"></text>
 						</view>
-						<text class="cell-tit">帮助中心</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>	
-			</view>
+					</view>	
+				</view>
+				<view class="header-main-last"></view>
+			</view>		
 		</view>	
 		<!-- 采美豆提示弹窗 -->
 		<activityBean v-if="isActivityBean" :show="isActivityBean" :beansType="beansType" :beanNumber="beanNumber"  @cancel="handleBeanlClick"></activityBean>
@@ -606,7 +614,7 @@
 			box-sizing: border-box;
 			padding:24rpx 0;
 			.main-account-le{
-				width: 222rpx;
+				width: 200rpx;
 				height: 100%;
 				position: relative;
 				float: left;
@@ -639,11 +647,11 @@
 				}
 			}
 			.main-account-ri{
-				width: 480rpx;
+				width: 502rpx;
 				height: 100%;
 				float: right;
 				.main-account-ri-view{
-					width: 50%;
+					width: 33.33%;
 					height: 100%;
 					float: left;
 					.main-account-icon{
@@ -654,6 +662,11 @@
 						font-size: $font-size-32;
 						color: #f94b4b;
 						font-weight: bold;
+						&.none{
+							color: #333333;
+							font: $font-size-36;
+							font-weight: normal;
+						}
 					}
 					.main-account-text{
 						width: 100%;
@@ -753,9 +766,18 @@
 			color: $text-color;
 		}
 	}
-	.foot-list{
-		width: 702rpx;
+	.header-main-last{
+		width: 100%;
+		height: 20rpx;
+		float: left;
+		box-sizing: border-box;
+	}
+	.header-main-listcell{
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
 		padding: 0 24rpx;
+		margin-bottom: 60rpx;
 	}	
 	.list-cell-avtiv{
 		width: 702rpx;

search/pages/search/search.vue

@@ -63,10 +63,10 @@
 							<text class="mclap" :class="item.beautyActFlag == 1 ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
 						</view>
 						<text class="list-details-specs">规格：{{item.unit}}</text>
-						<view class="list-details-specs" v-if="hasLogin && item.code!=''&&item.code!=null">
+						<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">
 							<view>商品编码：{{item.code}}</view>
 						</view>
-						<view class="list-details-price" v-if="hasLogin">
+						<view class="list-details-price">
 							<template v-if="userIdentity == 3">
 								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">