yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/156/head
YunaiV 2025-07-15 09:09:04 +08:00
parent d768df328a 9696c309b7
commit 08fa88129e
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
View File

@ -133,7 +133,7 @@
}); });
const state = reactive({ const state = reactive({
selectedSku: {}, // 选中的 SKU selectedSku: {}, // 选中的 SKU
currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号 currentPropertyArray: {}, // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
grouponNum: props.grouponNum, grouponNum: props.grouponNum,
}); });
@ -212,7 +212,7 @@
noChooseValueIds.splice(index, 1); noChooseValueIds.splice(index, 1);
} else { } else {
// 循环去除当前已选择的 value 属性值 id // 循环去除当前已选择的 value 属性值 id
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId.toString() !== '') { if (currentPropertyId.toString() !== '') {
return; return;
} }
@ -229,8 +229,8 @@
let choosePropertyIds = []; let choosePropertyIds = [];
if (!isChecked) { if (!isChecked) {
// 当前已选择的 property // 当前已选择的 property
state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentValueId]) => {
if (currentPropertyId !== '') { if (currentValueId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyIds.push(currentValueId); choosePropertyIds.push(currentValueId);
} }
@ -261,9 +261,9 @@
continue; continue;
} }
let isOk = true; let isOk = true;
state.currentPropertyArray.forEach((propertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, valueId]) => {
// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除 // valueId 不为空，并且，这个 条 sku 没有被选中，则排除
if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) { if (valueId.toString() !== '' && sku.value_id_array.indexOf(valueId) < 0) {
isOk = false; isOk = false;
} }
}); });
@ -292,7 +292,7 @@
// 选中的 property 大类 // 选中的 property 大类
let choosePropertyId = []; let choosePropertyId = [];
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId !== '') { if (currentPropertyId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyId.push(currentPropertyId); choosePropertyId.push(currentPropertyId);

16
sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
View File

@ -126,7 +126,7 @@
const state = reactive({ const state = reactive({
goodsInfo: computed(() => props.modelValue), goodsInfo: computed(() => props.modelValue),
selectedSku: {}, selectedSku: {},
currentPropertyArray: [], currentPropertyArray: {},
}); });
const getShowPriceText = computed(() => { const getShowPriceText = computed(() => {
let priceText = `￥${fen2yuan(state.goodsInfo.price)}`; let priceText = `￥${fen2yuan(state.goodsInfo.price)}`;
@ -209,7 +209,7 @@
noChooseValueIds.splice(index, 1); noChooseValueIds.splice(index, 1);
} else { } else {
// 循环去除当前已选择的 value 属性值 id // 循环去除当前已选择的 value 属性值 id
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId.toString() !== '') { if (currentPropertyId.toString() !== '') {
return; return;
} }
@ -226,8 +226,8 @@
let choosePropertyIds = []; let choosePropertyIds = [];
if (!isChecked) { if (!isChecked) {
// 当前已选择的 property // 当前已选择的 property
state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentValueId]) => {
if (currentPropertyId !== '') { if (currentValueId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyIds.push(currentValueId); choosePropertyIds.push(currentValueId);
} }
@ -258,9 +258,9 @@
continue; continue;
} }
let isOk = true; let isOk = true;
state.currentPropertyArray.forEach((propertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, valueId]) => {
// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除 // valueId 不为空，并且，这个 条 sku 没有被选中，则排除
if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) { if (valueId.toString() !== '' && sku.value_id_array.indexOf(valueId) < 0) {
isOk = false; isOk = false;
} }
}); });
@ -289,7 +289,7 @@
// 选中的 property 大类 // 选中的 property 大类
let choosePropertyId = []; let choosePropertyId = [];
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId !== '') { if (currentPropertyId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyId.push(currentPropertyId); choosePropertyId.push(currentPropertyId);

16
sheep/components/s-select-sku/s-select-sku.vue
View File

@ -111,7 +111,7 @@
const state = reactive({ const state = reactive({
selectedSku: {}, // 选中的 SKU selectedSku: {}, // 选中的 SKU
currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号 currentPropertyArray: {}, // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
}); });
const propertyList = convertProductPropertyList(props.goodsInfo.skus); const propertyList = convertProductPropertyList(props.goodsInfo.skus);
@ -202,7 +202,7 @@
noChooseValueIds.splice(index, 1); noChooseValueIds.splice(index, 1);
} else { } else {
// 循环去除当前已选择的 value 属性值 id // 循环去除当前已选择的 value 属性值 id
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId.toString() !== '') { if (currentPropertyId.toString() !== '') {
return; return;
} }
@ -219,8 +219,8 @@
let choosePropertyIds = []; let choosePropertyIds = [];
if (!isChecked) { if (!isChecked) {
// 当前已选择的 property // 当前已选择的 property
state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentValueId]) => {
if (currentPropertyId !== '') { if (currentValueId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyIds.push(currentValueId); choosePropertyIds.push(currentValueId);
} }
@ -251,9 +251,9 @@
continue; continue;
} }
let isOk = true; let isOk = true;
state.currentPropertyArray.forEach((propertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, valueId]) => {
// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除 // valueId 不为空，并且，这个 条 sku 没有被选中，则排除
if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) { if (valueId.toString() !== '' && sku.value_id_array.indexOf(valueId) < 0) {
isOk = false; isOk = false;
} }
}); });
@ -282,7 +282,7 @@
// 选中的 property 大类 // 选中的 property 大类
let choosePropertyId = []; let choosePropertyId = [];
state.currentPropertyArray.forEach((currentPropertyId) => { Object.entries(state.currentPropertyArray).forEach(([propertyId, currentPropertyId]) => {
if (currentPropertyId !== '') { if (currentPropertyId !== '') {
// currentPropertyId 为空是反选 填充的 // currentPropertyId 为空是反选 填充的
choosePropertyId.push(currentPropertyId); choosePropertyId.push(currentPropertyId);