From 2a3b661478e8c1f1c02a78d89f9c176b6be0b886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 5 Feb 2026 18:35:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(ticket):=20=E7=A7=BB=E9=99=A4=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E5=8D=A1=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 ticket/add.config.ts 和 ticket/add.tsx 页面文件
- 删除 ticket/detail.config.ts 和 ticket/detail.tsx 页面文件
- 删除 ticket/receive.config.ts 和 ticket/receive.tsx 页面文件
- 删除 ticket/redeem.config.ts 和 ticket/redeem.tsx 页面文件
- 将 app.config.ts 中的 ticket/detail 路由改为 ticket/use
- 修改首页订单按钮跳转链接从 goodsDetail 到 ticket/use
- 修改首页商品卡片按钮跳转从 coupon/index 到 ticket/index
- 新增 ticket/use.config.ts 配置文件并设置页面标题为立即送水
---
 src/app.config.ts                 |    2 +-
 src/pages/index/index.tsx         |    4 +-
 src/user/ticket/add.config.ts     |    4 -
 src/user/ticket/add.tsx           |  323 ----------
 src/user/ticket/detail.config.ts  |    5 -
 src/user/ticket/detail.tsx        |  335 ----------
 src/user/ticket/receive.config.ts |    5 -
 src/user/ticket/receive.tsx       |  247 -------
 src/user/ticket/redeem.config.ts  |    5 -
 src/user/ticket/redeem.tsx        |  278 --------
 src/user/ticket/use.config.ts     |    5 +-
 src/user/ticket/use.scss          |  116 ++++
 src/user/ticket/use.tsx           | 1001 ++++++++++++++++++++++-------
 13 files changed, 885 insertions(+), 1445 deletions(-)
 delete mode 100644 src/user/ticket/add.config.ts
 delete mode 100644 src/user/ticket/add.tsx
 delete mode 100644 src/user/ticket/detail.config.ts
 delete mode 100644 src/user/ticket/detail.tsx
 delete mode 100644 src/user/ticket/receive.config.ts
 delete mode 100644 src/user/ticket/receive.tsx
 delete mode 100644 src/user/ticket/redeem.config.ts
 delete mode 100644 src/user/ticket/redeem.tsx
 create mode 100644 src/user/ticket/use.scss

