|
|
@ -103,66 +103,65 @@ const marketOneName = ref(''); |
|
|
|
const marketTwoName = ref(''); |
|
|
|
|
|
|
|
// 获取数据 |
|
|
|
const fetchData = async () => { |
|
|
|
try { |
|
|
|
const response = await showsetDetail(activityStone.selectactivityId); |
|
|
|
const data = response.data; |
|
|
|
console.log(data); |
|
|
|
// 设置数据 |
|
|
|
marketOne.value = data.marketOne; |
|
|
|
marketTwo.value = data.marketTwo; |
|
|
|
markerOneTotal.value = data.markerOneTotal; |
|
|
|
markerTwoTotal.value = data.markerTwoTotal; |
|
|
|
showOne.value = data.showOne; |
|
|
|
showTwo.value = data.showTwo; |
|
|
|
initialData.value = data.time; |
|
|
|
marketOneId.value = data.marketOneId; |
|
|
|
marketTwoId.value = data.marketTwoId; |
|
|
|
// 设置市场名称 |
|
|
|
marketOneName.value = data.marketOne; |
|
|
|
marketTwoName.value = data.marketTwo; |
|
|
|
|
|
|
|
} catch (error) { |
|
|
|
console.error('获取数据失败:', error); |
|
|
|
// 可以添加错误处理逻辑 |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
//获取数据更新版 |
|
|
|
// const fetchData = async () => { |
|
|
|
// try { |
|
|
|
// // ✅ 修改传参方式为对象 |
|
|
|
// const response = await showsetDetail({ activityId: activityStone.selectactivityId }); |
|
|
|
// const response = await showsetDetail(activityStone.selectactivityId); |
|
|
|
// const data = response.data; |
|
|
|
// // ✅ 取出两个市场数据 |
|
|
|
// const marketList = data.data; |
|
|
|
// // ✅ 先清空数据,防止上次数据残留 |
|
|
|
// if (marketList && marketList.length >= 2) { |
|
|
|
// const marketOneData = marketList[0]; |
|
|
|
// const marketTwoData = marketList[1]; |
|
|
|
// // 市场一赋值 |
|
|
|
// marketOne.value = marketOneData.market; |
|
|
|
// showOne.value = marketOneData.show; |
|
|
|
// markerOneTotal.value = marketOneData.markerTotal; |
|
|
|
// marketOneId.value = marketOneData.marketId; |
|
|
|
// // 市场二赋值 |
|
|
|
// marketTwo.value = marketTwoData.market; |
|
|
|
// showTwo.value = marketTwoData.show; |
|
|
|
// markerTwoTotal.value = marketTwoData.markerTotal; |
|
|
|
// marketTwoId.value = marketTwoData.marketId; |
|
|
|
// } |
|
|
|
// // 初始时间赋值 |
|
|
|
// console.log(data); |
|
|
|
// // 设置数据 |
|
|
|
// marketOne.value = data.marketOne; |
|
|
|
// marketTwo.value = data.marketTwo; |
|
|
|
// markerOneTotal.value = data.markerOneTotal; |
|
|
|
// markerTwoTotal.value = data.markerTwoTotal; |
|
|
|
// showOne.value = data.showOne; |
|
|
|
// showTwo.value = data.showTwo; |
|
|
|
// initialData.value = data.time; |
|
|
|
// 设置市场名称用于显示 |
|
|
|
// marketOneName.value = marketList[0]?.market || ''; |
|
|
|
// marketTwoName.value = marketList[1]?.market || ''; |
|
|
|
// marketOneId.value = data.marketOneId; |
|
|
|
// marketTwoId.value = data.marketTwoId; |
|
|
|
// // 设置市场名称 |
|
|
|
// marketOneName.value = data.marketOne; |
|
|
|
// marketTwoName.value = data.marketTwo; |
|
|
|
|
|
|
|
// } catch (error) { |
|
|
|
// console.error('获取数据失败:', error); |
|
|
|
// ElMessage.error('获取数据失败,请重试'); |
|
|
|
// // 可以添加错误处理逻辑 |
|
|
|
// } |
|
|
|
// }; |
|
|
|
|
|
|
|
|
|
|
|
const fetchData = async () => { |
|
|
|
try { |
|
|
|
// ✅ 修改传参方式为对象 |
|
|
|
const response = await showsetDetail({ activityId: activityStone.selectactivityId }); |
|
|
|
const data = response.data; |
|
|
|
// ✅ 取出两个市场数据 |
|
|
|
const marketList = data.data; |
|
|
|
// ✅ 先清空数据,防止上次数据残留 |
|
|
|
if (marketList && marketList.length >= 2) { |
|
|
|
const marketOneData = marketList[0]; |
|
|
|
const marketTwoData = marketList[1]; |
|
|
|
// 市场一赋值 |
|
|
|
marketOne.value = marketOneData.market; |
|
|
|
showOne.value = marketOneData.show; |
|
|
|
markerOneTotal.value = marketOneData.markerTotal; |
|
|
|
marketOneId.value = marketOneData.marketId; |
|
|
|
// 市场二赋值 |
|
|
|
marketTwo.value = marketTwoData.market; |
|
|
|
showTwo.value = marketTwoData.show; |
|
|
|
markerTwoTotal.value = marketTwoData.markerTotal; |
|
|
|
marketTwoId.value = marketTwoData.marketId; |
|
|
|
} |
|
|
|
// 初始时间赋值 |
|
|
|
initialData.value = data.time; |
|
|
|
marketOneName.value = marketList[0]?.market || ''; |
|
|
|
marketTwoName.value = marketList[1]?.market || ''; |
|
|
|
} catch (error) { |
|
|
|
console.error('获取数据失败:', error); |
|
|
|
ElMessage.error('获取数据失败,请重试'); |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -211,8 +210,10 @@ const confirmInitialData = async () => { |
|
|
|
} |
|
|
|
|
|
|
|
const response = await setTime( |
|
|
|
id, |
|
|
|
time |
|
|
|
{ |
|
|
|
activityId: id, |
|
|
|
time: time |
|
|
|
} |
|
|
|
) |
|
|
|
|
|
|
|
if (response.code === 200) { |
|
|
|