diff --git a/pages/activity/index.vue b/pages/activity/index.vue index b84a084d..fa21c60b 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -1,207 +1,315 @@ + .goods-list-box { + width: 50%; + box-sizing: border-box; + + .left-list { + margin-right: 10rpx; + margin-bottom: 20rpx; + } + + .right-list { + margin-left: 10rpx; + margin-bottom: 20rpx; + } + } + + .tip-box { + background: #fff0e7; + padding: 20rpx; + width: 100%; + position: relative; + box-sizing: border-box; + + .activity-left-image { + position: absolute; + bottom: 0; + left: 0; + width: 58rpx; + height: 36rpx; + } + + .activity-right-image { + position: absolute; + top: 0; + right: 0; + width: 72rpx; + height: 50rpx; + } + + .type-text { + font-size: 26rpx; + font-weight: 500; + color: #ff6000; + line-height: 42rpx; + } + + .tip-content { + font-size: 26rpx; + font-weight: 500; + color: #ff6000; + line-height: 42rpx; + } + } + \ No newline at end of file diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue index 23e9e33a..44422e2b 100644 --- a/pages/activity/seckill/list.vue +++ b/pages/activity/seckill/list.vue @@ -149,7 +149,6 @@ const now = dayjs(); const today = now.format('YYYY-MM-DD') const select = ref([]) - console.log('数据', data) // 判断时间段的状态 data.forEach((config, index) => { const startTime = dayjs(`${today} ${config.startTime}`) @@ -158,20 +157,16 @@ if (now.isBefore(startTime)) { config.status = TimeStatusEnum.WAIT_START; // select.value[index] = config.id; - console.log('未开始',select.value,activeTimeIndex.value) } else if (now.isAfter(endTime)) { config.status = TimeStatusEnum.END; // select.value[index] = config.id; - console.log('已结束',select.value,activeTimeIndex.value) } else { config.status = TimeStatusEnum.STARTED; // select.value[index] = config.id; activeTimeIndex.value = index - console.log('进行中',select.value,activeTimeIndex.value) } }) timeConfigList.value = data - console.log('传递',select.value,activeTimeIndex.value) // 默认选中进行中的活动 handleChangeTimeConfig(activeTimeIndex.value, select.value[activeTimeIndex.value]); // 滚动到进行中的时间段 @@ -188,7 +183,6 @@ const activeTimeIndex = ref(0) // 当前选中的时间段的索引 const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]) // 当前选中的时间段 const handleChangeTimeConfig = (index, id) => { - console.log('点击',index + '+' + id) activeTimeIndex.value = index // 查询活动列表 diff --git a/pages/bargain/details/details.vue b/pages/bargain/details/details.vue index 5ec34caa..41331148 100644 --- a/pages/bargain/details/details.vue +++ b/pages/bargain/details/details.vue @@ -101,7 +101,6 @@ id: id }); bargainInfo.value = data - console.log('shuju', bargainInfo.value) } //获得砍价记录分页 const recordPageParams = ref({ @@ -119,7 +118,6 @@ bargainRecord.value = bargainRecord.value.concat(...data.list); bargainRecordTotal.value = data.total; loadStatus.value = bargainRecord.value.length < bargainRecordTotal.value ? 'more' : 'noMore'; - console.log('jilu',data) } // 加载更多 function loadMore() { diff --git a/pages/bargain/index.vue b/pages/bargain/index.vue index ff3c75de..4aa874a6 100644 --- a/pages/bargain/index.vue +++ b/pages/bargain/index.vue @@ -76,7 +76,6 @@ } = await BargainApi.getActivitySuccess(); bargainSuccessList.value = data.successList bargainTotal.value = data.successUserCount - console.log(bargainSuccessList.value) } // 查询活动列表 const activityTotal = ref(0) // 活动总数 @@ -94,7 +93,6 @@ activityList.value = activityList.value.concat(...data.list); activityTotal.value = data.total; loadStatus.value = activityList.value.length < activityTotal.value ? 'more' : 'noMore'; - // console.log('shuju',data) } // 加载更多 function loadMore() { diff --git a/pages/goods/index.vue b/pages/goods/index.vue index ea2d6d03..43c08971 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -186,7 +186,6 @@ // 规格变更 function onSkuChange(e) { - console.log('传来的规格改变',e) if(e.type == 4){ settleData.value = e setShow.value = true @@ -270,7 +269,6 @@ } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10); if (code === 0) { state.couponInfo = data; - console.log('优惠券',state) } } //获取结算信息 @@ -279,9 +277,7 @@ async function getSettlementByIds(ids) { const { data } = await SpuApi.getSettlementProduct(ids); settleData.value = handle(data) - console.log('处理后数据',settleData.value) state.goodsInfo.skus = handListPrice(state.goodsInfo.skus,data[0].skus) - console.log('要传递的数据',state.goodsInfo) } //判断是否有限时折扣信息 function handle(array){ @@ -322,7 +318,6 @@ // 加载到商品 state.skeletonLoading = false; state.goodsInfo = res.data; - console.log('sku',res.data) // 加载是否收藏 if (isLogin.value) { FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => { diff --git a/pages/goods/list.vue b/pages/goods/list.vue index 64eb2e65..3e45e791 100644 --- a/pages/goods/list.vue +++ b/pages/goods/list.vue @@ -277,7 +277,6 @@ if (code !== 0) { return; } - console.log('数据流',data) // 使用 map 提取每个对象的 id 属性 const ids = data.list.map(item => item.id); // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串 @@ -304,7 +303,6 @@ const settleData = ref() async function getSettlementByIds(ids) { const { data } = await SpuApi.getSettlementProduct(ids); - // console.log('结算信息',data) return data; } diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue index cc606ef4..837b3b5d 100644 --- a/pages/goods/seckill.vue +++ b/pages/goods/seckill.vue @@ -212,7 +212,6 @@ } = await SeckillApi.getSeckillActivity(id); activity.value = data; timeStatusEnum.value = getTimeStatusEnum(activity.value.startTime, activity.value.endTime); - console.log('处理后',timeStatusEnum.value) state.percent = 100 - data.stock / data.totalStock * 100; // 查询商品 await getSpu(data.spuId); @@ -255,7 +254,6 @@ }); state.skeletonLoading = false; - console.log('shuju', state) }; onLoad((options) => { diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue index b52d0f12..96f431ca 100644 --- a/pages/order/confirm.vue +++ b/pages/order/confirm.vue @@ -307,7 +307,6 @@ state.orderPayload = JSON.parse(options.data); await getOrderInfo(); await getCoupons(); - console.log('数据', state) }); diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue index e492f560..02121ace 100644 --- a/sheep/components/s-activity-pop/s-activity-pop.vue +++ b/sheep/components/s-activity-pop/s-activity-pop.vue @@ -131,7 +131,6 @@ activityMap: {}, couponInfo: computed(() => props.modelValue.couponInfo) }); - console.log('shuju', state) watch( () => props.show, () => { @@ -143,7 +142,6 @@ return; } state.activityMap[activity.id] = handActitList(res.data.rules); - console.log('最终数据', state) }) }); } diff --git a/sheep/components/s-discount-list/s-discount-list.vue b/sheep/components/s-discount-list/s-discount-list.vue index 62360016..fd76b1b5 100644 --- a/sheep/components/s-discount-list/s-discount-list.vue +++ b/sheep/components/s-discount-list/s-discount-list.vue @@ -67,7 +67,6 @@ }); return goodsImg; }; - console.log('shuju', props)