From 1d73521e17339b525ac3cf0528270f04c3f3c290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 21 Nov 2025 10:47:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=9B=B4=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E5=8F=8A=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改商品列表和详情页价格展示，增加会员价和原价显示
- 调整订单确认收货状态值从30改为20
- 恢复订单列表中查看物流按钮功能
- 更新二维码接口域名地址
- 统一使用Taro组件替换部分原生HTML标签
---
 src/components/SimpleQRCodeModal.tsx       |  2 +-
 src/pages/index/BestSellers.tsx            |  2 +
 src/shop/category/components/GoodsList.tsx | 59 ++++++++++++----------
 src/shop/goodsDetail/index.tsx             |  6 ++-
 src/user/order/components/OrderList.tsx    | 10 ++--
 5 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/components/SimpleQRCodeModal.tsx b/src/components/SimpleQRCodeModal.tsx
index 167c8cc..1acde23 100644
--- a/src/components/SimpleQRCodeModal.tsx
+++ b/src/components/SimpleQRCodeModal.tsx
@@ -81,7 +81,7 @@ const SimpleQRCodeModal: React.FC<SimpleQRCodeModalProps> = ({
             {qrContent ? (
               <View className={'flex flex-col justify-center'}>
                 <img
-                  src={`https://cms-api.websoft.top/api/qr-code/create-encrypted-qr-image?size=300x300&expireMinutes=60&businessType=gift&data=${encodeURIComponent(qrContent)}`}
+                  src={`https://mp-api.websoft.top/api/qr-code/create-encrypted-qr-image?size=300x300&expireMinutes=60&businessType=gift&data=${encodeURIComponent(qrContent)}`}
                   alt="二维码"
                   style={{width: '200px', height: '200px'}}
                   className="mx-auto"
diff --git a/src/pages/index/BestSellers.tsx b/src/pages/index/BestSellers.tsx
index 1ada7ca..1b85144 100644
--- a/src/pages/index/BestSellers.tsx
+++ b/src/pages/index/BestSellers.tsx
@@ -124,6 +124,8 @@ const BestSellers = (props: {onStickyChange?: (isSticky: boolean) => void}) => {
                       <View className={'flex text-red-500 text-xl items-baseline'}>
                         <Text className={'text-xs'}>￥</Text>
                         <Text className={'font-bold text-2xl'}>{item.price}</Text>
+                        <Text className={'text-xs px-1'}>会员价</Text>
+                        <Text className={'text-xs text-gray-400 line-through'}>￥{item.salePrice}</Text>
                       </View>
                       <View className={'buy-btn'}>
                         <View className={'cart-icon items-center hidden'}>
diff --git a/src/shop/category/components/GoodsList.tsx b/src/shop/category/components/GoodsList.tsx
index 19f34aa..f84ae9e 100644
--- a/src/shop/category/components/GoodsList.tsx
+++ b/src/shop/category/components/GoodsList.tsx
@@ -1,5 +1,6 @@
 import {Image} from '@nutui/nutui-react-taro'
 import {Share} from '@nutui/icons-react-taro'
+import {View, Text} from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import './GoodsList.scss'
 
@@ -8,43 +9,45 @@ const GoodsList = (props: any) => {
 
   return (
     <>
-      <div className={'py-3'}>
-        <div className={'flex flex-col justify-between items-center rounded-lg px-2'}>
-          {props.data?.map((item, index) => {
+      <View className={'py-3'}>
+        <View className={'flex flex-col justify-between items-center rounded-lg px-2'}>
+          {props.data?.map((item: any, index: number) => {
             return (
-              <div key={index} className={'flex flex-col rounded-lg bg-white shadow-sm w-full mb-5'}>
+              <View key={index} className={'flex flex-col rounded-lg bg-white shadow-sm w-full mb-5'}>
                 <Image src={item.image} mode={'aspectFit'} lazyLoad={false}
                        radius="10px 10px 0 0" height="180"
                        onClick={() => Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}/>
-                <div className={'flex flex-col p-2 rounded-lg'}>
-                  <div>
-                    <div className={'car-no text-sm'}>{item.name}</div>
-                    <div className={'flex justify-between text-xs py-1'}>
-                      <span className={'text-orange-500'}>{item.comments}</span>
-                      <span className={'text-gray-400'}>已售 {item.sales}</span>
-                    </div>
-                    <div className={'flex justify-between items-center py-2'}>
-                      <div className={'flex text-red-500 text-xl items-baseline'}>
-                        <span className={'text-xs'}>￥</span>
-                        <span className={'font-bold text-2xl'}>{item.price}</span>
-                      </div>
-                      <div className={'buy-btn'}>
-                        <div className={'cart-icon'}>
+                <View className={'flex flex-col p-2 rounded-lg'}>
+                  <View>
+                    <View className={'car-no text-sm'}>{item.name}</View>
+                    <View className={'flex justify-between text-xs py-1'}>
+                      <Text className={'text-orange-500'}>{item.comments}</Text>
+                      <Text className={'text-gray-400'}>已售 {item.sales}</Text>
+                    </View>
+                    <View className={'flex justify-between items-center py-2'}>
+                      <View className={'flex text-red-500 text-xl items-baseline'}>
+                        <Text className={'text-xs'}>￥</Text>
+                        <Text className={'font-bold text-2xl'}>{item.price}</Text>
+                        <Text className={'text-xs px-1'}>会员价</Text>
+                        <Text className={'text-xs text-gray-400 line-through'}>￥{item.salePrice}</Text>
+                      </View>
+                      <View className={'buy-btn'}>
+                        <View className={'cart-icon'}>
                           <Share size={20} className={'mx-4 mt-2'}
                                  onClick={() => Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}/>
-                        </div>
-                        <div className={'text-white pl-4 pr-5'}
+                        </View>
+                        <View className={'text-white pl-4 pr-5'}
                              onClick={() => Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}>购买
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              </View>
             )
           })}
-        </div>
-      </div>
+        </View>
+      </View>
     </>
   )
 }
diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx
index 3b716eb..37a6630 100644
--- a/src/shop/goodsDetail/index.tsx
+++ b/src/shop/goodsDetail/index.tsx
@@ -280,8 +280,10 @@ const GoodsDetail = () => {
             <>
               <View className={'flex justify-between'}>
                 <View className={'flex text-red-500 text-xl items-baseline'}>
-                  <span className={'text-xs'}>￥</span>
-                  <span className={'font-bold text-2xl'}>{goods.price}</span>
+                  <Text className={'text-xs'}>￥</Text>
+                  <Text className={'font-bold text-2xl'}>{goods.price}</Text>
+                  <Text className={'text-xs px-1'}>会员价</Text>
+                  <Text className={'text-xs text-gray-400 line-through'}>￥{goods.salePrice}</Text>
                 </View>
                 <span className={"text-gray-400 text-xs"}>已售 {goods.sales}</span>
               </View>
diff --git a/src/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx
index 1ccbac2..b7d9015 100644
--- a/src/user/order/components/OrderList.tsx
+++ b/src/user/order/components/OrderList.tsx
@@ -284,7 +284,7 @@ function OrderList(props: OrderListProps) {
 
       await updateShopOrder({
         ...orderToConfirmReceive,
-        deliveryStatus: 30, // 已收货
+        deliveryStatus: 20, // 已收货
         orderStatus: 1 // 已完成
       });
 
@@ -748,10 +748,10 @@ function OrderList(props: OrderListProps) {
                         {/* 待收货状态：显示查看物流和确认收货 */}
                         {item.deliveryStatus === 20 && item.orderStatus !== 2 && (
                           <Space>
-                            {/*<Button size={'small'} onClick={(e) => {*/}
-                            {/*  e.stopPropagation();*/}
-                            {/*  viewLogistics(item);*/}
-                            {/*}}>查看物流</Button>*/}
+                            <Button size={'small'} onClick={(e) => {
+                              e.stopPropagation();
+                              viewLogistics(item);
+                            }}>查看物流</Button>
                             <Button size={'small'} type="primary" onClick={(e) => {
                               e.stopPropagation();
                               confirmReceive(item);