From c6fcf9c2e561298a26a13a908d95e5ba4dd9b2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 11 Aug 2025 16:32:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(shop/orderConfirm):=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=92=8C=E5=86=85=E5=AE=B9-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20-=20=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E6=80=BB=E4=BB=B7=E5=92=8C=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shop/orderConfirm/index.tsx | 46 +++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/shop/orderConfirm/index.tsx b/src/shop/orderConfirm/index.tsx
index 7d5ed79..1d826cd 100644
--- a/src/shop/orderConfirm/index.tsx
+++ b/src/shop/orderConfirm/index.tsx
@@ -4,7 +4,7 @@ import {Location, ArrowRight} from '@nutui/icons-react-taro'
 import Taro, {useDidShow} from '@tarojs/taro'
 import {ShopGoods} from "@/api/shop/shopGoods/model";
 import {getShopGoods} from "@/api/shop/shopGoods";
-import {View} from '@tarojs/components';
+import {View, Text} from '@tarojs/components';
 import {listShopUserAddress} from "@/api/shop/shopUserAddress";
 import {ShopUserAddress} from "@/api/shop/shopUserAddress/model";
 import './index.scss'
@@ -118,8 +118,9 @@ const OrderConfirm = () => {
                   <Space className={'flex flex-row w-full'}>
                     <View className={'flex-wrap text-nowrap whitespace-nowrap text-gray-500'}>送至</View>
                     <View className={'font-medium text-sm flex items-center w-full'}>
-                      <View style={{width: '64%'}}>{address.province} {address.city} {address.region} {address.address}</View>
-                      <ArrowRight className={'text-gray-500'} size={14} />
+                      <View
+                        style={{width: '64%'}}>{address.province} {address.city} {address.region} {address.address}</View>
+                      <ArrowRight className={'text-gray-500'} size={14}/>
                     </View>
                   </Space>
                   <View className={'pt-1 pb-3 text-gray-500'}>{address.name} {address.phone}</View>
@@ -157,20 +158,6 @@ const OrderConfirm = () => {
         </Cell>
       </CellGroup>
 
-      <CellGroup>
-        <Cell title={`商品总价（共1件）`} extra={<View className={'font-medium'}>{'￥' + goods.price}</View>}/>
-        <Cell title={'优惠券'} extra={(
-          <View className={'flex justify-between items-center'}>
-            <View className={'text-red-500 text-sm mr-1'}>-￥0.00</View>
-            <ArrowRight className={'text-gray-400'} size={14}/>
-          </View>
-        )}/>
-        {/*<Cell title={'配送费'} extra={'￥' + 10}/>*/}
-        <Cell title={'订单备注'} extra={(
-          <Input placeholder={'选填，请先和商家协商一致'} style={{padding: '0'}}/>
-        )}/>
-      </CellGroup>
-
       <CellGroup>
         <Cell
           title={'支付方式'}
@@ -184,6 +171,31 @@ const OrderConfirm = () => {
         />
       </CellGroup>
 
+      <CellGroup>
+        <Cell title={`商品总价（共1件）`} extra={<View className={'font-medium'}>{'￥' + goods.price}</View>}/>
+        <Cell title={'优惠券'} extra={(
+          <View className={'flex justify-between items-center'}>
+            <View className={'text-red-500 text-sm mr-1'}>-￥0.00</View>
+            <ArrowRight className={'text-gray-400'} size={14}/>
+          </View>
+        )}/>
+        <Cell title={'配送费'} extra={'￥0.00'}/>
+        <Cell extra={(
+          <View className={'flex items-end gap-2'}>
+            <Text>已优惠</Text>
+            <Text className={'text-red-500 text-sm'}>￥0.0</Text>
+            <Text className={'ml-2'}>小计</Text>
+            <Text className={'text-gray-700 font-bold'}>￥{goods.price}</Text>
+          </View>
+        )}/>
+      </CellGroup>
+
+      <CellGroup>
+        <Cell title={'订单备注'} extra={(
+          <Input placeholder={'选填，请先和商家协商一致'} style={{padding: '0'}}/>
+        )}/>
+      </CellGroup>
+
       <ActionSheet
         visible={isVisible}
         options={payments}