diff --git a/pages/index/index.vue b/pages/index/index.vue index 758af69..022110b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -79,7 +79,7 @@ {{ item.name }} - {{ item.description.sub_title }} + {{ item.description }} @@ -280,10 +280,7 @@ export default { page: this.page, page_size: this.page_size }).then((res) => { - this.shopList = res.list.map(item => { - item.description = parseDescription(item.description) - return item - }) + this.shopList = res.list console.log(this.shopList ) }) }, diff --git a/pages/order/create.vue b/pages/order/create.vue index 6551b62..4d22612 100644 --- a/pages/order/create.vue +++ b/pages/order/create.vue @@ -91,7 +91,7 @@ 运费 - ¥{{ formatPrice(shippingFee) }} + 包邮 优惠 diff --git a/pages/order/index.vue b/pages/order/index.vue index ecf2c7c..1a610e7 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -449,7 +449,7 @@ export default { success: async (res) => { if (res.confirm) { try { - await request(`xcx/order/${order.id || order.order_id}/confirm`, 'POST'); + await request(`xcx/order/confirm_receipt/${order.id || order.order_id}`, 'POST'); uni.showToast({ title: '确认收货成功', icon: 'success' diff --git a/pages/shopDetail/index.vue b/pages/shopDetail/index.vue index fa528ae..4f7c89c 100644 --- a/pages/shopDetail/index.vue +++ b/pages/shopDetail/index.vue @@ -63,7 +63,7 @@ - {{ productInfo.description.sub_title || + {{ productInfo.description|| '经典玫瑰香调,优雅女神范,持久留香8小时。采用法国进口玫瑰精油,层次丰富,前调清新,中调浓郁,后调温暖。适合日常使用,也是送礼的绝佳选择。' }} @@ -150,9 +150,9 @@ - + 香调层次 @@ -376,10 +376,11 @@ export default { }, computed: { currentPrice() { - // 直接取第一个SKU的价格 - if (this.skuList && this.skuList.length > 0) { - const firstSku = this.skuList[0]; - return firstSku.price || firstSku.sku_price || 0; + // 优先使用已选SKU价格,未选择时回退到列表首项/商品价 + const sku = this.selectedSku + || (this.skuList && this.skuList.length > 0 ? this.skuList[0] : null); + if (sku) { + return sku.price || sku.sku_price || 0; } return this.productInfo.price || 139; }, @@ -446,8 +447,8 @@ export default { } this.productInfo.scent_level = JSON.parse(productInfo.scent_level); this.productInfo.attr = JSON.parse(productInfo.attr); - this.productInfo.description = parseDescription(productInfo.description); - console.log(this.productInfo.description) + // this.productInfo.description = parseDescription(productInfo.description); + // console.log(this.productInfo.description) // 处理SKU列表 if (productInfo.skus && Array.isArray(productInfo.skus) && productInfo.skus.length > 0) { this.skuList = productInfo.skus;