From fed0018168a512bbbc963f7ddf3abc485140f416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E5=93=A5?= <17630302050@163.com>
Date: Mon, 8 Dec 2025 22:54:28 +0800
Subject: [PATCH] qwe

---
 pages/index/index.vue      |  7 ++-----
 pages/order/create.vue     |  2 +-
 pages/order/index.vue      |  2 +-
 pages/shopDetail/index.vue | 19 ++++++++++---------
 4 files changed, 14 insertions(+), 16 deletions(-)

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 }}
 						</view>
 						<view class="sku-description">
-							{{ item.description.sub_title }}
+							{{ item.description }}
 						</view>
 						<view class="sku-rating">
 							<text class="iconfont icon-xingxing"></text>
@@ -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 @@
 			</view>
 			<view class="price-item">
 				<text class="price-label">运费</text>
-				<text class="price-value">￥{{ formatPrice(shippingFee) }}</text>
+				<text class="price-value">包邮</text>
 			</view>
 			<view class="price-item total" v-if="discountAmount > 0">
 				<text class="price-label">优惠</text>
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 @@
 
                <!-- 商品描述 -->
                <view class="product-description">
-                    {{ productInfo.description.sub_title ||
+                    {{ productInfo.description||
                          '经典玫瑰香调,优雅女神范,持久留香8小时。采用法国进口玫瑰精油,层次丰富,前调清新,中调浓郁,后调温暖。适合日常使用,也是送礼的绝佳选择。' }}
                </view>
           </view>
@@ -150,9 +150,9 @@
           <view class="content-section">
                <!-- 商品详情 -->
                <view class="tab-content" v-if="activeTab === 'detail'">
-                    <view class="detail-section">
+                    <!-- <view class="detail-section">
                          <rich-text :nodes="productInfo.description.details"></rich-text>
-                    </view>
+                    </view> -->
                     <view class="detail-section">
                          <view class="section-title">香调层次</view>
                          <view class="fragrance-notes">
@@ -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;