diff --git a/src/app.config.ts b/src/app.config.ts
index e861ab7..035923d 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -54,7 +54,7 @@ export default {
         "coupon/index",
         "points/points",
         "ticket/index",
-        "ticket/detail",
+        "ticket/use",
         // "gift/index",
         // "gift/redeem",
         // "gift/detail",
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 79de900..8adba04 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -207,7 +207,7 @@ function Home() {
         key: 'order',
         title: '立即送水',
         icon: <Cart size={30} />,
-        onClick: () => Taro.navigateTo({ url: '/shop/goodsDetail/index?id=10074' }),
+        onClick: () => Taro.navigateTo({ url: '/user/ticket/use?goodsId=10074' }),
       },
       {
         key: 'invite',
@@ -313,7 +313,7 @@ function Home() {
                 <View className="goods-card__actions">
                   <View
                     className="goods-card__btn goods-card__btn--ghost"
-                    onClick={() => Taro.navigateTo({ url: '/user/coupon/index' })}
+                    onClick={() => Taro.navigateTo({ url: '/user/ticket/index' })}
                   >
                     <Text className="goods-card__btnText">买水票更优惠</Text>
                   </View>
diff --git a/src/user/ticket/add.config.ts b/src/user/ticket/add.config.ts
deleted file mode 100644
index 5d97955..0000000
--- a/src/user/ticket/add.config.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '新增收货地址',
-  navigationBarTextStyle: 'black'
-})
diff --git a/src/user/ticket/add.tsx b/src/user/ticket/add.tsx
deleted file mode 100644
index 493b1d3..0000000
--- a/src/user/ticket/add.tsx
+++ /dev/null
@@ -1,323 +0,0 @@
-import {useEffect, useState, useRef} from "react";
-import {useRouter} from '@tarojs/taro'
-import {Button, Loading, CellGroup, Input, TextArea, Form, Switch, InputNumber, Radio, Image} from '@nutui/nutui-react-taro'
-import {Edit, Upload as UploadIcon} from '@nutui/icons-react-taro'
-import Taro from '@tarojs/taro'
-import {View} from '@tarojs/components'
-import {ShopArticle} from "@/api/shop/shopArticle/model";
-import {getShopArticle, addShopArticle, updateShopArticle} from "@/api/shop/shopArticle";
-import FixedButton from "@/components/FixedButton";
-
-const AddShopArticle = () => {
-  const {params} = useRouter();
-  const [loading, setLoading] = useState<boolean>(true)
-  const [formData, setFormData] = useState<ShopArticle>({
-    type: 0, // 默认常规文章
-    status: 0, // 默认已发布
-    permission: 0, // 默认所有人可见
-    recommend: 0, // 默认不推荐
-    showType: 10, // 默认小图展示
-    virtualViews: 0, // 默认虚拟阅读量
-    actualViews: 0, // 默认实际阅读量
-    sortNumber: 0 // 默认排序
-  })
-  const formRef = useRef<any>(null)
-
-  // 判断是编辑还是新增模式
-  const isEditMode = !!params.id
-  const articleId = params.id ? Number(params.id) : undefined
-
-  // 文章类型选项
-  const typeOptions = [
-    { text: '常规文章', value: 0 },
-    { text: '视频文章', value: 1 }
-  ]
-
-  // 状态选项
-  const statusOptions = [
-    { text: '已发布', value: 0 },
-    { text: '待审核', value: 1 },
-    { text: '已驳回', value: 2 },
-    { text: '违规内容', value: 3 }
-  ]
-
-  // 可见性选项
-  const permissionOptions = [
-    { text: '所有人可见', value: 0 },
-    { text: '登录可见', value: 1 },
-    { text: '密码可见', value: 2 }
-  ]
-
-  // 显示方式选项
-  const showTypeOptions = [
-    { text: '小图展示', value: 10 },
-    { text: '大图展示', value: 20 }
-  ]
-
-  const reload = async () => {
-    // 如果是编辑模式，加载文章数据
-    if (isEditMode && articleId) {
-      try {
-        const article = await getShopArticle(articleId)
-        setFormData(article)
-        // 更新表单值
-        if (formRef.current) {
-          formRef.current.setFieldsValue(article)
-        }
-      } catch (error) {
-        console.error('加载文章失败:', error)
-        Taro.showToast({
-          title: '加载文章失败',
-          icon: 'error'
-        });
-      }
-    }
-  }
-
-  // 图片上传处理
-  const handleImageUpload = async () => {
-    try {
-      const res = await Taro.chooseImage({
-        count: 1,
-        sizeType: ['compressed'],
-        sourceType: ['album', 'camera']
-      });
-
-      if (res.tempFilePaths && res.tempFilePaths.length > 0) {
-        // 这里应该调用上传接口，暂时使用本地路径
-        const imagePath = res.tempFilePaths[0];
-        setFormData({
-          ...formData,
-          image: imagePath
-        });
-
-        Taro.showToast({
-          title: '图片选择成功',
-          icon: 'success'
-        });
-      }
-    } catch (error) {
-      Taro.showToast({
-        title: '图片选择失败',
-        icon: 'error'
-      });
-    }
-  };
-
-  // 提交表单
-  const submitSucceed = async (values: any) => {
-    try {
-      // 准备提交的数据
-      const submitData = {
-        ...formData,
-        ...values,
-      };
-
-      // 如果是编辑模式，添加id
-      if (isEditMode && articleId) {
-        submitData.articleId = articleId;
-      }
-
-      // 执行新增或更新操作
-      if (isEditMode) {
-        await updateShopArticle(submitData);
-      } else {
-        await addShopArticle(submitData);
-      }
-
-      Taro.showToast({
-        title: `${isEditMode ? '更新' : '保存'}成功`,
-        icon: 'success'
-      });
-
-      setTimeout(() => {
-        Taro.navigateBack();
-      }, 1000);
-
-    } catch (error) {
-      console.error('保存失败:', error);
-      Taro.showToast({
-        title: `${isEditMode ? '更新' : '保存'}失败`,
-        icon: 'error'
-      });
-    }
-  }
-
-  const submitFailed = (error: any) => {
-    console.log(error, 'err...')
-  }
-
-  useEffect(() => {
-    // 动态设置页面标题
-    Taro.setNavigationBarTitle({
-      title: isEditMode ? '编辑文章' : '新增文章'
-    });
-
-    reload().then(() => {
-      setLoading(false)
-    })
-  }, [isEditMode]);
-
-  if (loading) {
-    return <Loading className={'px-2'}>加载中</Loading>
-  }
-
-  return (
-    <>
-      <Form
-        ref={formRef}
-        divider
-        initialValues={formData}
-        labelPosition="left"
-        onFinish={(values) => submitSucceed(values)}
-        onFinishFailed={(errors) => submitFailed(errors)}
-      >
-        {/* 基本信息 */}
-        <CellGroup title="基本信息">
-          <Form.Item
-            name="title"
-            label="文章标题"
-            required
-            rules={[{ required: true, message: '请输入文章标题' }]}
-            initialValue={formData.title}
-          >
-            <Input placeholder="请输入文章标题" maxLength={100}/>
-          </Form.Item>
-
-          <Form.Item name="overview" label="文章概述" initialValue={formData.overview}>
-            <TextArea placeholder="请输入文章概述，用于列表展示" maxLength={200} rows={3}/>
-          </Form.Item>
-
-          <Form.Item
-            name="detail"
-            label="文章内容"
-            required
-            rules={[{ required: true, message: '请输入文章内容' }]}
-            initialValue={formData.detail}
-          >
-            <TextArea placeholder="请输入文章内容" maxLength={10000} rows={8}/>
-          </Form.Item>
-
-          <Form.Item name="author" label="作者" initialValue={formData.author}>
-            <Input placeholder="请输入作者名称" maxLength={50}/>
-          </Form.Item>
-
-          <Form.Item name="source" label="来源" initialValue={formData.source}>
-            <Input placeholder="请输入文章来源" maxLength={100}/>
-          </Form.Item>
-        </CellGroup>
-
-        {/* 文章设置 */}
-        <CellGroup title="文章设置">
-          <Form.Item name="type" label="文章类型" initialValue={formData.type}>
-            <Radio.Group direction="horizontal" value={formData.type}>
-              {typeOptions.map(option => (
-                <Radio key={option.value} value={option.value}>
-                  {option.text}
-                </Radio>
-              ))}
-            </Radio.Group>
-          </Form.Item>
-
-          <Form.Item name="status" label="发布状态" initialValue={formData.status}>
-            <Radio.Group direction="horizontal" value={formData.status}>
-              {statusOptions.map(option => (
-                <Radio key={option.value} value={option.value}>
-                  {option.text}
-                </Radio>
-              ))}
-            </Radio.Group>
-          </Form.Item>
-
-          <Form.Item name="permission" label="可见性" initialValue={formData.permission}>
-            <Radio.Group direction="horizontal" value={formData.permission}>
-              {permissionOptions.map(option => (
-                <Radio key={option.value} value={option.value}>
-                  {option.text}
-                </Radio>
-              ))}
-            </Radio.Group>
-          </Form.Item>
-
-          <Form.Item name="showType" label="显示方式" initialValue={formData.showType}>
-            <Radio.Group direction="horizontal" value={formData.showType}>
-              {showTypeOptions.map(option => (
-                <Radio key={option.value} value={option.value}>
-                  {option.text}
-                </Radio>
-              ))}
-            </Radio.Group>
-          </Form.Item>
-        </CellGroup>
-
-        {/* 高级设置 */}
-        <CellGroup title="高级设置">
-          <Form.Item name="recommend" label="推荐文章" initialValue={formData.recommend}>
-            <Switch
-              checked={formData.recommend === 1}
-              onChange={(checked) =>
-                setFormData({...formData, recommend: checked ? 1 : 0})
-              }
-            />
-          </Form.Item>
-
-          <Form.Item name="price" label="付费金额" initialValue={formData.price}>
-            <Input placeholder="0.00" type="number"/>
-            <View className="text-xs text-gray-500 mt-1">单位：元</View>
-          </Form.Item>
-
-          <Form.Item name="virtualViews" label="虚拟阅读量" initialValue={formData.virtualViews}>
-            <InputNumber min={0} defaultValue={formData.virtualViews || 0}/>
-          </Form.Item>
-
-          <Form.Item name="actualViews" label="实际阅读量" initialValue={formData.actualViews}>
-            <InputNumber min={0} defaultValue={formData.actualViews || 0}/>
-          </Form.Item>
-
-          <Form.Item name="sortNumber" label="排序" initialValue={formData.sortNumber}>
-            <InputNumber min={0} defaultValue={formData.sortNumber || 0}/>
-            <View className="text-xs text-gray-500 mt-1">数字越小越靠前</View>
-          </Form.Item>
-
-          <Form.Item name="tags" label="标签" initialValue={formData.tags}>
-            <Input placeholder="请输入标签，多个标签用逗号分隔" maxLength={200}/>
-          </Form.Item>
-
-          <Form.Item name="topic" label="话题" initialValue={formData.topic}>
-            <Input placeholder="请输入话题" maxLength={100}/>
-          </Form.Item>
-        </CellGroup>
-
-        {/* 图片上传 */}
-        <CellGroup title="文章图片">
-          <Form.Item name="image" label="封面图片" initialValue={formData.image}>
-            <View className="flex items-center gap-3">
-              {formData.image && (
-                <Image
-                  src={formData.image}
-                  width="80"
-                  height="80"
-                  radius="8"
-                />
-              )}
-              <Button
-                size="small"
-                type="primary"
-                fill="outline"
-                icon={<UploadIcon />}
-                onClick={handleImageUpload}
-              >
-                {formData.image ? '更换图片' : '上传图片'}
-              </Button>
-            </View>
-          </Form.Item>
-        </CellGroup>
-
-        {/* 提交按钮 */}
-        <FixedButton text={isEditMode ? '更新文章' : '发布文章'} onClick={() => submitSucceed} icon={<Edit />} />
-      </Form>
-    </>
-  );
-};
-
-export default AddShopArticle;
diff --git a/src/user/ticket/detail.config.ts b/src/user/ticket/detail.config.ts
deleted file mode 100644
index 6b65bff..0000000
--- a/src/user/ticket/detail.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '礼品卡详情',
-  navigationBarTextStyle: 'black',
-  navigationBarBackgroundColor: '#ffffff'
-})
diff --git a/src/user/ticket/detail.tsx b/src/user/ticket/detail.tsx
deleted file mode 100644
index b94841e..0000000
--- a/src/user/ticket/detail.tsx
+++ /dev/null
@@ -1,335 +0,0 @@
-import {useState, useEffect} from "react";
-import {useRouter} from '@tarojs/taro'
-import {Button, ConfigProvider, Divider} from '@nutui/nutui-react-taro'
-import {Gift, Clock, Location, Phone, Copy, QrCode} from '@nutui/icons-react-taro'
-import Taro from '@tarojs/taro'
-import {View, Text} from '@tarojs/components'
-import {ShopGift} from "@/api/shop/shopGift/model";
-import {getShopGift} from "@/api/shop/shopGift";
-import GiftCardShare from "@/components/GiftCardShare";
-import SimpleQRCodeModal from "@/components/SimpleQRCodeModal";
-import dayjs from "dayjs";
-
-const GiftCardDetail = () => {
-  const router = useRouter()
-  const [gift, setGift] = useState<ShopGift | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [showShare, setShowShare] = useState(false)
-  const [showQRCode, setShowQRCode] = useState(false)
-  const giftId = router.params.id
-
-  useEffect(() => {
-    if (giftId) {
-      loadGiftDetail()
-    }
-  }, [giftId])
-
-  const loadGiftDetail = async () => {
-    try {
-      setLoading(true)
-      const data = await getShopGift(Number(giftId))
-      setGift(data)
-    } catch (error) {
-      console.error('获取礼品卡详情失败:', error)
-      Taro.showToast({
-        title: '获取礼品卡详情失败',
-        icon: 'error'
-      })
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 获取礼品卡类型文本
-  const getGiftTypeText = (type?: number) => {
-    switch (type) {
-      case 10: return '礼品劵'
-      case 20: return '虚拟礼品卡'
-      case 30: return '服务礼品卡'
-      default: return '水票'
-    }
-  }
-
-  // 获取礼品卡面值显示
-  const getGiftValueDisplay = () => {
-    if (!gift || !gift.faceValue) return ''
-    return `¥${gift.faceValue}`
-  }
-
-  // 获取使用条件文本
-  const getUsageText = () => {
-    if (!gift) return ''
-
-    if (gift.instructions) {
-      return gift.instructions
-    }
-
-    switch (gift.type) {
-      case 10: return '请到指定门店使用此礼品卡'
-      case 20: return '可在线上平台直接使用'
-      case 30: return '请联系客服预约服务时间'
-      default: return '请按照使用说明进行操作'
-    }
-  }
-
-  // 获取有效期文本
-  const getValidityText = () => {
-    if (!gift) return ''
-
-    if (gift.validDays) {
-      return `有效期${gift.validDays}天`
-    } else if (gift.expireTime) {
-      return `有效期至 ${dayjs(gift.expireTime).format('YYYY年MM月DD日')}`
-    } else {
-      return '长期有效'
-    }
-  }
-
-  // 获取礼品卡状态
-  const getGiftStatus = () => {
-    if (!gift) return { status: 0, text: '未知', color: 'default' }
-
-    switch (gift.status) {
-      case 0:
-        return { status: 0, text: '可使用', color: 'success' }
-      case 1:
-        return { status: 1, text: '已使用', color: 'warning' }
-      case 2:
-        return { status: 2, text: '已过期', color: 'danger' }
-      default:
-        return { status: 0, text: '未知', color: 'default' }
-    }
-  }
-
-  // 使用礼品卡 - 打开二维码弹窗
-  const handleUseGift = () => {
-    if (!gift) return
-    setShowQRCode(true)
-  }
-
-  // 点击二维码图标
-  const handleQRCodeClick = () => {
-    if (!gift) return
-    setShowQRCode(true)
-  }
-
-  // 复制兑换码
-  const handleCopyCode = () => {
-    if (!gift?.code) return
-
-    Taro.setClipboardData({
-      data: gift.code,
-      success: () => {
-        Taro.showToast({
-          title: '兑换码已复制',
-          icon: 'success'
-        })
-      },
-      fail: () => {
-        Taro.showToast({
-          title: '复制失败',
-          icon: 'error'
-        })
-      }
-    })
-  }
-
-  // 返回上一页
-  const handleBack = () => {
-    Taro.navigateBack()
-  }
-
-  if (loading) {
-    return (
-      <ConfigProvider>
-        <View className="flex justify-center items-center h-screen">
-          <Text>加载中...</Text>
-        </View>
-      </ConfigProvider>
-    )
-  }
-
-  if (!gift) {
-    return (
-      <ConfigProvider>
-        <View className="flex flex-col justify-center items-center h-screen">
-          <Text className="text-gray-500 mb-4">礼品卡不存在</Text>
-          <Button onClick={handleBack}>返回</Button>
-        </View>
-      </ConfigProvider>
-    )
-  }
-
-  const statusInfo = getGiftStatus()
-
-  return (
-    <ConfigProvider>
-      {/* 礼品卡卡片 */}
-      <View className="m-4 p-6 rounded-2xl text-white" style={{background: 'linear-gradient(135deg, #667eea 0%, #764ba2 50%, #f093fb 100%)'}}>
-        <View className="flex items-center justify-between mb-4">
-          <View className="w-full">
-            <Text className="text-4xl font-bold">{getGiftValueDisplay()}</Text>
-            <Text className="opacity-90 mt-1 px-2">{getGiftTypeText(gift.type)}</Text>
-          </View>
-          <View
-            className="p-2 bg-white bg-opacity-20 rounded-lg cursor-pointer"
-            onClick={handleQRCodeClick}
-          >
-            <QrCode size="24" />
-          </View>
-        </View>
-
-        <Text className="text-xl font-semibold mb-2">{gift.name}</Text>
-        <Text className="text-base opacity-90 px-2">{gift.description || getUsageText()}</Text>
-
-        {/* 兑换码 */}
-        {gift.code && (
-          <View className="mt-4 p-3 bg-white bg-opacity-20 rounded-lg">
-            <View className="flex items-center justify-between">
-              <View>
-                <Text className="text-sm opacity-80 px-2">兑换码</Text>
-                <Text className="text-lg font-mono font-bold">{gift.code}</Text>
-              </View>
-              <Button
-                size="small"
-                fill="outline"
-                icon={<Copy />}
-                onClick={handleCopyCode}
-                className="border-white text-white"
-              >
-                复制
-              </Button>
-            </View>
-          </View>
-        )}
-      </View>
-
-      {/* 详细信息 */}
-      <View className="bg-white mx-4 rounded-xl p-4">
-        <Text className="text-lg font-semibold">使用说明</Text>
-
-        <View className={'mt-4'}>
-          <View className="flex items-center mb-3">
-            <Clock size="16" className="text-gray-400 mr-3" />
-            <View>
-              <Text className="text-gray-400 text-sm">有效期</Text>
-              <Text className="text-blue-500 text-sm px-1">{getValidityText()}</Text>
-            </View>
-          </View>
-
-          <Divider />
-
-          <View className="flex items-center mb-3">
-            <Gift size="16" className="text-gray-400 mr-3" />
-            <View>
-              <Text className="text-gray-400 text-sm">类型</Text>
-              <Text className="text-blue-500 text-sm px-1">{getGiftTypeText(gift.type)}</Text>
-            </View>
-          </View>
-
-          {gift.useLocation && (
-            <>
-              <Divider />
-              <View className="flex items-center">
-                <Location size="16" className="text-gray-400 mr-3" />
-                <View>
-                  <Text className="text-gray-400 text-sm">使用地址</Text>
-                  <Text className="text-blue-500 text-sm px-1">{gift.useLocation}</Text>
-                </View>
-              </View>
-            </>
-          )}
-
-          {gift.contactInfo && (
-            <>
-              <Divider />
-              <View className="flex items-center">
-                <Phone size="16" className="text-gray-400 mr-3" />
-                <View>
-                  <Text className="text-gray-600 text-sm">客服联系</Text>
-                  <Text className="text-gray-900">{gift.contactInfo}</Text>
-                </View>
-              </View>
-            </>
-          )}
-
-          {gift.instructions && (
-            <>
-              <Divider />
-              <View>
-                <Text className="text-gray-600 text-sm mb-2">使用说明</Text>
-                <Text className="text-gray-900 leading-relaxed">{gift.instructions}</Text>
-              </View>
-            </>
-          )}
-
-          {gift.takeTime && (
-            <>
-              <Divider />
-              <View>
-                <Text className="text-gray-600 text-sm mb-2">使用记录</Text>
-                <Text className="text-gray-900">使用时间：{dayjs(gift.takeTime).format('YYYY-MM-DD HH:mm')}</Text>
-              </View>
-            </>
-          )}
-        </View>
-      </View>
-
-      {/* 底部操作按钮 */}
-      {statusInfo.status === 0 && (
-        <View className="fixed bottom-0 left-0 right-0 p-4 bg-white border-t border-gray-100">
-          <View className="flex gap-3">
-            {gift.code && (
-              <Button
-                fill="outline"
-                size="large"
-                className="flex-1"
-                icon={<Copy />}
-                onClick={handleCopyCode}
-              >
-                复制兑换码
-              </Button>
-            )}
-            <Button
-              type="primary"
-              size="large"
-              className="flex-1"
-              onClick={handleUseGift}
-            >
-              立即使用
-            </Button>
-          </View>
-        </View>
-      )}
-
-      {/* 分享弹窗 */}
-      {gift && (
-        <GiftCardShare
-          visible={showShare}
-          giftCard={{
-            id: gift.id || 0,
-            name: gift.name || '',
-            type: gift.type || 10,
-            faceValue: gift.faceValue || '0',
-            code: gift.code,
-            description: gift.description
-          }}
-          onClose={() => setShowShare(false)}
-        />
-      )}
-
-      {/* 二维码弹窗 */}
-      {gift && (
-        <SimpleQRCodeModal
-          visible={showQRCode}
-          onClose={() => setShowQRCode(false)}
-          qrContent={gift.code + ''}
-          giftName={gift.goodsName || gift.name}
-          faceValue={gift.faceValue}
-        />
-      )}
-    </ConfigProvider>
-  );
-};
-
-export default GiftCardDetail;
diff --git a/src/user/ticket/receive.config.ts b/src/user/ticket/receive.config.ts
deleted file mode 100644
index 784b1d9..0000000
--- a/src/user/ticket/receive.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '领取优惠券',
-  navigationBarTextStyle: 'black',
-  navigationBarBackgroundColor: '#ffffff'
-})
diff --git a/src/user/ticket/receive.tsx b/src/user/ticket/receive.tsx
deleted file mode 100644
index ee6ab12..0000000
--- a/src/user/ticket/receive.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import {useState} from "react";
-import Taro, {useDidShow} from '@tarojs/taro'
-import {Button, Empty, ConfigProvider, SearchBar, InfiniteLoading, Loading, PullToRefresh} from '@nutui/nutui-react-taro'
-import {Gift} from '@nutui/icons-react-taro'
-import {View} from '@tarojs/components'
-import {ShopCoupon} from "@/api/shop/shopCoupon/model";
-import {pageShopCoupon} from "@/api/shop/shopCoupon";
-import CouponList from "@/components/CouponList";
-import {CouponCardProps} from "@/components/CouponCard";
-
-const CouponReceive = () => {
-  const [list, setList] = useState<ShopCoupon[]>([])
-  const [loading, setLoading] = useState(false)
-  const [hasMore, setHasMore] = useState(true)
-  const [searchValue, setSearchValue] = useState('')
-  const [page, setPage] = useState(1)
-  const [total, setTotal] = useState(0)
-
-  const reload = async (isRefresh = false) => {
-    if (isRefresh) {
-      setPage(1)
-      setList([])
-      setHasMore(true)
-    }
-
-    setLoading(true)
-    try {
-      const currentPage = isRefresh ? 1 : page
-      // 获取可领取的优惠券（启用状态且未过期）
-      const res = await pageShopCoupon({
-        page: currentPage,
-        limit: 10,
-        keywords: searchValue,
-        enabled: 1, // 启用状态
-        isExpire: 0   // 未过期
-      })
-
-      if (res && res.list) {
-        const newList = isRefresh ? res.list : [...list, ...res.list]
-        setList(newList)
-        setTotal(res.count || 0)
-
-        setHasMore(res.list.length === 10)
-
-        if (!isRefresh) {
-          setPage(currentPage + 1)
-        } else {
-          setPage(2)
-        }
-      } else {
-        setHasMore(false)
-        setTotal(0)
-      }
-    } catch (error) {
-      console.error('获取优惠券失败:', error)
-      Taro.showToast({
-        title: '获取优惠券失败',
-        icon: 'error'
-      });
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 搜索功能
-  const handleSearch = (value: string) => {
-    setSearchValue(value)
-    reload(true)
-  }
-
-  // 下拉刷新
-  const handleRefresh = async () => {
-    await reload(true)
-  }
-
-  // 转换优惠券数据为CouponCard组件所需格式
-  const transformCouponData = (coupon: ShopCoupon): CouponCardProps => {
-    let amount = 0
-    let type: 10 | 20 | 30 = 10 // 使用新的类型值
-
-    if (coupon.type === 10) { // 满减券
-      type = 10
-      amount = parseFloat(coupon.reducePrice || '0')
-    } else if (coupon.type === 20) { // 折扣券
-      type = 20
-      amount = coupon.discount || 0
-    } else if (coupon.type === 30) { // 免费券
-      type = 30
-      amount = 0
-    }
-
-    return {
-      amount,
-      type,
-      status: 0, // 可领取状态
-      minAmount: parseFloat(coupon.minPrice || '0'),
-      title: coupon.name || '优惠券',
-      startTime: coupon.startTime,
-      endTime: coupon.endTime,
-      showReceiveBtn: true, // 显示领取按钮
-      onReceive: () => handleReceiveCoupon(coupon),
-      theme: getThemeByType(coupon.type)
-    }
-  }
-
-  // 根据优惠券类型获取主题色
-  const getThemeByType = (type?: number): 'red' | 'orange' | 'blue' | 'purple' | 'green' => {
-    switch (type) {
-      case 10: return 'red'    // 满减券
-      case 20: return 'orange' // 折扣券
-      case 30: return 'green'  // 免费券
-      default: return 'blue'
-    }
-  }
-
-  // 领取优惠券
-  const handleReceiveCoupon = async (_: ShopCoupon) => {
-    try {
-      // 这里应该调用领取优惠券的API
-      // await receiveCoupon(coupon.id)
-
-      Taro.showToast({
-        title: '领取成功',
-        icon: 'success'
-      })
-
-      // 刷新列表
-      reload(true)
-    } catch (error) {
-      console.error('领取优惠券失败:', error)
-      Taro.showToast({
-        title: '领取失败',
-        icon: 'error'
-      })
-    }
-  }
-
-  // 优惠券点击事件
-  const handleCouponClick = (_: CouponCardProps, index: number) => {
-    const originalCoupon = list[index]
-    if (originalCoupon) {
-      // 显示优惠券详情
-      showCouponDetail(originalCoupon)
-    }
-  }
-
-  // 显示优惠券详情
-  const showCouponDetail = (coupon: ShopCoupon) => {
-    // 跳转到优惠券详情页
-    Taro.navigateTo({
-      url: `/user/coupon/detail?id=${coupon.id}`
-    })
-  }
-
-  // 加载更多
-  const loadMore = async () => {
-    if (!loading && hasMore) {
-      await reload(false)
-    }
-  }
-
-  useDidShow(() => {
-    reload(true).then()
-  });
-
-  return (
-    <ConfigProvider>
-      {/* 搜索栏 */}
-      <View className="bg-white px-4 py-3">
-        <SearchBar
-          placeholder="搜索优惠券名称"
-          value={searchValue}
-          onChange={setSearchValue}
-          onSearch={handleSearch}
-        />
-      </View>
-
-      {/* 统计信息 */}
-      {total > 0 && (
-        <View className="px-4 py-2 text-sm text-gray-500 bg-gray-50">
-          共找到 {total} 张可领取优惠券
-        </View>
-      )}
-
-      {/* 优惠券列表 */}
-      <PullToRefresh
-        onRefresh={handleRefresh}
-        headHeight={60}
-      >
-        <View style={{ height: 'calc(100vh - 160px)', overflowY: 'auto' }} id="coupon-scroll">
-        {list.length === 0 && !loading ? (
-          <View className="flex flex-col justify-center items-center" style={{height: 'calc(100vh - 250px)'}}>
-            <Empty
-              description="暂无可领取优惠券"
-              style={{backgroundColor: 'transparent'}}
-            />
-            <Button
-              type="primary"
-              size="small"
-              className="mt-4"
-              onClick={() => Taro.navigateTo({url: '/pages/index/index'})}
-            >
-              去逛逛
-            </Button>
-          </View>
-        ) : (
-          <InfiniteLoading
-            target="coupon-scroll"
-            hasMore={hasMore}
-            onLoadMore={loadMore}
-            loadingText={
-              <View className="flex justify-center items-center py-4">
-                <Loading />
-                <View className="ml-2">加载中...</View>
-              </View>
-            }
-            loadMoreText={
-              <View className="text-center py-4 text-gray-500">
-                {list.length === 0 ? "暂无数据" : "没有更多了"}
-              </View>
-            }
-          >
-            <CouponList
-              coupons={list.map(transformCouponData)}
-              onCouponClick={handleCouponClick}
-              showEmpty={false}
-            />
-          </InfiniteLoading>
-        )}
-        </View>
-      </PullToRefresh>
-
-      {/* 底部提示 */}
-      {list.length === 0 && !loading && (
-        <View className="text-center py-8">
-          <View className="text-gray-400 mb-4">
-            <Gift size="48" />
-          </View>
-          <View className="text-gray-500 mb-2">暂无可领取优惠券</View>
-          <View className="text-gray-400 text-sm">请关注商家活动获取更多优惠券</View>
-        </View>
-      )}
-    </ConfigProvider>
-  );
-};
-
-export default CouponReceive;
diff --git a/src/user/ticket/redeem.config.ts b/src/user/ticket/redeem.config.ts
deleted file mode 100644
index 4141b53..0000000
--- a/src/user/ticket/redeem.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '兑换礼品卡',
-  navigationBarTextStyle: 'black',
-  navigationBarBackgroundColor: '#ffffff'
-})
diff --git a/src/user/ticket/redeem.tsx b/src/user/ticket/redeem.tsx
deleted file mode 100644
index ca725ba..0000000
--- a/src/user/ticket/redeem.tsx
+++ /dev/null
@@ -1,278 +0,0 @@
-import {useState, useEffect} from "react";
-import {useRouter} from '@tarojs/taro'
-import {Button, ConfigProvider, Input, Divider} from '@nutui/nutui-react-taro'
-import {ArrowLeft, QrCode, Gift, Voucher} from '@nutui/icons-react-taro'
-import Taro from '@tarojs/taro'
-import {View, Text} from '@tarojs/components'
-import dayjs from 'dayjs'
-import {ShopGift} from "@/api/shop/shopGift/model";
-import {pageShopGift, updateShopGift} from "@/api/shop/shopGift";
-import GiftCard from "@/components/GiftCard";
-
-const GiftCardRedeem = () => {
-  const router = useRouter()
-  const [code, setCode] = useState('')
-  const [loading, setLoading] = useState(false)
-  const [validating, setValidating] = useState(false)
-  const [validGift, setValidGift] = useState<ShopGift | null>(null)
-  const [redeemSuccess, setRedeemSuccess] = useState(false)
-
-  // 从路由参数获取扫码结果
-  useEffect(() => {
-    if (router.params.code) {
-      const scannedCode = decodeURIComponent(router.params.code)
-      setCode(scannedCode)
-      handleValidateCode(scannedCode)
-    }
-  }, [router.params.code])
-
-  // 验证兑换码
-  const handleValidateCode = async (inputCode?: string) => {
-    const codeToValidate = inputCode || code
-    if (!codeToValidate.trim()) {
-      Taro.showToast({
-        title: '请输入兑换码',
-        icon: 'none'
-      })
-      return
-    }
-
-    setValidating(true)
-    try {
-      const gifts = await pageShopGift({code: codeToValidate,status: 0})
-      if(gifts?.count == 0){
-        Taro.showToast({
-          title: '兑换码无效或已使用',
-          icon: 'none'
-        })
-        return
-      }
-      const item = gifts?.list[0];
-      if(item){
-        setValidGift(item)
-        Taro.showToast({
-          title: '验证成功',
-          icon: 'success'
-        })
-      }
-    } catch (error) {
-      console.error('验证兑换码失败:', error)
-      setValidGift(null)
-      Taro.showToast({
-        title: '兑换码无效或已使用',
-        icon: 'error'
-      })
-    } finally {
-      setValidating(false)
-    }
-  }
-
-  // 兑换礼品卡
-  const handleRedeem = async () => {
-    if (!validGift || !code.trim()) return
-
-    setLoading(true)
-    try {
-      await updateShopGift({
-        ...validGift,
-        userId: Taro.getStorageSync('UserId'),
-        takeTime: dayjs.unix(Date.now() / 1000).format('YYYY-MM-DD HH:mm:ss')
-      })
-
-      setRedeemSuccess(true)
-      Taro.showToast({
-        title: '兑换成功',
-        icon: 'success'
-      })
-    } catch (error) {
-      console.error('兑换礼品卡失败:', error)
-      Taro.showToast({
-        title: '兑换失败',
-        icon: 'error'
-      })
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 扫码兑换
-  const handleScanCode = () => {
-    Taro.scanCode({
-      success: (res) => {
-        const scannedCode = res.result
-        if (scannedCode) {
-          setCode(scannedCode)
-          handleValidateCode(scannedCode)
-        }
-      },
-      fail: () => {
-        Taro.showToast({
-          title: '扫码失败',
-          icon: 'error'
-        })
-      }
-    })
-  }
-
-  // 返回上一页
-  const handleBack = () => {
-    Taro.navigateBack()
-  }
-
-  // 查看我的礼品卡
-  const handleViewMyGifts = () => {
-    Taro.navigateTo({
-      url: '/user/gift/index'
-    })
-  }
-
-  // 转换礼品卡数据
-  const transformGiftData = (gift: ShopGift) => {
-    return {
-      id: gift.id || 0,
-      name: gift.name || '水票',
-      description: gift.description,
-      code: gift.code,
-      goodsImage: gift.goodsImage,
-      faceValue: gift.faceValue,
-      type: gift.type,
-      expireTime: gift.expireTime,
-      takeTime: gift.takeTime,
-      useLocation: gift.useLocation,
-      contactInfo: gift.contactInfo,
-      showCode: false, // 兑换页面不显示兑换码
-      showUseBtn: false, // 兑换页面不显示使用按钮
-      showDetailBtn: false, // 兑换页面不显示详情按钮
-      theme: 'gold' as const
-    }
-  }
-
-  return (
-    <ConfigProvider>
-      {/* 自定义导航栏 */}
-      <View className="flex items-center justify-between p-4 bg-white border-b border-gray-100 hidden">
-        <View className="flex items-center" onClick={handleBack}>
-          <ArrowLeft size="20" />
-          <Text className="ml-2 text-lg">兑换礼品卡</Text>
-        </View>
-      </View>
-
-      {!redeemSuccess ? (
-        <>
-          {/* 兑换说明 */}
-          <View className="bg-blue-50 mx-4 mt-4 p-4 rounded-xl border border-blue-200">
-            <View className="flex items-center mb-2">
-              <Gift size="20" className="text-blue-600 mr-2" />
-              <Text className="font-semibold text-blue-800">兑换说明</Text>
-            </View>
-            <Text className="text-blue-700 text-sm leading-relaxed">
-              请输入或扫描礼品卡兑换码，验证成功后即可兑换到您的账户中。每个兑换码只能使用一次。
-            </Text>
-          </View>
-
-          {/* 兑换码输入 */}
-          <View className="bg-white mx-4 mt-4 p-4 rounded-xl">
-            <Text className="font-semibold mb-3 text-gray-800">输入兑换码</Text>
-
-            <View className="mb-4">
-              <Input
-                placeholder="请输入礼品卡兑换码"
-                value={code}
-                onChange={setCode}
-                clearable
-                className="border border-gray-200 rounded-lg"
-              />
-            </View>
-
-            <View className="flex gap-3">
-              <Button
-                fill="outline"
-                size="large"
-                className="flex-1"
-                icon={<QrCode />}
-                onClick={handleScanCode}
-              >
-                扫码输入
-              </Button>
-              <Button
-                type="primary"
-                size="large"
-                className="flex-1"
-                loading={validating}
-                onClick={() => handleValidateCode()}
-              >
-                验证兑换码
-              </Button>
-            </View>
-          </View>
-
-          {/* 验证结果 */}
-          {validGift && (
-            <>
-              <Divider className="my-4">验证成功</Divider>
-
-              <View className="mx-4">
-                <GiftCard {...transformGiftData(validGift)} />
-              </View>
-
-              <View className="mx-4 mt-4">
-                <Button
-                  type="primary"
-                  size="large"
-                  block
-                  loading={loading}
-                  onClick={handleRedeem}
-                >
-                  确认兑换
-                </Button>
-              </View>
-            </>
-          )}
-        </>
-      ) : (
-        /* 兑换成功页面 */
-        <View className="flex flex-col items-center justify-center px-4" style={{height: '600px'}}>
-          <View className="text-center">
-            <View className="w-20 h-20 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4">
-              <Voucher size="40" className="text-green-600" />
-            </View>
-
-            <Text className="text-2xl font-bold text-gray-900 mb-2">兑换成功！</Text>
-            <Text className="text-left text-gray-500 mb-6">礼品卡已添加到您的账户中</Text>
-
-            {validGift && (
-              <View className="mb-6">
-                <GiftCard {...transformGiftData(validGift)} />
-              </View>
-            )}
-
-            <View className="flex flex-col gap-3 w-full max-w-xs">
-              <Button
-                type="primary"
-                size="large"
-                block
-                onClick={handleViewMyGifts}
-              >
-                查看我的礼品卡
-              </Button>
-              <Button
-                fill="outline"
-                size="large"
-                block
-                onClick={() => {
-                  setCode('')
-                  setValidGift(null)
-                  setRedeemSuccess(false)
-                }}
-              >
-                继续兑换
-              </Button>
-            </View>
-          </View>
-        </View>
-      )}
-    </ConfigProvider>
-  );
-};
-
-export default GiftCardRedeem;
diff --git a/src/user/ticket/use.config.ts b/src/user/ticket/use.config.ts
index 321d2ad..cdc1742 100644
--- a/src/user/ticket/use.config.ts
+++ b/src/user/ticket/use.config.ts
@@ -1,6 +1,5 @@
 export default definePageConfig({
-  navigationBarTitleText: '使用礼品卡',
+  navigationBarTitleText: '立即送水',
   navigationBarTextStyle: 'black',
-  navigationBarBackgroundColor: '#ffffff',
-  navigationStyle: 'custom'
+  navigationBarBackgroundColor: '#ffffff'
 })
diff --git a/src/user/ticket/use.scss b/src/user/ticket/use.scss
new file mode 100644
index 0000000..3f80bc9
--- /dev/null
+++ b/src/user/ticket/use.scss
@@ -0,0 +1,116 @@
+.order-confirm-page {
+  padding-bottom: 100px; // 留出底部固定按钮的空间
+
+  .error-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 60px 20px;
+    text-align: center;
+
+    .error-text {
+      color: #999;
+      margin-bottom: 20px;
+      font-size: 14px;
+    }
+  }
+
+  .fixed-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 20px;
+    background-color: #fff;
+    border-top: 1px solid #eee;
+    box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
+
+    .total-price {
+      display: flex;
+      align-items: center;
+    }
+
+    .submit-btn {
+      width: 150px;
+    }
+  }
+}
+.address-bottom-line{
+  width: 100%;
+  border-radius: 12rpx 12rpx 0 0;
+  background: #fff;
+  padding: 26rpx 49rpx 0 34rpx;
+  position: relative;
+  &:before {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    height: 5px;
+    background: repeating-linear-gradient(-45deg, #ff6c6c, #ff6c6c 20%, transparent 0, transparent 25%, #1989fa 0,
+      #1989fa 45%, transparent 0, transparent 50%);
+    background-size: 120px;
+    content: "";
+  }
+}
+
+// 优惠券弹窗样式
+.coupon-popup {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  &__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333;
+  }
+
+  &__content {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  &__loading {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 200px;
+    color: #999;
+    font-size: 14px;
+  }
+
+  &__current {
+    padding: 16px;
+    background: #f8f9fa;
+    border-bottom: 1px solid #f0f0f0;
+
+    &-title {
+      font-size: 28rpx;
+      color: #666;
+      margin-bottom: 8px;
+    }
+
+    &-item {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8rpx 12rpx;
+      background: #fff;
+      border-radius: 6rpx;
+      font-size: 28rpx;
+    }
+  }
+}
diff --git a/src/user/ticket/use.tsx b/src/user/ticket/use.tsx
index 2aec304..2a67781 100644
--- a/src/user/ticket/use.tsx
+++ b/src/user/ticket/use.tsx
@@ -1,290 +1,817 @@
-import {useState, useEffect} from "react";
-import {useRouter} from '@tarojs/taro'
-import {Button, ConfigProvider, Input, TextArea} from '@nutui/nutui-react-taro'
-import {ArrowLeft, Location} from '@nutui/icons-react-taro'
-import Taro from '@tarojs/taro'
-import {View, Text} from '@tarojs/components'
-import {ShopGift} from "@/api/shop/shopGift/model";
-import {getShopGift, useGift} from "@/api/shop/shopGift";
-import GiftCard from "@/components/GiftCard";
+import {useEffect, useState} from "react";
+import {
+  Image,
+  Button,
+  Cell,
+  CellGroup,
+  Input,
+  Space,
+  ActionSheet,
+  Popup,
+  InputNumber,
+  ConfigProvider
+} from '@nutui/nutui-react-taro'
+import {Location, ArrowRight, Shop} 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, Text} from '@tarojs/components';
+import {listShopUserAddress} from "@/api/shop/shopUserAddress";
+import {ShopUserAddress} from "@/api/shop/shopUserAddress/model";
+import './use.scss'
+import Gap from "@/components/Gap";
+import {selectPayment} from "@/api/system/payment";
+import {Payment} from "@/api/system/payment/model";
+import {PaymentHandler, PaymentType, buildSingleGoodsOrder} from "@/utils/payment";
+import OrderConfirmSkeleton from "@/components/OrderConfirmSkeleton";
+import CouponList from "@/components/CouponList";
+import {CouponCardProps} from "@/components/CouponCard";
+import {getMyAvailableCoupons} from "@/api/shop/shopUserCoupon";
+import {
+  transformCouponData,
+  calculateCouponDiscount,
+  isCouponUsable,
+  getCouponUnusableReason,
+  sortCoupons,
+  filterUsableCoupons,
+  filterUnusableCoupons
+} from "@/utils/couponUtils";
+import navTo from "@/utils/common";
+import type {ShopStore} from "@/api/shop/shopStore/model";
+import {getShopStore, listShopStore} from "@/api/shop/shopStore";
+import {getSelectedStoreFromStorage, saveSelectedStoreToStorage} from "@/utils/storeSelection";
 
