2

pages/coffee/buy.vue

@@ -21,12 +21,10 @@
 					<view class="BuyNum">
 						星巴克咖啡{{item.BuyNum}}杯
 					</view>
-					<view class="GiveAway">
+					<view class="GiveAway" v-if="item.GiveAwayNum>0">
 						买{{item.BuyNum}}杯赠{{item.GiveAwayNum}}杯
 					</view>
-					<view class="validate">
-						购入有限期9个月
-					</view>
+					
 				</view>
 				<view class="itemInfo2">
 					<view class="money">
@@ -188,7 +186,7 @@
 					font-size: 32rpx;
 					font-weight: 500;
 					color: #000000;
-					margin-bottom: 20rpx;
+					
 				}
 
 				.GiveAway {
@@ -200,6 +198,7 @@
 					font-weight: 500;
 					color: #FFFFFF;
 					display: inline-block;
+					margin-top: 20rpx;
 					margin-bottom: 15rpx;
 				}
 

pages/coffee/index.vue

@@ -60,7 +60,7 @@
 			<text>立即购买</text>
 			<view class="tipBox" v-if="pageData.GiveAwayList&&pageData.GiveAwayList.length>0">
 				<view class="tipText">
-					买{{pageData.GiveAwayList[0].BuyNum}}赠{{pageData.GiveAwayList[0].GiveAwayNum}}
+					买{{pageData.GiveAwayList[1].BuyNum}}赠{{pageData.GiveAwayList[1].GiveAwayNum}}
 				</view>
 				<view class="tipIcon"></view>
 			</view>
@@ -123,7 +123,6 @@
 				pageData: {},
 				isShowSuccess: false,
 				timer: null,
-				timing: 0, //二维码计时用
 				username: "",
 				flag:false,//是否继续请求扫码结果
 			}