冲突文件

pages/activity/seckill.vue

@@ -4,17 +4,17 @@
 			<u-navbar title="限时秒杀" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
 				:background="background"></u-navbar>
 		</view>
-		<view class="title" :style="{backgroundImage:'url('+backgroundImg+')'}" style="background-size: 100% 100%;">
+		<view class="title" :style="{backgroundImage:'url('+backgroundImg+')'}" style="background-size: 100% 100%;" >
 			<image src="/static/seckill/topHeader.png" mode="" class="bgImg"></image>
 			<view class="limitTitle">
 				<image src="/static/seckill/limit.png" mode="" class="img"></image>
 			</view>
 			<view class="time" v-if="tabbar.length">
-				<view class="timeItem" v-for="(item,index) in tabbar" :key="index">
+				<view class="timeItem" v-for="(item,index) in tabbar" :key="index" @click="handleTab(index)" >
-					<view class="num">
+					<view class="num" :class="[index==curTabIndex ? 'numselected' : '']">
 						{{item.active_time}}
 					</view>
-					<view class="desc">
+					<view class="desc"  :class="[index==curTabIndex ? 'descselected' : '']">
 						{{item.status_text}}
 					</view>
 				</view>
@@ -183,12 +183,13 @@
 			getListData(pageNo = 1) {
 				const app = this
 				const activeTimeId = app.getCurTabbarId()
+				let pamars = {
+					// store_id: 10001,
+					activeTimeId: activeTimeId,
+				}
+				console.log(activeTimeId)
 				return new Promise((resolve, reject) => {
-					Api.list(activeTimeId, {
+					Api.sharplist(pamars)
-							page: pageNo
-						}, {
-							load: false
-						})
 						.then(result => {
 							// 合并新数据
 							let newList = result.data.list
@@ -225,10 +226,12 @@
 			// 点击切换标签(会场场次)
 			handleTab(index) {
 				const app = this
+				console.log(this)
 				app.curTabIndex = index
-				// 刷新列表数据
+				app.goodsList = app.getListData()
-				app.goodsList = getEmptyPaginateObj()
+				// // 刷新列表数据
-				app.mescroll.resetUpScroll()
+				// app.goodsList = getEmptyPaginateObj()
+				// app.mescroll.resetUpScroll()
 			},
 
 			// 获取当前选择的会场
@@ -239,6 +242,7 @@
 			// 获取当前会场场次ID
 			getCurTabbarId() {
 				const curTabbar = this.getCurTabbar()
+				console.log(curTabbar)
 				return curTabbar ? curTabbar.active_time_id : 0
 			},
 
@@ -249,7 +253,7 @@
 					url: '/pages/goods/detail?goodsId=' + sharpGoodsId+"&isSeckill="+true+'&isBuy='+count_down_time+'&seckillText='+(this.tabbar[this.curTabIndex].status == this.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始' )
 				})
 			},
-
+			
 			
 			// 设置微信公众号链接分享卡片内容
 			setWxofficialShareData() {
@@ -294,7 +298,9 @@
 		width: 100%;
 		height: 100%;
 	}
-
+	.active{
+		background-color: #A9A9A9;
+	}
 	.title {
 		width: 100%;
 		height: 220rpx;
@@ -326,35 +332,41 @@
 			display: flex;
 			align-items: center;
 			width: 100%;
-			justify-content: space-around;
+			//justify-content: space-around;
 			z-index: 30;
-
+			overflow: auto;
 			.timeItem {
 				.num {
 					width: 150rpx;
 					font-size: 28rpx;
 					font-weight: 500;
-					color: #FFFFFF;
+					color: #C3C3C3;
 					line-height: 33rpx;
 					text-shadow: 0px 0px 11px #FB3A22;
 					text-align: center;
 					margin-top: 10rpx;
 				}
-
+				.numselected{
+					color:#ffffff;
+				}
 				.desc {
 					width: 150rpx;
 					height: 36rpx;
-					background: #FFFFFF;
+					//background: #FFFFFF;
 					border-radius: 62rpx 62rpx 62rpx 62rpx;
 					opacity: 1;
 					font-size: 24rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 500;
-					color: #FB3D27;
+					color: #C3C3C3;
 					line-height: 36rpx;
 					margin-top: 10rpx;
 					text-align: center;
 				}
+				.descselected{
+					color:#FB3D27;
+					background: #FFFFFF;
+				}
 			}
 		}
 	}
@@ -516,12 +528,12 @@
 					background-size: 100% 100%;
 
 					.killPrice {
-						font-size: 24rpx;
+						font-size: 20rpx;
 						font-weight: 500;
 						color: #FF423D;
 						margin-left: 26rpx;
 						text{
-							font-size: 36rpx;
+							font-size: 34rpx;
 						}
 					}