SwtTt29
/
Mini-Program
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

重写新接口api，添加查询速率

main
User 4 days ago
parent
bcf5df3d08
commit
4b1461ed77
3 changed files with 572 additions and 389 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 165
      pages/compare_price/index.js
  2. 140
      pages/goods-detail/goods-detail.js
  3. 114
      utils/api.js

165
pages/compare_price/index.js
View File

@ -130,7 +130,9 @@ Page({
currentGoods: null, currentGoods: null,
currentSwiperIndex: 0, currentSwiperIndex: 0,
currentPage: 1, currentPage: 1,
hasMore: true pageSize: 10, // 每页展示10条数据
hasMore: true,
allGoods: [] // 存储所有符合条件的商品
}, },
onLoad: function (options) { onLoad: function (options) {
@ -490,21 +492,24 @@ Page({
loadingMore: page > 1 ? true : false loadingMore: page > 1 ? true : false
}); });
API.getProducts(page, 20, 'all', '') // 如果是第一页，获取所有符合条件的商品
.then(res => { if (page === 1) {
console.log('获取商品列表成功:', res); // 使用新的API接口获取相同规格的商品数据
API.getProductsBySpecification(specWeight)
.then(comparisonProducts => {
console.log('获取到的对比商品数据:', comparisonProducts);
console.log('选择的种类:', selectedCategory); console.log('选择的种类:', selectedCategory);
console.log('选择的规格:', specWeight); console.log('选择的规格:', specWeight);
let filteredGoods = []; let filteredGoods = [];
if (res && res.products) { if (comparisonProducts && Array.isArray(comparisonProducts)) {
console.log('原始商品数量:', res.products.length); console.log('原始商品数量:', comparisonProducts.length);
// 获取当前商品的唯一标识符 // 获取当前商品的唯一标识符
const currentGoodsId = goodsData.productId || goodsData.id || goodsData._id; const currentGoodsId = goodsData.productId || goodsData.id || goodsData._id;
console.log('当前商品ID:', currentGoodsId); console.log('当前商品ID:', currentGoodsId);
// 过滤商品 // 过滤商品
filteredGoods = res.products.filter(item => { filteredGoods = comparisonProducts.filter(item => {
// 1. 排除当前商品 // 1. 排除当前商品
const itemId = item.productId || item.id || item._id; const itemId = item.productId || item.id || item._id;
if (currentGoodsId && itemId && currentGoodsId === itemId) { if (currentGoodsId && itemId && currentGoodsId === itemId) {
@ -522,102 +527,6 @@ Page({
return false; return false;
} }
// 4. 过滤规格
if (specWeight) {
// 检查多个可能存储重量信息的字段
const fieldsToCheck = [
item.specification,
item.grossWeight,
item.weightQuantityData,
item.spec // 检查spec字段
];
let hasMatchingSpec = false;
for (const field of fieldsToCheck) {
if (!field) continue;
if (typeof field === 'string') {
// 处理字符串格式的规格数据
console.log('检查字符串规格:', field, '是否包含', specWeight);
// 处理逗号分隔的规格字符串
const specs = field.split(/[,，、]/).map(s => s.trim());
if (specs.some(spec => spec.includes(specWeight))) {
hasMatchingSpec = true;
break;
}
} else if (Array.isArray(field)) {
// 处理数组格式的规格数据
console.log('检查数组规格:', field);
if (field.some(spec => {
if (typeof spec === 'string') {
console.log('检查数组元素(字符串):', spec, '是否包含', specWeight);
return spec.includes(specWeight);
} else if (typeof spec === 'object') {
// 检查对象格式的规格数据
const specStr = spec.weightSpec || spec.display || spec.spec || '';
console.log('检查数组元素(对象):', specStr, '是否包含', specWeight);
return specStr.includes(specWeight);
}
return false;
})) {
hasMatchingSpec = true;
break;
}
} else if (typeof field === 'object') {
// 处理对象格式的规格数据
console.log('检查对象规格:', field);
const specStr = field.weightSpec || field.display || field.spec || '';
console.log('检查对象规格值:', specStr, '是否包含', specWeight);
if (specStr.includes(specWeight)) {
hasMatchingSpec = true;
break;
}
}
}
// 如果没有找到匹配的规格，尝试进行更宽松的匹配
if (!hasMatchingSpec) {
console.log('尝试更宽松的匹配...');
// 提取规格中的数字部分进行匹配
const weightNum = specWeight.replace(/[^0-9-]/g, '');
console.log('提取的重量数字:', weightNum);
for (const field of fieldsToCheck) {
if (!field) continue;
if (typeof field === 'string') {
console.log('检查字符串字段:', field, '是否包含', weightNum);
if (field.includes(weightNum)) {
hasMatchingSpec = true;
break;
}
} else if (Array.isArray(field)) {
console.log('检查数组字段:', field);
if (field.some(spec => {
const specStr = typeof spec === 'string' ? spec : (spec.weightSpec || spec.display || spec.spec || '');
console.log('检查数组元素:', specStr, '是否包含', weightNum);
return specStr.includes(weightNum);
})) {
hasMatchingSpec = true;
break;
}
} else if (typeof field === 'object') {
console.log('检查对象字段:', field);
const specStr = field.weightSpec || field.display || field.spec || '';
console.log('检查对象字段值:', specStr, '是否包含', weightNum);
if (specStr.includes(weightNum)) {
hasMatchingSpec = true;
break;
}
}
}
}
if (!hasMatchingSpec) {
return false;
}
}
return true; return true;
}); });
console.log('过滤后的商品数量:', filteredGoods.length); console.log('过滤后的商品数量:', filteredGoods.length);
@ -791,15 +700,23 @@ Page({
return item; return item;
}); });
// 合并商品数据 // 存储所有符合条件的商品
const newGoods = page === 1 ? processedGoods : [...this.data.goods, ...processedGoods]; this.setData({
allGoods: processedGoods
});
// 计算当前页应该显示的商品
const { pageSize } = this.data;
const startIndex = (page - 1) * pageSize;
const endIndex = startIndex + pageSize;
const currentPageGoods = processedGoods.slice(startIndex, endIndex);
// 检查是否还有更多数据 // 检查是否还有更多数据
const hasMore = res && res.products && res.products.length >= 20; const hasMore = endIndex < processedGoods.length;
// 设置商品数据 // 设置商品数据
this.setData({ this.setData({
goods: newGoods, goods: currentPageGoods,
loading: false, loading: false,
loadingMore: false, loadingMore: false,
currentPage: page, currentPage: page,
@ -808,20 +725,14 @@ Page({
showTips: false showTips: false
}); });
console.log('对比价格数据加载完成:', newGoods); console.log('对比价格数据加载完成:', currentPageGoods);
// 如果符合条件的数据少于5条，自动加载更多数据
if (newGoods.length < 5 && hasMore) {
console.log('符合条件的数据少于5条，自动加载更多数据');
this.loadGoodsData(page + 1, selectedCategory, specWeight, goodsData);
} else if (page === 1) {
// 显示提示信息 // 显示提示信息
wx.showToast({ wx.showToast({
title: `找到${newGoods.length}个符合条件的商品`, title: `找到${processedGoods.length}个符合条件的商品`,
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}); });
}
}) })
.catch(err => { .catch(err => {
console.error('获取商品列表失败:', err); console.error('获取商品列表失败:', err);
@ -834,6 +745,30 @@ Page({
icon: 'none' icon: 'none'
}); });
}); });
} else {
// 如果不是第一页，从allGoods中获取数据
const { allGoods, pageSize } = this.data;
const startIndex = (page - 1) * pageSize;
const endIndex = startIndex + pageSize;
const currentPageGoods = allGoods.slice(startIndex, endIndex);
// 检查是否还有更多数据
const hasMore = endIndex < allGoods.length;
// 合并商品数据
const newGoods = [...this.data.goods, ...currentPageGoods];
// 设置商品数据
this.setData({
goods: newGoods,
loading: false,
loadingMore: false,
currentPage: page,
hasMore: hasMore
});
console.log('加载更多数据完成:', currentPageGoods);
}
}, },
// 加载更多数据 // 加载更多数据