-const GiftCardUse = () => {
-  const router = useRouter()
-  const [gift, setGift] = useState<ShopGift | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [submitting, setSubmitting] = useState(false)
-  const [useLocation, setUseLocation] = useState('')
-  const [useNote, setUseNote] = useState('')
-  const [useSuccess, setUseSuccess] = useState(false)
-  const giftId = router.params.id
 
-  useEffect(() => {
-    if (giftId) {
-      loadGiftDetail()
-    }
-  }, [giftId])
+const OrderConfirm = () => {
+  const [goods, setGoods] = useState<ShopGoods | null>(null);
+  const [address, setAddress] = useState<ShopUserAddress>()
+  const [payments, setPayments] = useState<any[]>([])
+  const [payment, setPayment] = useState<Payment>()
+  const [isVisible, setIsVisible] = useState<boolean>(false)
+  const [quantity, setQuantity] = useState<number>(1)
+  const [orderRemark, setOrderRemark] = useState<string>('')
+  const [loading, setLoading] = useState<boolean>(true)
+  const [error, setError] = useState<string>('')
+  const [payLoading, setPayLoading] = useState<boolean>(false)
 
-  // 加载礼品卡详情
-  const loadGiftDetail = async () => {
+  // InputNumber 主题配置
+  const customTheme = {
+    nutuiInputnumberButtonWidth: '28px',
+    nutuiInputnumberButtonHeight: '28px',
+    nutuiInputnumberInputWidth: '40px',
+    nutuiInputnumberInputHeight: '28px',
+    nutuiInputnumberInputBorderRadius: '4px',
+    nutuiInputnumberButtonBorderRadius: '4px',
+  }
+
+  // 优惠券相关状态
+  const [selectedCoupon, setSelectedCoupon] = useState<CouponCardProps | null>(null)
+  const [couponVisible, setCouponVisible] = useState<boolean>(false)
+  const [availableCoupons, setAvailableCoupons] = useState<CouponCardProps[]>([])
+  const [couponLoading, setCouponLoading] = useState<boolean>(false)
+
+  // 门店选择：用于在下单页展示当前“已选门店”，并允许用户切换（写入 SelectedStore Storage）
+  const [storePopupVisible, setStorePopupVisible] = useState(false)
+  const [stores, setStores] = useState<ShopStore[]>([])
+  const [storeLoading, setStoreLoading] = useState(false)
+  const [selectedStore, setSelectedStore] = useState<ShopStore | null>(getSelectedStoreFromStorage())
+
+  const router = Taro.getCurrentInstance().router;
+  const goodsId = router?.params?.goodsId;
+
+  const loadStores = async () => {
+    if (storeLoading) return
     try {
-      setLoading(true)
-      const data = await getShopGift(Number(giftId))
-      setGift(data)
-
-      // 如果礼品卡有预设使用地址，自动填入
-      if (data.useLocation) {
-        setUseLocation(data.useLocation)
-      }
-    } catch (error) {
-      console.error('获取礼品卡详情失败:', error)
-      Taro.showToast({
-        title: '获取礼品卡详情失败',
-        icon: 'error'
-      })
+      setStoreLoading(true)
+      const list = await listShopStore()
+      setStores((list || []).filter(s => s?.isDelete !== 1))
+    } catch (e) {
+      console.error('获取门店列表失败:', e)
+      setStores([])
+      Taro.showToast({title: '获取门店列表失败', icon: 'none'})
     } finally {
-      setLoading(false)
+      setStoreLoading(false)
     }
   }
 
-  // 使用礼品卡
-  const handleUseGift = async () => {
-    if (!gift) return
+  const openStorePopup = async () => {
+    setStorePopupVisible(true)
+    if (!stores.length) {
+      await loadStores()
+    }
+  }
+
+  // 计算商品总价
+  const getGoodsTotal = () => {
+    if (!goods) return 0
+    const price = parseFloat(goods.price || '0')
+    // const total = price * quantity
+
+    // 🔍 详细日志，用于排查数值精度问题
+    // console.log('💵 商品总价计算:', {
+    //   goodsPrice: goods.price,
+    //   goodsPriceType: typeof goods.price,
+    //   parsedPrice: price,
+    //   quantity: quantity,
+    //   total: total,
+    //   totalFixed2: total.toFixed(2),
+    //   totalString: total.toString()
+    // })
+
+    return price * quantity
+  }
+
+  // 计算优惠券折扣
+  const getCouponDiscount = () => {
+    if (!selectedCoupon || !goods) return 0
+    const total = getGoodsTotal()
+    return calculateCouponDiscount(selectedCoupon, total)
+  }
+
+  // 计算实付金额
+  const getFinalPrice = () => {
+    const total = getGoodsTotal()
+    const discount = getCouponDiscount()
+    return Math.max(0, total - discount)
+  }
+
+
+  const handleSelect = (item: any) => {
+    setPayment(payments.find(payment => payment.name === item.name))
+    setIsVisible(false)
+  }
+
+  // 处理数量变化
+  const handleQuantityChange = (value: string | number) => {
+    const newQuantity = typeof value === 'string' ? parseInt(value) || 1 : value
+    const finalQuantity = Math.max(1, Math.min(newQuantity, goods?.stock || 999))
+    setQuantity(finalQuantity)
+
+    // 数量变化时，重新排序优惠券并检查当前选中的优惠券是否还可用
+    if (availableCoupons.length > 0) {
+      const newTotal = parseFloat(goods?.price || '0') * finalQuantity
+      const sortedCoupons = sortCoupons(availableCoupons, newTotal)
+      const usableCoupons = filterUsableCoupons(sortedCoupons, newTotal)
+      setAvailableCoupons(sortedCoupons)
+
+      // 检查当前选中的优惠券是否还可用
+      if (selectedCoupon && !isCouponUsable(selectedCoupon, newTotal)) {
+        setSelectedCoupon(null)
+        Taro.showToast({
+          title: '当前优惠券不满足使用条件，已自动取消',
+          icon: 'none'
+        })
+
+        // 🎯 自动推荐新的最优优惠券
+        if (usableCoupons.length > 0) {
+          const bestCoupon = usableCoupons[0]
+          const discount = calculateCouponDiscount(bestCoupon, newTotal)
+
+          if (discount > 0) {
+            setSelectedCoupon(bestCoupon)
+            Taro.showToast({
+              title: `已为您重新推荐最优优惠券，可省￥${discount.toFixed(2)}`,
+              icon: 'success',
+              duration: 3000
+            })
+          }
+        }
+      } else if (!selectedCoupon && usableCoupons.length > 0) {
+        // 🔔 如果没有选中优惠券但有可用的，推荐最优的
+        const bestCoupon = usableCoupons[0]
+        const discount = calculateCouponDiscount(bestCoupon, newTotal)
+
+        if (discount > 0) {
+          setSelectedCoupon(bestCoupon)
+          Taro.showToast({
+            title: `已为您推荐最优优惠券，可省￥${discount.toFixed(2)}`,
+            icon: 'success',
+            duration: 3000
+          })
+        }
+      } else if (selectedCoupon && usableCoupons.length > 0) {
+        // 🔍 检查是否有更好的优惠券
+        const bestCoupon = usableCoupons[0]
+        const currentDiscount = calculateCouponDiscount(selectedCoupon, newTotal)
+        const bestDiscount = calculateCouponDiscount(bestCoupon, newTotal)
+
+        // 如果有更好的优惠券（优惠超过0.01元）
+        if (bestDiscount > currentDiscount + 0.01 && bestCoupon.id !== selectedCoupon.id) {
+          Taro.showModal({
+            title: '发现更优惠的优惠券',
+            content: `有更好的优惠券可用，额外节省￥${(bestDiscount - currentDiscount).toFixed(2)}，是否更换？`,
+            success: (res) => {
+              if (res.confirm) {
+                setSelectedCoupon(bestCoupon)
+                Taro.showToast({
+                  title: '优惠券已更换',
+                  icon: 'success'
+                })
+              }
+            }
+          })
+        }
+      }
+    }
+  }
+
+  // 处理优惠券选择
+  const handleCouponSelect = (coupon: CouponCardProps) => {
+    const total = getGoodsTotal()
+
+    // 🔍 详细日志记录，用于排查问题
+    console.log('🎫 手动选择优惠券详细信息:', {
+      coupon: {
+        id: coupon.id,
+        title: coupon.title,
+        type: coupon.type,
+        amount: coupon.amount,
+        minAmount: coupon.minAmount,
+        status: coupon.status
+      },
+      orderInfo: {
+        goodsPrice: goods?.price,
+        quantity: quantity,
+        total: total,
+        totalFixed: total.toFixed(2)
+      },
+      validation: {
+        isUsable: isCouponUsable(coupon, total),
+        discount: calculateCouponDiscount(coupon, total),
+        reason: getCouponUnusableReason(coupon, total)
+      }
+    })
+
+    // 检查是否可用
+    if (!isCouponUsable(coupon, total)) {
+      const reason = getCouponUnusableReason(coupon, total)
+
+      // 🚨 记录手动选择失败的详细信息
+      console.error('🚨 手动选择优惠券失败:', {
+        reason,
+        coupon,
+        total,
+        minAmount: coupon.minAmount,
+        comparison: {
+          totalVsMinAmount: `${total} < ${coupon.minAmount}`,
+          result: total < (coupon.minAmount || 0)
+        }
+      })
 
-    // 根据礼品卡类型进行不同的验证
-    if (gift.type === 10 && !useLocation.trim()) { // 实物礼品卡需要地址
       Taro.showToast({
-        title: '请填写使用地址',
+        title: reason || '优惠券不可用',
         icon: 'none'
       })
       return
     }
 
-    setSubmitting(true)
-    try {
-      await useGift({
-        giftId: gift.id!,
-        useLocation: useLocation.trim(),
-        useNote: useNote.trim()
-      })
+    setSelectedCoupon(coupon)
+    setCouponVisible(false)
+    Taro.showToast({
+      title: '优惠券选择成功',
+      icon: 'success'
+    })
+  }
 
-      setUseSuccess(true)
-      Taro.showToast({
-        title: '使用成功',
-        icon: 'success'
-      })
+  // 取消选择优惠券
+  const handleCouponCancel = () => {
+    setSelectedCoupon(null)
+    Taro.showToast({
+      title: '已取消使用优惠券',
+      icon: 'success'
+    })
+  }
+
+  // 加载用户优惠券
+  const loadUserCoupons = async () => {
+    try {
+      setCouponLoading(true)
+
+      // 使用新的API获取可用优惠券
+      const res = await getMyAvailableCoupons()
+
+      if (res && res.length > 0) {
+        // 转换数据格式
+        const transformedCoupons = res.map(transformCouponData)
+
+        // 按优惠金额排序
+        const total = getGoodsTotal()
+        const sortedCoupons = sortCoupons(transformedCoupons, total)
+        const usableCoupons = filterUsableCoupons(sortedCoupons, total)
+
+        setAvailableCoupons(sortedCoupons)
+
+        // 🎯 智能推荐：自动应用最优惠的可用优惠券
+        if (usableCoupons.length > 0 && !selectedCoupon) {
+          const bestCoupon = usableCoupons[0] // 已经按优惠金额排序，第一个就是最优的
+          const discount = calculateCouponDiscount(bestCoupon, total)
+
+          // 🔍 详细日志记录自动推荐的信息
+          console.log('🤖 自动推荐优惠券详细信息:', {
+            coupon: {
+              id: bestCoupon.id,
+              title: bestCoupon.title,
+              type: bestCoupon.type,
+              amount: bestCoupon.amount,
+              minAmount: bestCoupon.minAmount,
+              status: bestCoupon.status
+            },
+            orderInfo: {
+              goodsPrice: goods?.price,
+              quantity: quantity,
+              total: total,
+              totalFixed: total.toFixed(2)
+            },
+            validation: {
+              isUsable: isCouponUsable(bestCoupon, total),
+              discount: discount,
+              reason: getCouponUnusableReason(bestCoupon, total)
+            }
+          })
+
+          if (discount > 0) {
+            setSelectedCoupon(bestCoupon)
+
+            // 显示智能推荐提示
+            Taro.showToast({
+              title: `已为您推荐最优优惠券，可省￥${discount.toFixed(2)}`,
+              icon: 'success',
+              duration: 3000
+            })
+          }
+        }
+
+        // 🔔 优惠券提示：如果有可用优惠券，显示提示
+        if (usableCoupons.length > 0) {
+          console.log(`发现${usableCoupons.length}张可用优惠券，已为您推荐最优惠券`)
+        }
+
+        console.log('加载优惠券成功:', {
+          originalData: res,
+          transformedData: transformedCoupons,
+          sortedData: sortedCoupons,
+          usableCoupons: usableCoupons,
+          recommendedCoupon: usableCoupons[0] || null
+        })
+      } else {
+        setAvailableCoupons([])
+        console.log('暂无可用优惠券')
+      }
     } catch (error) {
-      console.error('使用礼品卡失败:', error)
+      console.error('加载优惠券失败:', error)
+      setAvailableCoupons([])
       Taro.showToast({
-        title: '使用失败',
-        icon: 'error'
+        title: '加载优惠券失败',
+        icon: 'none'
       })
     } finally {
-      setSubmitting(false)
+      setCouponLoading(false)
     }
   }
 
-  // 获取当前位置
-  const handleGetLocation = () => {
-    Taro.getLocation({
-      type: 'gcj02',
-      success: (res) => {
-        // 这里可以调用地理编码API将坐标转换为地址
-        // 暂时使用坐标信息
-        setUseLocation(`经度:${res.longitude}, 纬度:${res.latitude}`)
+  /**
+   * 统一支付入口
+   */
+  const onPay = async (goods: ShopGoods) => {
+    try {
+      setPayLoading(true)
+
+      // 基础校验
+      if (!address) {
         Taro.showToast({
-          title: '位置获取成功',
-          icon: 'success'
-        })
-      },
-      fail: () => {
-        Taro.showToast({
-          title: '位置获取失败',
+          title: '请选择收货地址',
           icon: 'error'
         })
+        return;
       }
-    })
-  }
 
-  // 返回上一页
-  const handleBack = () => {
-    Taro.navigateBack()
-  }
+      if (!payment) {
+        Taro.showToast({
+          title: '请选择支付方式',
+          icon: 'error'
+        })
+        return;
+      }
 
-  // 查看我的礼品卡
-  const handleViewMyGifts = () => {
-    Taro.navigateTo({
-      url: '/user/gift/index'
-    })
-  }
+      // 库存校验
+      if (goods.stock !== undefined && quantity > goods.stock) {
+        Taro.showToast({
+          title: '商品库存不足',
+          icon: 'error'
+        })
+        return;
+      }
 
-  // 转换礼品卡数据
-  const transformGiftData = (gift: ShopGift) => {
-    return {
-      id: gift.id || 0,
-      name: gift.name || '水票',
-      description: gift.description,
-      code: gift.code,
-      goodsImage: gift.goodsImage,
-      faceValue: gift.faceValue,
-      type: gift.type,
-      expireTime: gift.expireTime,
-      takeTime: gift.takeTime,
-      useLocation: gift.useLocation,
-      contactInfo: gift.contactInfo,
-      showCode: false,
-      showUseBtn: false,
-      showDetailBtn: false,
-      theme: 'gold' as const
+      // 优惠券校验
+      if (selectedCoupon) {
+        const total = getGoodsTotal()
+        if (!isCouponUsable(selectedCoupon, total)) {
+          const reason = getCouponUnusableReason(selectedCoupon, total)
+          Taro.showToast({
+            title: reason || '优惠券不可用',
+            icon: 'error'
+          })
+          return;
+        }
+      } else {
+        // 🔔 支付前最后一次检查：提醒用户是否有可用优惠券
+        const total = getGoodsTotal()
+        const usableCoupons = filterUsableCoupons(availableCoupons, total)
+
+        if (usableCoupons.length > 0) {
+          const bestCoupon = usableCoupons[0]
+          const discount = calculateCouponDiscount(bestCoupon, total)
+
+          if (discount > 0) {
+            // 用模态框提醒用户
+            const confirmResult = await new Promise<boolean>((resolve) => {
+              Taro.showModal({
+                title: '发现可用优惠券',
+                content: `您有优惠券可使用，可省￥${discount.toFixed(2)}，是否使用？`,
+                success: (res) => resolve(res.confirm),
+                fail: () => resolve(false)
+              })
+            })
+
+            if (confirmResult) {
+              setSelectedCoupon(bestCoupon)
+              // 🔄 使用优惠券后需要重新构建订单数据，这里直接递归调用支付函数
+              // 但要确保传递最新的优惠券信息
+              const currentPaymentType = payment.type === 0 ? PaymentType.BALANCE : PaymentType.WECHAT;
+              const updatedOrderData = buildSingleGoodsOrder(
+                goods.goodsId!,
+                quantity,
+                address.id,
+                {
+                  comments: goods.name,
+                  deliveryType: 0,
+                  buyerRemarks: orderRemark,
+                  couponId: parseInt(String(bestCoupon.id), 10)
+                }
+              );
+
+              console.log('🎯 使用推荐优惠券的订单数据:', updatedOrderData);
+
+              // 执行支付
+              await PaymentHandler.pay(updatedOrderData, currentPaymentType);
+              return; // 提前返回，避免重复执行支付
+            } else {
+              // 用户选择不使用优惠券，继续支付
+            }
+          }
+        }
+      }
+
+      // 构建订单数据
+      const orderData = buildSingleGoodsOrder(
+        goods.goodsId!,
+        quantity,
+        address.id,
+        {
+          comments: '桂乐淘',
+          deliveryType: 0,
+          buyerRemarks: orderRemark,
+          // 🔧 确保 couponId 是正确的数字类型，且不传递 undefined
+          couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined
+        }
+      );
+
+      // 根据支付方式选择支付类型
+      const paymentType = payment.type === 0 ? PaymentType.BALANCE : PaymentType.WECHAT;
+
+      // 🔍 支付前的详细信息记录
+      console.log('💰 开始支付 - 详细信息:', {
+        orderData,
+        paymentType,
+        selectedCoupon: selectedCoupon ? {
+          id: selectedCoupon.id,
+          title: selectedCoupon.title,
+          type: selectedCoupon.type,
+          amount: selectedCoupon.amount,
+          minAmount: selectedCoupon.minAmount,
+          discount: getCouponDiscount()
+        } : null,
+        priceCalculation: {
+          goodsPrice: goods?.price,
+          quantity: quantity,
+          goodsTotal: getGoodsTotal(),
+          couponDiscount: getCouponDiscount(),
+          finalPrice: getFinalPrice()
+        },
+        couponValidation: selectedCoupon ? {
+          isUsable: isCouponUsable(selectedCoupon, getGoodsTotal()),
+          reason: getCouponUnusableReason(selectedCoupon, getGoodsTotal())
+        } : null
+      });
+
+      // 执行支付 - 移除这里的成功提示，让PaymentHandler统一处理
+      await PaymentHandler.pay(orderData, paymentType);
+
+      // ✅ 移除双重成功提示 - PaymentHandler会处理成功提示
+      // Taro.showToast({
+      //   title: '支付成功',
+      //   icon: 'success'
+      // })
+    } catch (error: any) {
+      return navTo('/user/order/order?statusFilter=0', true)
+      // console.error('支付失败:', error)
+
+      // 只处理PaymentHandler未处理的错误
+      // if (!error.handled) {
+      //   let errorMessage = '支付失败，请重试';
+      //
+      //   // 根据错误类型提供具体提示
+      //   if (error.message?.includes('余额不足')) {
+      //     errorMessage = '账户余额不足，请充值后重试';
+      //   } else if (error.message?.includes('优惠券')) {
+      //     errorMessage = '优惠券使用失败，请重新选择';
+      //   } else if (error.message?.includes('库存')) {
+      //     errorMessage = '商品库存不足，请减少购买数量';
+      //   } else if (error.message?.includes('地址')) {
+      //     errorMessage = '收货地址信息有误，请重新选择';
+      //   } else if (error.message) {
+      //     errorMessage = error.message;
+      //   }
+      //   Taro.showToast({
+      //     title: errorMessage,
+      //     icon: 'error'
+      //   })
+      //   console.log('跳去未付款的订单列表页面')
+      // }
+    } finally {
+      setPayLoading(false)
+    }
+  };
+
+  // 统一的数据加载函数
+  const loadAllData = async () => {
+    try {
+      setLoading(true)
+      setError('')
+
+      // 分别加载数据，避免类型推断问题
+      let goodsRes: ShopGoods | null = null
+      if (goodsId) {
+        goodsRes = await getShopGoods(Number(goodsId))
+      }
+
+      const [addressRes, paymentRes] = await Promise.all([
+        listShopUserAddress({isDefault: true}),
+        selectPayment({})
+      ])
+
+      // 设置商品信息
+      if (goodsRes) {
+        setGoods(goodsRes)
+      }
+
+      // 设置默认收货地址
+      if (addressRes && addressRes.length > 0) {
+        setAddress(addressRes[0])
+      }
+
+      // 设置支付方式
+      if (paymentRes && paymentRes.length > 0) {
+        setPayments(paymentRes.map((d) => ({
+          type: d.type,
+          name: d.name
+        })))
+        setPayment(paymentRes[0])
+      }
+
+      // 加载优惠券（在商品信息加载完成后）
+      if (goodsRes) {
+        await loadUserCoupons()
+      }
+    } catch (err) {
+      console.error('加载数据失败:', err)
+      setError('加载数据失败，请重试')
+    } finally {
+      setLoading(false)
     }
   }
 
-  if (loading) {
+  useDidShow(() => {
+    // 返回/切换到该页面时，刷新一下当前已选门店
+    setSelectedStore(getSelectedStoreFromStorage())
+    loadAllData()
+  })
+
+  useEffect(() => {
+    loadAllData()
+  }, [goodsId]);
+
+  // 重新加载数据
+  const handleRetry = () => {
+    loadAllData()
+  }
+
+  // 错误状态
+  if (error) {
     return (
-      <ConfigProvider>
-        <View className="flex justify-center items-center h-screen">
-          <Text>加载中...</Text>
+      <View className="order-confirm-page">
+        <View className="error-state">
+          <Text className="error-text">{error}</Text>
+          <Button onClick={handleRetry}>重新加载</Button>
         </View>
-      </ConfigProvider>
+      </View>
     )
   }
 
-  if (!gift) {
-    return (
-      <ConfigProvider>
-        <View className="flex flex-col justify-center items-center h-screen">
-          <Text className="text-gray-500 mb-4">礼品卡不存在</Text>
-          <Button onClick={handleBack}>返回</Button>
-        </View>
-      </ConfigProvider>
-    )
+  // 加载状态
+  if (loading || !goods) {
+    return <OrderConfirmSkeleton/>
   }
 
   return (
-    <ConfigProvider>
-      {/* 自定义导航栏 */}
-      <View className="flex items-center justify-between p-4 bg-white border-b border-gray-100">
-        <View className="flex items-center" onClick={handleBack}>
-          <ArrowLeft size="20" />
-          <Text className="ml-2 text-lg">使用礼品卡</Text>
-        </View>
-      </View>
-
-      {!useSuccess ? (
-        <>
-          {/* 礼品卡信息 */}
-          <View className="mx-4 mt-4">
-            <GiftCard {...transformGiftData(gift)} />
-          </View>
-
-          {/* 使用表单 */}
-          <View className="bg-white mx-4 mt-4 p-4 rounded-xl">
-            <Text className="font-semibold mb-4 text-gray-800">使用信息</Text>
-
-            {/* 使用地址（实物礼品卡必填） */}
-            {gift.type === 10 && (
-              <View className="mb-4">
-                <Text className="text-gray-700 mb-2">使用地址 *</Text>
-                <View className="flex gap-2">
-                  <Input
-                    placeholder="请输入使用地址"
-                    value={useLocation}
-                    onChange={setUseLocation}
-                    className="flex-1 border border-gray-200 rounded-lg"
-                  />
-                  <Button
-                    size="small"
-                    fill="outline"
-                    icon={<Location />}
-                    onClick={handleGetLocation}
-                  >
-                    定位
-                  </Button>
+    <div className={'order-confirm-page'}>
+      <CellGroup>
+        <Cell
+          title={(
+            <View className="flex items-center gap-2">
+              <Shop className={'text-gray-500'}/>
+              <Text>选择门店</Text>
+            </View>
+          )}
+          extra={(
+            <View className={'flex items-center gap-2'}>
+              <View className={'text-gray-900'}>
+                {selectedStore?.name || '请选择门店'}
+              </View>
+              <ArrowRight className={'text-gray-400'} size={14}/>
+            </View>
+          )}
+          onClick={openStorePopup}
+        />
+      </CellGroup>
+      <CellGroup>
+        {
+          address && (
+            <Cell className={'address-bottom-line'} onClick={() => Taro.navigateTo({url: '/user/address/index'})}>
+              <Space>
+                <Location className={'text-gray-500'}/>
+                <View className={'flex flex-col w-full justify-between items-start'}>
+                  <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-400'} size={14}/>
+                    </View>
+                  </Space>
+                  <View className={'pt-1 pb-3 text-gray-500'}>{address.name} {address.phone}</View>
                 </View>
-              </View>
-            )}
+              </Space>
+            </Cell>
+          )
+        }
+        {!address && (
+          <Cell className={''} onClick={() => Taro.navigateTo({url: '/user/address/index'})}>
+            <Space>
+              <Location/>
+              添加收货地址
+            </Space>
+          </Cell>
+        )}
+      </CellGroup>
 
-            {/* 虚拟礼品卡和服务礼品卡的地址选填 */}
-            {gift.type !== 10 && (
-              <View className="mb-4">
-                <Text className="text-gray-700 mb-2">使用地址（选填）</Text>
-                <Input
-                  placeholder="请输入使用地址"
-                  value={useLocation}
-                  onChange={setUseLocation}
-                  className="border border-gray-200 rounded-lg"
-                />
-              </View>
-            )}
-
-            {/* 使用备注 */}
-            <View className="mb-4">
-              <Text className="text-gray-700 mb-2">使用备注（选填）</Text>
-              <TextArea
-                placeholder="请输入使用备注"
-                value={useNote}
-                onChange={setUseNote}
-                rows={3}
-                className="border border-gray-200 rounded-lg"
+      <CellGroup>
+        <Cell
+          title={'送水数量'}
+          extra={(
+            <ConfigProvider theme={customTheme}>
+              <InputNumber
+                value={quantity}
+                min={1}
+                max={goods.stock || 999}
+                disabled={goods.canBuyNumber != 0}
+                onChange={handleQuantityChange}
               />
-            </View>
+            </ConfigProvider>
+          )}
+        />
+      </CellGroup>
 
-            {/* 使用说明 */}
-            <View className="bg-yellow-50 p-3 rounded-lg border border-yellow-200 mb-4">
-              <Text className="text-yellow-800 text-sm">
-                {gift.type === 10 && '💡 实物礼品卡使用后请到指定地址领取商品'}
-                {gift.type === 20 && '💡 虚拟礼品卡使用后将自动发放到您的账户'}
-                {gift.type === 30 && '💡 服务礼品卡使用后请联系客服预约服务时间'}
-              </Text>
-            </View>
+      {/*<CellGroup>*/}
+      {/*  <Cell*/}
+      {/*    title={'支付方式'}*/}
+      {/*    extra={(*/}
+      {/*      <View className={'flex items-center gap-2'}>*/}
+      {/*        <View className={'text-gray-900'}>{payment?.name}</View>*/}
+      {/*        <ArrowRight className={'text-gray-400'} size={14}/>*/}
+      {/*      </View>*/}
+      {/*    )}*/}
+      {/*    onClick={() => setIsVisible(true)}*/}
+      {/*  />*/}
+      {/*</CellGroup>*/}
 
-            <Button
-              type="primary"
-              size="large"
-              block
-              loading={submitting}
-              onClick={handleUseGift}
+      <CellGroup>
+        <Cell
+          title={`您还有 ${quantity} 张水票`}
+          extra={<View className={'font-medium'}>送 {quantity} 桶</View>}
+        />
+        {/*<Cell title={'配送费'} extra={'￥0.00'}/>*/}
+        <Cell extra={(
+          <View className={'flex items-end gap-2'}>
+            <Text className={'ml-2'}>需使用</Text>
+            <Text className={'text-gray-700 font-bold'} style={{fontSize: '18px'}}>1</Text>张
+          </View>
+        )}/>
+      </CellGroup>
+
+      <CellGroup>
+        <Cell title={'备注'} extra={(
+          <Input
+            placeholder={'(选填)请填写备注'}
+            style={{padding: '0'}}
+            value={orderRemark}
+            onChange={(value) => setOrderRemark(value)}
+            maxLength={100}
+          />
+        )}/>
+      </CellGroup>
+
+      {/* 门店选择弹窗 */}
+      <Popup
+        visible={storePopupVisible}
+        position="bottom"
+        style={{height: '70vh'}}
+        onClose={() => setStorePopupVisible(false)}
+      >
+        <View className="p-4">
+          <View className="flex justify-between items-center mb-3">
+            <Text className="text-base font-medium">选择门店</Text>
+            <Text
+              className="text-sm text-gray-500"
+              onClick={() => setStorePopupVisible(false)}
             >
-              确认使用
-            </Button>
-          </View>
-        </>
-      ) : (
-        /* 使用成功页面 */
-        <View className="flex flex-col items-center justify-center px-4" style={{height: '600px'}}>
-          <View className="text-center">
-            <View className="w-20 h-20 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4">
-              {/*<Voucher size="40" className="text-green-600" />*/}
-            </View>
-
-            <Text className="text-2xl font-bold text-gray-900 mb-2">使用成功！</Text>
-            <Text className="text-gray-600 mb-6">
-              {gift.type === 10 && '请到指定地址领取您的商品'}
-              {gift.type === 20 && '虚拟商品已发放到您的账户'}
-              {gift.type === 30 && '请联系客服预约服务时间'}
+              关闭
             </Text>
-
-            {gift.contactInfo && (
-              <View className="bg-blue-50 p-4 rounded-lg mb-6 border border-blue-200">
-                <Text className="text-blue-800 font-semibold mb-1">客服联系方式</Text>
-                <Text className="text-blue-700">{gift.contactInfo}</Text>
-              </View>
-            )}
-
-            <View className="flex flex-col gap-3 w-full max-w-xs">
-              <Button
-                type="primary"
-                size="large"
-                block
-                onClick={handleViewMyGifts}
-              >
-                查看我的礼品卡
-              </Button>
-            </View>
           </View>
+
+          {storeLoading ? (
+            <View className="py-10 text-center text-gray-500">
+              <Text>加载中...</Text>
+            </View>
+          ) : (
+            <CellGroup>
+              {stores.map((s) => {
+                const isActive = !!selectedStore?.id && selectedStore.id === s.id
+                return (
+                  <Cell
+                    key={s.id}
+                    title={<Text className={isActive ? 'text-green-600' : ''}>{s.name || `门店${s.id}`}</Text>}
+                    description={s.address || ''}
+                    onClick={async () => {
+                      let storeToSave: ShopStore = s
+                      if (s?.id) {
+                        try {
+                          const full = await getShopStore(s.id)
+                          if (full) storeToSave = full
+                        } catch (_e) {
+                          // keep base item
+                        }
+                      }
+                      setSelectedStore(storeToSave)
+                      saveSelectedStoreToStorage(storeToSave)
+                      setStorePopupVisible(false)
+                      Taro.showToast({title: '门店已切换', icon: 'success'})
+                    }}
+                  />
+                )
+              })}
+              {!stores.length && (
+                <Cell title={<Text className="text-gray-500">暂无门店数据</Text>} />
+              )}
+            </CellGroup>
+          )}
         </View>
-      )}
-    </ConfigProvider>
+      </Popup>
+
+      <Gap height={50}/>
+
+      <div className={'fixed z-50 bg-white w-full bottom-0 left-0 pt-4 pb-10 border-t border-gray-200'}>
+        <View className={'btn-bar flex justify-between items-center'}>
+          <div className={'flex flex-col justify-center items-start mx-4'}>
+            <View className={'flex items-center gap-2'}>
+              <span className={'total-price text-sm text-gray-500'}>使用水票：</span>
+              <span className={'text-red-500 text-xl font-bold'}>{getFinalPrice().toFixed(2)}</span>
+            </View>
+          </div>
+          <div className={'buy-btn mx-4'}>
+            <Button
+              type="success"
+              size="large"
+              loading={payLoading}
+              onClick={() => onPay(goods)}
+            >
+              {payLoading ? '支付中...' : '立即付款'}
+            </Button>
+          </div>
+        </View>
+      </div>
+    </div>
   );
 };
 
-export default GiftCardUse;
+export default OrderConfirm;