bug修改

pages/index/discountCard.vue

@@ -40,7 +40,8 @@
 
 				<view class="itemBottom">
 					<!-- <view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>  v-else -->
-					<view >可分享次数:{{item.shareQty}}</view>
+					<!-- <view >可分享次数:{{item.shareQty}}</view> -->
+					<view></view>
 					<view @click="goDetail(item.id)" class="rightJian">查看详情 
 					<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>

pages/index/index.vue

@@ -146,7 +146,7 @@
 				<view class="hotTop">
 					<view class="hotLeft">
 						<view class="hotSx" :style="{background:'#'+themeColor}"></view>
-						<view class="hottitle">热门活动</view>
+						<view class="hottitle">{{homeCardList.openMActivity.showTitle?homeCardList.openMActivity.showTitle:'热门活动'}}</view>
 					</view>
 					<view class="hotRight" @click="moreJk">
 						<view class="hotMore">更多</view>
@@ -177,37 +177,40 @@
 					<view class="hotTop">
 						<view class="hotLeft">
 							<view class="hotSx" :style="{background:'#'+themeColor}"></view>
-							<view class="hottitle">热门商品</view>
+							<view class="hottitle">{{homeCardList.openMGoods.showTitle?homeCardList.openMGoods.showTitle:'热门商品'}}</view>
 						</view>
 						<view class="hotRight" @click="goShop">
 							<view class="hotMore">更多</view>
 							<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 						</view>
 					</view>
-					<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
-						<view>
-							<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
-						</view>
-						<view class="hotGoodsLineRIght">
-							<view class="goodsName">{{item.name}}</view>
-						    <view class="Sold">
-								<view v-if="item.showLabel&&item.showLabel.indexOf('3')!=-1">
-									已售 {{item.saleQty>0?item.saleQty:0}}
-								</view>
+					<view v-if="homeCardList.openMGoods.showLayout==1">
+						<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
+							<view>
+								<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
 							</view>
-							<view class="goodsPrice">
-								<view class="goodsPrice1" >{{item.saleLabel}}</view><!-- :style="{color:'#'+themeColor}" -->
-								<view class="goodsPrice2" >￥</view>
-								<view class="goodsPrice3" >{{item.salePrice}}
-								  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+							<view class="hotGoodsLineRIght">
+								<view class="goodsName">{{item.name}}</view>
+							    <view class="Sold">
+									<view v-if="item.showLabel&&item.showLabel.indexOf('3')!=-1">
+										已售 {{item.saleQty>0?item.saleQty:0}}
+									</view>
+								</view>
+								<view class="goodsPrice">
+									<view class="goodsPrice1" >{{item.saleLabel}}</view><!-- :style="{color:'#'+themeColor}" -->
+									<view class="goodsPrice2" >￥</view>
+									<view class="goodsPrice3" >{{item.salePrice}}
+									  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+									</view>
+									<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">￥{{item.scribingPrice}}</view>
 								</view>
-								<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">￥{{item.scribingPrice}}</view>
 							</view>
 						</view>
 					</view>
 					
+					
 					<!-- 俩列的 -->
-					<div class="goodsTwo">
+					<div class="goodsTwo" v-if="homeCardList.openMGoods.showLayout==2">
 						<div class="goodsTwoLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
 							<div class="goodsTwoImg">
 								<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
@@ -486,6 +489,10 @@
 							uni.navigateTo({
 								url:'evaluation'
 							})
+						}else  if(item.sortId==18){ //领券中心
+							uni.navigateTo({
+								url:'receiveCoupon'
+							})
 						}
 						
 						else{
@@ -582,10 +589,6 @@
 						uni.navigateTo({
 							url:'aboutUS?unionID='+this.userInfo.unionId
 						})
-					}else if(item.bizType==18){ //领券中心
-						uni.navigateTo({
-							url:'receiveCoupon'
-						})
 					}
 					
 					// uni.navigateTo({
@@ -1045,10 +1048,15 @@
 		background: #FFFFFF;width: 341rpx;
 		margin-top: 20rpx;
 		padding-bottom: 20rpx;
-		border-radius: 16rpx 16rpx 0px 0px;
+		border-radius: 16rpx;
+		overflow: hidden;
 	}
 	.goodsTwoImg .hotGoodsLineImg{
 		margin: 0 auto;
+		width: 100%;
+		height: 340rpx;
+		border-radius: 0;
+		border: none;
 	}
 	.goodsTwoLine .Sold{
 		padding-left: 20rpx;
@@ -1056,9 +1064,10 @@
 	.goodsTwoLine .goodsPrice{
 		padding-left: 20rpx;
 	}
+	
 	.goodsTwoImg{
-		padding: 33rpx 0;
-	}
+		padding-bottom: 30rpx;
+	} 
 	.goodsTwoName{
 		font-weight: 400;
 		color: #333333;

pages/index/receiveCoupon.vue

@@ -21,7 +21,7 @@
 			</view>
 		</view>
 		<!-- 领取说明 -->
-		<view class="illustrateBox">
+		<view class="illustrateBox" v-if="comment">
 			<view class="illustratex"></view>
 			<view class="illustrate">领取说明</view>
 			<view class="illustratex"></view>
@@ -141,6 +141,7 @@
 	.comment{
 		padding: 0 24rpx;
 		color: #FFFFFF;
+		font-size: 24rpx;
 	}
 	.oneClick{
 		width: 368rpx;height: 82rpx;text-align: center;line-height: 82rpx;
@@ -177,11 +178,11 @@
 		line-height: 42rpx;
 	}
 	.moneyBox{
-	  padding-top: 8rpx;	
+	  padding-top: 8rpx;display: flex;
 	}
 	.moneyBs{
 		font-weight: 500;font-size: 28rpx;
-		color: #FF0000;
+		color: #FF0000;padding-top: 20rpx;
 	}
 	.moneyNum{
 		font-weight: 500;font-size: 48rpx;
@@ -189,7 +190,7 @@
 	}
 	.mdsky{
 		font-weight: 400;font-size: 24rpx;
-		color: #666666;
+		color: #666666;padding-top: 24rpx;padding-left: 2rpx;
 	}
 	.endOffsetDays{
 		font-weight: 400;font-size: 24rpx;
@@ -217,7 +218,7 @@
 		justify-content: center;
 	}
 	.illustratex{
-		width: 34rpx;height: 5rpx;background: #FFFFFF;margin-top: 15rpx;
+		width: 34rpx;height: 5rpx;background: #FFFFFF;margin-top: 18rpx;
 	}
 	.illustrate{
 		font-size: 28rpx;