140
pages/goods-detail/goods-detail.js
View File

@ -3861,6 +3861,22 @@ Page({
// 只有一个规格，直接跳转 // 只有一个规格，直接跳转
const selectedSpec = currentSpecifications[0]; const selectedSpec = currentSpecifications[0];
// 显示加载提示
wx.showLoading({
title: '正在获取对比数据...',
mask: true
});
// 提取规格信息用于查询
const specification = selectedSpec.weightSpec || selectedSpec.display || '';
console.log('准备通过规格查询商品，规格:', specification);
// 调用API获取相同规格的商品数据
API.getProductsBySpecification(specification)
.then(comparisonProducts => {
wx.hideLoading();
console.log('获取到的对比商品数据:', comparisonProducts);
// 构建要传递的数据 // 构建要传递的数据
const goodsData = { const goodsData = {
id: currentGoods.id || currentGoods.productId, id: currentGoods.id || currentGoods.productId,
@ -3877,7 +3893,8 @@ Page({
frequency: currentGoods.frequency || 0, frequency: currentGoods.frequency || 0,
status: currentGoods.status || 'published', status: currentGoods.status || 'published',
totalStock: currentGoods.totalStock || '充足', totalStock: currentGoods.totalStock || '充足',
selectedSpec: selectedSpec selectedSpec: selectedSpec,
comparisonProducts: comparisonProducts // 添加对比商品数据
}; };
console.log('准备跳转到对比价格页面，传递的数据:', goodsData); console.log('准备跳转到对比价格页面，传递的数据:', goodsData);
@ -3896,6 +3913,48 @@ Page({
}); });
} }
}); });
})
.catch(error => {
wx.hideLoading();
console.error('获取对比商品数据失败:', error);
// 即使获取对比数据失败，也继续跳转到对比价格页面
const goodsData = {
id: currentGoods.id || currentGoods.productId,
name: currentGoods.name || '',
price: currentGoods.price || '',
imageUrls: currentGoods.imageUrls || [],
region: currentGoods.region || '',
weightQuantityData: currentGoods.weightQuantityData || [],
category: selectedCategory,
yolk: currentGoods.yolk || '',
sourceType: currentGoods.sourceType || '',
supplyStatus: currentGoods.supplyStatus || '',
mediaItems: currentGoods.mediaItems || [],
frequency: currentGoods.frequency || 0,
status: currentGoods.status || 'published',
totalStock: currentGoods.totalStock || '充足',
selectedSpec: selectedSpec,
comparisonProducts: [] // 空数组，表示获取失败
};
console.log('获取对比数据失败，准备跳转到对比价格页面，传递的数据:', goodsData);
// 跳转到对比价格页面
wx.navigateTo({
url: `/pages/compare_price/index?goodsData=${encodeURIComponent(JSON.stringify(goodsData))}`,
success: function () {
console.log('成功跳转到对比价格页面');
},
fail: function (error) {
console.error('跳转到对比价格页面失败:', error);
wx.showToast({
title: '跳转失败，请稍后重试',
icon: 'none'
});
}
});
});
} else if (currentSpecifications.length > 1) { } else if (currentSpecifications.length > 1) {
// 存在多个规格，弹出弹窗让用户选择 // 存在多个规格，弹出弹窗让用户选择
this.setData({ this.setData({
@ -3924,7 +3983,8 @@ Page({
frequency: currentGoods.frequency || 0, frequency: currentGoods.frequency || 0,
status: currentGoods.status || 'published', status: currentGoods.status || 'published',
totalStock: currentGoods.totalStock || '充足', totalStock: currentGoods.totalStock || '充足',
selectedSpec: null selectedSpec: null,
comparisonProducts: [] // 空数组，因为没有规格
}; };
console.log('准备跳转到对比价格页面，传递的数据:', goodsData); console.log('准备跳转到对比价格页面，传递的数据:', goodsData);
@ -4000,6 +4060,22 @@ Page({
const selectedCategory = this.data.selectedCategory || currentGoods.category || '全部'; const selectedCategory = this.data.selectedCategory || currentGoods.category || '全部';
const selectedSpec = this.data.selectedSpec; const selectedSpec = this.data.selectedSpec;
// 显示加载提示
wx.showLoading({
title: '正在获取对比数据...',
mask: true
});
// 提取规格信息用于查询
const specification = selectedSpec.weightSpec || selectedSpec.display || '';
console.log('准备通过规格查询商品，规格:', specification);
// 调用API获取相同规格的商品数据
API.getProductsBySpecification(specification)
.then(comparisonProducts => {
wx.hideLoading();
console.log('获取到的对比商品数据:', comparisonProducts);
// 显示提示信息 // 显示提示信息
wx.showToast({ wx.showToast({
title: `已选择${selectedCategory} ${selectedSpec.display}`, title: `已选择${selectedCategory} ${selectedSpec.display}`,
@ -4028,7 +4104,8 @@ Page({
frequency: currentGoods.frequency || 0, frequency: currentGoods.frequency || 0,
status: currentGoods.status || 'published', status: currentGoods.status || 'published',
totalStock: currentGoods.totalStock || '充足', totalStock: currentGoods.totalStock || '充足',
selectedSpec: selectedSpec selectedSpec: selectedSpec,
comparisonProducts: comparisonProducts // 添加对比商品数据
}; };
console.log('准备跳转到对比价格页面，传递的数据:', goodsData); console.log('准备跳转到对比价格页面，传递的数据:', goodsData);
@ -4050,6 +4127,63 @@ Page({
}, 1500); }, 1500);
} }
}); });
})
.catch(error => {
wx.hideLoading();
console.error('获取对比商品数据失败:', error);
// 即使获取对比数据失败，也继续跳转到对比价格页面
wx.showToast({
title: `已选择${selectedCategory} ${selectedSpec.display}`,
icon: 'info',
duration: 1500,
success: () => {
setTimeout(() => {
// 关闭弹窗
this.setData({
showCompareModal: false
});
// 构建要传递的数据
const goodsData = {
id: currentGoods.id || currentGoods.productId,
name: currentGoods.name || '',
price: currentGoods.price || '',
imageUrls: currentGoods.imageUrls || [],
region: currentGoods.region || '',
weightQuantityData: currentGoods.weightQuantityData || [],
category: selectedCategory,
yolk: currentGoods.yolk || '',
sourceType: currentGoods.sourceType || '',
supplyStatus: currentGoods.supplyStatus || '',
mediaItems: currentGoods.mediaItems || [],
frequency: currentGoods.frequency || 0,
status: currentGoods.status || 'published',
totalStock: currentGoods.totalStock || '充足',
selectedSpec: selectedSpec,
comparisonProducts: [] // 空数组，表示获取失败
};
console.log('获取对比数据失败，准备跳转到对比价格页面，传递的数据:', goodsData);
// 跳转到对比价格页面
wx.navigateTo({
url: `/pages/compare_price/index?goodsData=${encodeURIComponent(JSON.stringify(goodsData))}`,
success: function () {
console.log('成功跳转到对比价格页面');
},
fail: function (error) {
console.error('跳转到对比价格页面失败:', error);
wx.showToast({
title: '跳转失败，请稍后重试',
icon: 'none'
});
}
});
}, 1500);
}
});
});
}, },
// 关闭对比价格弹窗 // 关闭对比价格弹窗

114
utils/api.js
View File

@ -5056,5 +5056,119 @@ module.exports = {
reject(error); reject(error);
}); });
}); });
},
// 通过规格查找不同规格的数据
getProductsBySpecification: function (specification) {
console.log('API.getProductsBySpecification - specification:', specification);
return new Promise((resolve, reject) => {
// 使用getProducts接口获取所有商品，然后在客户端过滤
this.getProducts(1, 100, 'all', '').then(res => {
console.log('获取商品列表成功:', res);
if (res && res.products) {
// 过滤出具有相同规格的商品
const filteredProducts = res.products.filter(item => {
// 检查多个可能存储重量信息的字段
const fieldsToCheck = [
item.specification,
item.grossWeight,
item.weightQuantityData,
item.spec // 检查spec字段
];
let hasMatchingSpec = false;
for (const field of fieldsToCheck) {
if (!field) continue;
if (typeof field === 'string') {
// 处理字符串格式的规格数据
console.log('检查字符串规格:', field, '是否包含', specification);
// 处理逗号分隔的规格字符串
const specs = field.split(/[,，、]/).map(s => s.trim());
if (specs.some(spec => spec.includes(specification))) {
hasMatchingSpec = true;
break;
}
} else if (Array.isArray(field)) {
// 处理数组格式的规格数据
console.log('检查数组规格:', field);
if (field.some(spec => {
if (typeof spec === 'string') {
console.log('检查数组元素(字符串):', spec, '是否包含', specification);
return spec.includes(specification);
} else if (typeof spec === 'object') {
// 检查对象格式的规格数据
const specStr = spec.weightSpec || spec.display || spec.spec || '';
console.log('检查数组元素(对象):', specStr, '是否包含', specification);
return specStr.includes(specification);
}
return false;
})) {
hasMatchingSpec = true;
break;
}
} else if (typeof field === 'object') {
// 处理对象格式的规格数据
console.log('检查对象规格:', field);
const specStr = field.weightSpec || field.display || field.spec || '';
console.log('检查对象规格值:', specStr, '是否包含', specification);
if (specStr.includes(specification)) {
hasMatchingSpec = true;
break;
}
}
}
// 如果没有找到匹配的规格，尝试进行更宽松的匹配
if (!hasMatchingSpec) {
console.log('尝试更宽松的匹配...');
// 提取规格中的数字部分进行匹配
const weightNum = specification.replace(/[^0-9-]/g, '');
console.log('提取的重量数字:', weightNum);
for (const field of fieldsToCheck) {
if (!field) continue;
if (typeof field === 'string') {
console.log('检查字符串字段:', field, '是否包含', weightNum);
if (field.includes(weightNum)) {
hasMatchingSpec = true;
break;
}
} else if (Array.isArray(field)) {
console.log('检查数组字段:', field);
if (field.some(spec => {
const specStr = typeof spec === 'string' ? spec : (spec.weightSpec || spec.display || spec.spec || '');
console.log('检查数组元素:', specStr, '是否包含', weightNum);
return specStr.includes(weightNum);
})) {
hasMatchingSpec = true;
break;
}
} else if (typeof field === 'object') {
console.log('检查对象字段:', field);
const specStr = field.weightSpec || field.display || field.spec || '';
console.log('检查对象字段值:', specStr, '是否包含', weightNum);
if (specStr.includes(weightNum)) {
hasMatchingSpec = true;
break;
}
}
}
}
return hasMatchingSpec;
});
console.log('过滤后的商品数量:', filteredProducts.length);
console.log('过滤后的商品:', filteredProducts);
resolve(filteredProducts);
} else {
reject(new Error('通过规格查找商品失败'));
}
}).catch(error => {
console.error('通过规格查找商品失败:', error);
reject(new Error('通过规格查找商品失败，请稍后重试'));
});
});
} }
}; };
Write Preview
Loading…
Cancel
Save