diff --git a/api/pickupCard.js b/api/pickupCard.js
new file mode 100644
index 0000000..6d79477
--- /dev/null
+++ b/api/pickupCard.js
@@ -0,0 +1,13 @@
+/**
+ * 提货卡选品、试算及一次兑换接口。
+ * @author Bulbasaur
+ * @since 2026-11-05
+ */
+import { http, Method } from '@/utils/request.js'
+
+/** 获取当前会员的卡规则及候选商品。 */
+export const getPickupCard = id => http.request({ url: `/promotion/pickupCard/${encodeURIComponent(id)}`, method: Method.GET, needToken: true })
+/** 服务端试算，校验商品与地址且不消耗权益。 */
+export const previewPickupCard = data => http.request({ url: '/promotion/pickupCard/preview', method: Method.POST, needToken: true, header: { 'content-type': 'application/json' }, data })
+/** 原子核销创单，网络重试返回原交易。 */
+export const redeemPickupCard = data => http.request({ url: '/promotion/pickupCard/redeem', method: Method.POST, needToken: true, header: { 'content-type': 'application/json' }, data })
diff --git a/manifest.json b/manifest.json
index 79aabf4..a971817 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "name" : "lilishop",
     "appid" : "__UNI__ED807EA",
     "description" : "",
-    "versionName" : "5.03",
+    "versionName" : "5.0.4",
     "versionCode" : 503,
     "transformPx" : false,
     "app-plus" : {
diff --git a/pages.json b/pages.json
index c7f3197..b83795a 100644
--- a/pages.json
+++ b/pages.json
@@ -848,7 +848,11 @@
 					}
 				},
 				{
-					"path": "gift-card/myGiftCards",
+					"path": "gift-card/pickupCard",
+                    "style": { "navigationBarTitleText": "提货卡兑换" }
+                },
+                {
+                    "path": "gift-card/myGiftCards",
 					"style": {
 						"navigationBarTitleText": "我的礼品卡"
 					}
diff --git a/pages/cart/gift-card/myGiftCards.vue b/pages/cart/gift-card/myGiftCards.vue
index 047dadd..55f3ee1 100644
--- a/pages/cart/gift-card/myGiftCards.vue
+++ b/pages/cart/gift-card/myGiftCards.vue
@@ -52,17 +52,18 @@
           <view class="gcc-header-inner">
             <view class="gcc-header-left">
               <view class="gcc-title">{{ item.giftCardName || '礼品卡' }}</view>
-              <view class="gcc-face">面值{{ item.faceText }}元</view>
+              <view class="gcc-face">{{ item.cardType === 'PICKUP' ? '兑换 ' + item.pickupCount + ' 种商品' : '面值' + item.faceText + '元' }}</view>
               <view class="gcc-cardno">{{ item.cardNo }}</view>
             </view>
             <view class="gcc-header-right">
-              <view class="gcc-type">现金卡</view>
+              <view class="gcc-type">{{ item.cardType === 'PICKUP' ? '提货卡' : '现金卡' }}</view>
               <view class="gcc-expire">{{ item.expireText }}</view>
             </view>
           </view>
         </view>
         <view class="gcc-body">
-          <view class="gcc-row">
+          <view v-if="item.cardType === 'PICKUP'" class="gcc-row">每种一件 · 一次兑完 · 免邮</view>
+          <view v-else class="gcc-row">
             当前余额：
             <text class="gcc-strong" v-if="item.balance != null">￥{{ unitPrice(item.balance) }}</text>
             <text class="gcc-strong" v-else>—</text>
@@ -236,7 +237,8 @@ function onCardPrimaryAction(item: any) {
     return
   }
   if (statusTab.value === GIFT_CARD_STATUS.AVAILABLE) {
-    uni.switchTab({ url: '/pages/tabbar/home/index' })
+    if (item.cardType === 'PICKUP') uni.navigateTo({ url: '/pages/cart/gift-card/pickupCard?id=' + encodeURIComponent(resolveMemberCardId(item)) })
+    else uni.switchTab({ url: '/pages/tabbar/home/index' })
   }
 }
 </script>
diff --git a/pages/cart/gift-card/pickupCard.vue b/pages/cart/gift-card/pickupCard.vue
new file mode 100644
index 0000000..8e76883
--- /dev/null
+++ b/pages/cart/gift-card/pickupCard.vue
@@ -0,0 +1,118 @@
+<!--
+  提货卡选品及确认兑换，兼容 H5、App 和微信小程序。
+  @author Bulbasaur
+  @since 2026-11-05
+-->
+<template>
+  <view class="pickup-page">
+    <view class="notice">每张卡一次兑完，每种一件，免邮。兑换成功后取消不退权益，不支持退款或退货。</view>
+    <view v-if="loading" class="state">加载中...</view>
+    <view v-else-if="error" class="state" @click="load">{{ error }}，点击重试</view>
+    <template v-else-if="detail.credentialId">
+      <view class="title">{{ detail.giftCardName }}</view>
+      <view v-if="completed || detail.tradeSn" class="state">该提货卡已兑换<button @click="viewOrders">查看订单</button></view>
+      <template v-else>
+        <view class="rule">{{ detail.pickupMode === 'ALL' ? '兑换以下全部商品' : '任选 ' + detail.pickupCount + ' 种商品' }} · 已选 {{ selected.length }} 种</view>
+        <view v-for="goods in detail.goods" :key="goods.id" class="goods" :class="{ selected: selected.includes(goods.id), disabled: !goods.available }" @click="toggle(goods)">
+          <image :src="goods.thumbnail" mode="aspectFill" />
+          <view class="goods-info"><view>{{ goods.goodsName }}</view><view class="muted">{{ specsText(goods.specs) }}</view><view class="muted">{{ goods.storeName }} · 1 件</view><text v-if="!goods.available">暂不可兑换</text></view>
+          <text>{{ selected.includes(goods.id) ? '●' : '○' }}</text>
+        </view>
+        <view class="address">
+          <view class="title">收货地址</view>
+          <picker :range="addresses" :range-key="'label'" :value="addressIndex" :disabled="busy" @change="chooseAddress"><view>{{ addresses[addressIndex]?.label || '请选择收货地址' }}　›</view></picker>
+          <view class="links"><text @click="manageAddress">管理收货地址</text><text @click="loadAddresses">刷新地址</text></view>
+        </view>
+        <button class="submit" :loading="busy" :disabled="!canSubmit || busy" @click="submit">确认兑换 · 实付 ￥0</button>
+      </template>
+    </template>
+  </view>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { onLoad, onShow, onUnload } from '@dcloudio/uni-app'
+import { getAddressList } from '@/api/address.js'
+import { getPickupCard, previewPickupCard, redeemPickupCard } from '@/api/pickupCard.js'
+import storage from '@/utils/storage.js'
+
+const detail = ref({}), selected = ref([]), addresses = ref([]), addressIndex = ref(0)
+const loading = ref(false), busy = ref(false), error = ref(''), completed = ref(false)
+let cardId = '', active = true, version = 0, owner = ''
+const canSubmit = computed(() => selected.value.length === detail.value.pickupCount && !!addresses.value[addressIndex.value] && !detail.value.goods?.some(g => selected.value.includes(g.id) && !g.available))
+/** 隔离账号切换和离页后的异步响应。 */
+function sameOwner() { return active && owner === String(storage.getUserInfo()?.id || '') }
+/** 将既有 SKU 规格转成可读文字。 */
+function specsText(value) { try { const specs = JSON.parse(value || '[]'); return Array.isArray(specs) ? specs.filter(s => s.specName !== 'images').map(s => s.specValue).join(' / ') : '' } catch { return value || '' } }
+/** 非全选模式可增减选项，数量仍由后端再次校验。 */
+function toggle(goods) {
+  if (busy.value || !goods.available || detail.value.pickupMode === 'ALL') return
+  if (selected.value.includes(goods.id)) selected.value = selected.value.filter(id => id !== goods.id)
+  else if (detail.value.pickupCount === 1) selected.value = [goods.id]
+  else if (selected.value.length < detail.value.pickupCount) selected.value = [...selected.value, goods.id]
+  else uni.showToast({ title: '已达到可兑换种数', icon: 'none' })
+}
+/** 读取当前会员地址并保留有效选项。 */
+async function loadAddresses() {
+  const previous = addresses.value[addressIndex.value]?.id
+  const response = await getAddressList(1, 100)
+  if (!sameOwner()) return
+  if (!response.data.success) throw new Error(response.data.message || '地址加载失败')
+  addresses.value = (response.data.result?.records || []).map(a => ({ ...a, label: `${a.name} ${a.mobile} ${a.consigneeAddressPath || ''} ${a.detail || ''}` }))
+  const index = addresses.value.findIndex(a => a.id === previous)
+  addressIndex.value = index >= 0 ? index : Math.max(0, addresses.value.findIndex(a => a.isDefault))
+}
+/** 刷新卡可用性；返回页面重新校验已选商品。 */
+async function load() {
+  const request = ++version
+  loading.value = true; error.value = ''
+  try {
+    const response = await getPickupCard(cardId)
+    if (!sameOwner() || request !== version) return
+    if (!response.data.success) throw new Error(response.data.message || '卡片加载失败')
+    detail.value = response.data.result
+    selected.value = detail.value.pickupMode === 'ALL' ? detail.value.goods.map(g => g.id) : selected.value.filter(id => detail.value.goods.some(g => g.id === id && g.available))
+    await loadAddresses()
+  } catch (e) { if (sameOwner() && request === version) error.value = e.message || '加载失败' }
+  finally { if (sameOwner() && request === version) loading.value = false }
+}
+/** 提交前服务端试算；确认后核销，网络错误允许幂等重试。 */
+async function submit() {
+  if (busy.value || !canSubmit.value || !sameOwner()) return
+  busy.value = true
+  const payload = { credentialId: cardId, skuIds: [...selected.value], addressId: addresses.value[addressIndex.value].id }
+  try {
+    const preview = await previewPickupCard(payload)
+    if (!sameOwner()) return
+    if (!preview.data.success) throw new Error(preview.data.message || '兑换校验失败')
+    const confirmed = await new Promise(resolve => uni.showModal({ title: '确认兑换', content: '每种一件，免邮且实付为零。兑换后取消不退权益，不支持退款或退货。', confirmText: '确认兑换', success: result => resolve(result.confirm), fail: () => resolve(false) }))
+    if (!confirmed || !sameOwner()) return
+    const response = await redeemPickupCard(payload)
+    if (!sameOwner()) return
+    if (!response.data.success) throw new Error(response.data.message || '兑换失败')
+    completed.value = true
+  } catch (e) {
+    if (sameOwner()) {
+      try { const status = await getPickupCard(cardId); if (sameOwner() && status.data.success && status.data.result?.tradeSn) { detail.value = status.data.result; completed.value = true; return } } catch { /* 保留选项以便重试 */ }
+      uni.showToast({ title: e.message || '结果待确认，请重试或查看订单', icon: 'none' })
+    }
+  }
+  finally { if (sameOwner()) busy.value = false }
+}
+/** 地址选择仅改变本页状态，不修改地址本身。 */
+function chooseAddress(event) { addressIndex.value = Number(event.detail.value) }
+/** 复用现有地址管理，返回时刷新。 */
+function manageAddress() { if (!busy.value) uni.navigateTo({ url: '/pages/mine/address/addressManage' }) }
+/** 兑换订单沿用普通订单列表与物流详情。 */
+function viewOrders() { uni.navigateTo({ url: '/pages/order/myOrder?status=0' }) }
+onLoad(options => { cardId = options.id || ''; owner = String(storage.getUserInfo()?.id || '') })
+onShow(() => {
+  if (owner !== String(storage.getUserInfo()?.id || '')) { detail.value = {}; selected.value = []; addresses.value = []; error.value = '账号已变更，请返回我的礼品卡'; return }
+  load()
+})
+onUnload(() => { active = false; version++ })
+</script>
+
+<style scoped>
+.pickup-page{min-height:100vh;background:#f6f7f9;padding:24rpx;box-sizing:border-box;padding-bottom:calc(40rpx + env(safe-area-inset-bottom))}.notice{background:#fff5e8;color:#965b24;padding:24rpx;border-radius:16rpx;font-size:26rpx;line-height:1.7}.title{font-weight:600;font-size:32rpx;margin:28rpx 0 20rpx}.rule,.muted{color:#777;font-size:24rpx;margin:12rpx 0}.goods{display:flex;align-items:center;gap:20rpx;background:#fff;border:2rpx solid transparent;border-radius:16rpx;padding:24rpx;margin:16rpx 0}.goods.selected{border-color:#f56c36}.goods.disabled{opacity:.5}.goods image{width:130rpx;height:130rpx;border-radius:12rpx;flex-shrink:0}.goods-info{flex:1;font-size:28rpx}.address{background:#fff;padding:4rpx 24rpx 24rpx;border-radius:16rpx;font-size:26rpx}.links{display:flex;justify-content:space-between;color:#e75d31;margin-top:24rpx}.submit{background:#e75d31;color:#fff;margin-top:32rpx;border-radius:48rpx;font-size:30rpx}.state{text-align:center;padding:60rpx 20rpx}
+</style>
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index e245423..ce77b31 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -1,803 +1,806 @@
-<template>
-	<view class="content" :style="themeStyle">
-		<scroll-view class="navbar" scroll-x :show-scrollbar="false">
-			<view class="navbar-inner">
-				<view v-for="(item, index) in navList" :key="index" class="nav-item"
-					:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-			</view>
-		</scroll-view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
-					<!-- 空白页 -->
-					<u-empty :text="tabItem.kind === 'afterSale' ? '暂无售后记录' : '暂无订单'" mode="list"
-						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></u-empty>
-					<!-- 订单列表 -->
-					<view class="seller-view" :key="orderIndex" v-for="(order, orderIndex) in tabItem.orderList">
-						<template v-if="order.isAfterSale">
-							<view class="seller-info u-flex u-row-between">
-								<view class="seller-name wes">
-									<view class="name">{{ order.storeName }}</view>
-								</view>
-								<view class="order-sn">{{ orderCardStatus(order) }}</view>
-							</view>
-							<view class="after-sale-sn">售后单号：{{ order.serviceSn }}</view>
-							<view class="goods-item-view" @click="openOrder(order)">
-								<view class="goods-img">
-									<u-image border-radius="6" width="131rpx" height="131rpx" mode="aspectFill"
-										:src="getOrderItemImage(order.orderItems[0], order, 0)"></u-image>
-								</view>
-								<view class="goods-info">
-									<view class="goods-title u-line-2">{{ order.groupName }}</view>
-									<view class="goods-price">申请退款 ￥{{ unitPrice(order.applyRefundPrice) }}</view>
-								</view>
-								<view class="goods-num">
-									<view>x{{ order.groupNum }}</view>
-								</view>
-							</view>
-							<view class="btn-view u-flex u-row-between">
-								<view class="description">{{ afterSaleTypeText(order.serviceType) }}</view>
-								<view class="goods-btn flex flex-a-c">
-									<view class="cancel-btn" v-if="order.serviceStatus === 'APPLY'" @click="onCancelAfterSale(order)">取消售后</view>
-									<view class="pay-btn" v-if="order.serviceStatus === 'PASS' && order.serviceType !== 'RETURN_MONEY'" @click="onAfterSaleExpress(order)">提交物流</view>
-									<view class="pay-btn" @click="openOrder(order)">售后详情</view>
-								</view>
-							</view>
-						</template>
-						<template v-else>
-						<!-- 店铺名称 -->
-						<view class="seller-info u-flex u-row-between">
-							<view class="seller-name wes" @click="navigateToStore(order)">
-								<view class="name">{{ order.storeName }}</view>
-
-								<view class="name" v-if="renderOrderTag(order.orderPromotionType)">
-									<u-tag
-										:text="renderOrderTag(order.orderPromotionType)"
-										:type="renderOrderTagType(order.orderPromotionType)"
-										size="mini"
-									/>
-								</view>
-
-							</view>
-							<view class="order-sn">{{ orderCardStatus(order) }}</view>
-						</view>
-						<view>
-							<view>
-								<view class="goods-item-view" @click="openOrder(order)">
-									<view class="goods-img" v-for="(goods, goodsIndex) in order.orderItems"
-										:key="goodsIndex">
-										<u-image border-radius="6" width="131rpx" height="131rpx" mode="aspectFill"
-											:src="getOrderItemImage(goods, order, goodsIndex)"></u-image>
-									</view>
-									<view class="goods-info">
-										<view v-if="order.orderItems.length <= 1" class="goods-title u-line-2">
-											{{ order.groupName }}</view>
-										<view v-if="order.orderItems.length <= 1" class="goods-price">
-											￥{{unitPrice(order.flowPrice) }}
-										</view>
-									</view>
-									<view v-if="order.orderItems.length <= 1" class="goods-num">
-										<view>x{{ order.groupNum }}</view>
-									</view>
-								</view>
-							</view>
-							<view class="btn-view u-flex u-row-between">
-								<view class="description">
-									<!-- 等待付款 -->
-									<div v-if="order.payStatus === 'PAID'">已付金额:</div>
-									<div v-else>应付金额:</div>
-									<div class="price">￥{{unitPrice(order.flowPrice) }}</div>
-								</view>
-								<view class="goods-btn flex flex-a-c">
-									<!-- 全部 -->
-									<view ripple class="pay-btn" shape="circle" size="mini"
-										v-if="order.allowOperationVO.pay" @click="waitPay(order)">立即付款</view>
-									<!-- 取消订单 -->
-									<view ripple class="cancel-btn" shape="circle" size="mini"
-										v-if="showOrderCancel(order)" @click="onCancel(order.sn)">
-										取消订单
-									</view>
-									<!-- 等待收货 -->
-									<view ripple shape="circle" class="pay-btn" size="mini"
-										v-if="order.allowOperationVO.rog && !isECouponOrder(order.orderType)" @click="onRog(order.sn)">
-										确认收货
-									</view>
-								</view>
-							</view>
-						</view>
-						</template>
-					</view>
-					<uni-load-more v-if="tabItem.orderList.length > 0" :status="tabItem.loadStatus"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<u-popup class="cancel-popup" v-model:show="cancelShow" mode="bottom" length="60%">
-			<view class="header">取消订单</view>
-			<view class="body">
-				<view class="title">取消订单后，本单享有的优惠可能会一并取消，是否继续？</view>
-				<view>
-					<u-radio-group v-model="reason">
-						<view class="value">
-							<view class="radio-view" :key="index" v-for="(item, index) in cancelList">
-								<u-radio :active-color="lightColor" shape="circle" :name="item.reason"
-									:label="item.reason" @change="reasonChange"></u-radio>
-							</view>
-						</view>
-					</u-radio-group>
-				</view>
-			</view>
-			<view class="footer">
-				<u-button size="medium" ripple v-if="reason" shape="circle" @click="submitCancel">提交</u-button>
-			</view>
-		</u-popup>
-		<u-toast ref="uToast" />
-		<u-modal :confirm-color="lightColor" v-model:show="rogShow" :show-cancel-button="true" :content="'是否确认收货?'"
-			@confirm="confirmRog"></u-modal>
-		<u-modal :confirm-color="lightColor" v-model:show="cancelAfterSaleShow" :show-cancel-button="true" content="确认取消售后?"
-			@confirm="confirmCancelAfterSale"></u-modal>
-	</view>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, computed, watch, getCurrentInstance } from 'vue'
-import { onLoad, onShow, onPullDownRefresh, onBackPress } from '@dcloudio/uni-app'
-import { useStore } from '@/store'
-import { getThemeStyle } from '@/utils/theme'
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
-import { getOrderList, cancelOrder, confirmReceipt } from '@/api/order.js'
-import { getClearReason, getAfterSaleList, cancelAfterSale } from '@/api/after-sale.js'
-import storage from '@/utils/storage'
-import LiLiWXPay from '@/js_sdk/lili-pay/wx-pay.js'
-import {
-	unitPrice,
-	parseGoodsImageUrl,
-	tipsToLogin,
-	orderStatusList,
-} from '@/utils/filters.js'
-// E_COUPON 订单不展示确认收货、退款/售后（FR-B-04）
-import { isECouponOrder, isAppointmentOrder } from '@/utils/goodsType.js'
-import { appointmentOrderStatusText, getAppointmentAllowOperation } from '@/utils/appointmentGoods.js'
-
-const store = useStore()
-const { proxy } = getCurrentInstance()!
-const themeStyle = computed(() => getThemeStyle(store.state.theme))
-const lightColor = computed(() => store.getters.lightColor)
-const mainColor = computed(() => store.getters.mainColor)
-
-interface NavTabItem {
-	state: number
-	text: string
-	tag: string
-	commentStatus?: string
-	kind?: 'order' | 'afterSale'
-	loadStatus: string
-	orderList: any[]
-	pageNumber: number
-	loaded?: boolean
-}
-
-const tabCurrentIndex = ref(0)
-const navList = reactive<NavTabItem[]>([
-	{ state: 0, text: '全部', tag: 'ALL', loadStatus: 'more', orderList: [], pageNumber: 1 },
-	{ state: 1, text: '待支付', tag: 'WAIT_PAY', loadStatus: 'more', orderList: [], pageNumber: 1 },
-	{ state: 2, text: '待发货', tag: 'WAIT_SHIP', loadStatus: 'more', orderList: [], pageNumber: 1 },
-	{ state: 3, text: '待收货/使用', tag: 'WAIT_USE', loadStatus: 'more', orderList: [], pageNumber: 1 },
-	{ state: 4, text: '评价', tag: 'ALL', commentStatus: 'UNFINISHED', loadStatus: 'more', orderList: [], pageNumber: 1 },
-	{ state: 5, text: '售后', tag: 'ALL', kind: 'afterSale', loadStatus: 'more', orderList: [], pageNumber: 1 },
-])
-
-const status = ref<number>(0)
-
-const afterSaleStatusText: Record<string, string> = {
-	APPLY: '申请中',
-	PASS: '已通过',
-	REFUSE: '已拒绝',
-	BUYER_RETURN: '待卖家收货',
-	SELLER_CONFIRM: '卖家确认收货',
-	SELLER_TERMINATION: '卖家终止售后',
-	BUYER_CANCEL: '买家取消售后',
-	WAIT_REFUND: '等待平台退款',
-	COMPLETE: '完成',
-}
-
-const cancelShow = ref(false)
-const orderSn = ref('')
-const reason = ref('')
-const cancelList = ref<any[]>([])
-const rogShow = ref(false)
-const cancelAfterSaleShow = ref(false)
-const pendingAfterSaleSn = ref('')
-
-function hideLoadingIfNeeded() {
-	if (store.state.isShowToast) uni.hideLoading()
-}
-
-onBackPress((e) => {
-	if (e.from == 'backbutton') {
-		uni.switchTab({ url: '/pages/tabbar/user/my' })
-		return true
-	}
-	return false
-})
-
-onPullDownRefresh(() => {
-	if (tabCurrentIndex.value) {
-		initData(tabCurrentIndex.value)
-	} else {
-		initData(0)
-	}
-})
-
-onShow(() => {
-	if (tipsToLogin()) {
-		if (!tabCurrentIndex.value) {
-			initData(0)
-		}
-	}
-})
-
-onLoad((options) => {
-	const statusNum = Number(options?.status)
-	status.value = statusNum
-	tabCurrentIndex.value = statusNum
-})
-
-watch(tabCurrentIndex, (val) => {
-	navList.forEach((res) => {
-		res.pageNumber = 1
-		res.loadStatus = 'more'
-		res.orderList = []
-		res.loaded = false
-	})
-	loadData(val)
-})
-
-function navigateToStore(val: any) {
-	uni.navigateTo({
-		url: '/pages/product/shopPage?id=' + val.storeId,
-	})
-}
-
-function renderOrderTag(orderPromotionType: string) {
-	switch (orderPromotionType) {
-		case 'NORMAL':
-			return ''
-		case 'PINTUAN':
-			return '拼团订单'
-		case 'GIFT':
-			return '赠品订单'
-		case 'POINTS':
-			return '积分订单'
-		case 'KANJIA':
-			return '砍价订单'
-		default:
-			return ''
-	}
-}
-
-function renderOrderTagType(orderPromotionType: string) {
-	switch (orderPromotionType) {
-		case 'PINTUAN':
-			return 'error'
-		case 'GIFT':
-			return 'primary'
-		case 'POINTS':
-			return 'info'
-		case 'KANJIA':
-			return 'warning'
-		default:
-			return 'info'
-	}
-}
-
-function getOrderItemImage(goods: any, order: any, index: number) {
-	let image = goods.image
-	if (!image && order.groupImages) {
-		const images = String(order.groupImages).split(',')
-		image = images[index] || images[0]
-	}
-	return parseGoodsImageUrl(image)
-}
-
-function onCancel(sn: string) {
-	orderSn.value = sn
-	cancelShow.value = true
-	uni.showLoading({ title: '加载中' })
-	getClearReason().then((res) => {
-		if (res.data.result.length >= 1) {
-			cancelList.value = res.data.result
-		}
-		hideLoadingIfNeeded()
-	})
-}
-
-function initData(index: number) {
-	navList[index].pageNumber = 1
-	navList[index].loadStatus = 'more'
-	navList[index].orderList = []
-	navList[index].loaded = false
-	loadData(index)
-}
-
-function waitPay(val: any) {
-	proxy?.$u?.debounce?.(() => pay(val), 3000, true)?.()
-}
-
-function pay(val: any) {
-	if (val.sn) {
-		uni.navigateTo({
-			url: '/pages/cart/payment/payOrder?order_sn=' + val.sn,
-		})
-	}
-}
-
-function loadData(index: number) {
-	const tab = navList[index]
-	if (!tab || tab.loadStatus === 'noMore') {
-		return
-	}
-	const pageNumber = tab.pageNumber
-	const request = tab.kind === 'afterSale'
-		? getAfterSaleList({
-			pageNumber,
-			pageSize: 10,
-			sort: 'createTime',
-			order: 'desc',
-		})
-		: getOrderList({
-			pageNumber,
-			pageSize: 10,
-			tag: tab.tag,
-			...(tab.commentStatus ? { commentStatus: tab.commentStatus } : {}),
-		})
-	request.then((res) => {
-		uni.stopPullDownRefresh()
-		tab.loaded = true
-		if (!res.data.success) {
-			tab.loadStatus = 'noMore'
-			return false
-		}
-		let records = res.data.result.records || []
-		if (tab.kind === 'afterSale') {
-			records = records.map(mapAfterSaleOrder)
-		}
-		if (records.length < 10) {
-			tab.loadStatus = 'noMore'
-		}
-		if (records.length > 0) {
-			tab.orderList = tab.orderList.concat(records)
-			tab.pageNumber += 1
-		}
-	})
-}
-
-const afterSaleTypeTextMap: Record<string, string> = {
-	RETURN_MONEY: '仅退款',
-	RETURN_GOODS: '退货退款',
-	EXCHANGE_GOODS: '换货',
-	SUPPLY_AGAIN_GOODS: '补发商品',
-	CANCEL: '取消订单',
-}
-
-function afterSaleTypeText(type: string) {
-	return afterSaleTypeTextMap[type] || '售后'
-}
-
-function mapAfterSaleOrder(item: any) {
-	return {
-		...item,
-		isAfterSale: true,
-		serviceSn: item.sn,
-		sn: item.orderSn,
-		orderStatus: item.serviceStatus,
-		groupName: item.goodsName,
-		groupNum: item.num,
-		groupImages: item.goodsImage,
-		applyRefundPrice: item.applyRefundPrice,
-		orderItems: [
-			{
-				image: item.goodsImage,
-				name: item.goodsName,
-				num: item.num,
-			},
-		],
-		allowOperationVO: {},
-	}
-}
-
-function orderCardStatus(order: any) {
-	if (order?.isAfterSale) {
-		return afterSaleStatusText[order.serviceStatus] || '售后'
-	}
-	if (isAppointmentOrder(order?.orderType)) {
-		return appointmentOrderStatusText(order.orderStatus)
-	}
-	return orderStatusList(order.orderStatus)
-}
-
-function openOrder(order: any) {
-	if (order?.isAfterSale) {
-		uni.navigateTo({
-			url: './afterSales/applyDetail?sn=' + order.serviceSn,
-		})
-		return
-	}
-	navigateToOrderDetail(order.sn)
-}
-
-function onCancelAfterSale(order: any) {
-	pendingAfterSaleSn.value = order?.serviceSn || order?.sn || ''
-	cancelAfterSaleShow.value = true
-}
-
-async function confirmCancelAfterSale() {
-	if (!pendingAfterSaleSn.value) return
-	uni.showLoading({ title: '加载中' })
-	const res = await cancelAfterSale(pendingAfterSaleSn.value)
-	hideLoadingIfNeeded()
-	if (res?.data?.success) {
-		uni.showToast({ title: '取消成功!', duration: 2000, icon: 'none' })
-		initData(tabCurrentIndex.value)
-	}
-}
-
-function onAfterSaleExpress(order: any) {
-	const sku = (order?.orderItems && order.orderItems[0]) || {}
-	storage.setAfterSaleData({ ...order, ...sku, storeName: order.storeName })
-	uni.navigateTo({
-		url: `./afterSales/afterSalesDetailExpress?serviceSn=${order.serviceSn || order.sn}`,
-	})
-}
-
-function changeTab(e: any) {
-	// H5 的 swiper change 把下标放在 detail.current。
-	// 读 target.current 会得到 undefined，选中态被清掉，列表就停在「全部」。
-	const current = Number(e?.detail?.current ?? e?.target?.current)
-	if (!Number.isInteger(current) || current < 0 || current >= navList.length) return
-	tabCurrentIndex.value = current
-}
-
-function tabClick(index: number) {
-	tabCurrentIndex.value = index
-}
-
-function deleteOrder(index: number) {
-	uni.showLoading({ title: '请稍后' })
-	setTimeout(() => {
-		navList[tabCurrentIndex.value].orderList.splice(index, 1)
-		hideLoadingIfNeeded()
-	}, 600)
-}
-
-function cancelOrderLocal(item: any) {
-	uni.showLoading({ title: '请稍后' })
-	setTimeout(() => {
-		const { stateTip, stateTipColor } = orderStateExp(9)
-		Object.assign(item, {
-			state: 9,
-			stateTip,
-			stateTipColor,
-		})
-		const list = navList[1].orderList
-		const idx = list.findIndex((val) => val.id === item.id)
-		if (idx !== -1) list.splice(idx, 1)
-		hideLoadingIfNeeded()
-	}, 600)
-}
-
-function orderStateExp(state: number) {
-	let stateTip = ''
-	let stateTipColor = lightColor.value
-	switch (+state) {
-		case 1:
-			stateTip = '待付款'
-			break
-		case 2:
-			stateTip = '待发货'
-			break
-		case 9:
-			stateTip = '订单已关闭'
-			stateTipColor = '#909399'
-			break
-	}
-	return { stateTip, stateTipColor }
-}
-
-function showOrderCancel(order: any) {
-	if (isAppointmentOrder(order?.orderType)) {
-		return !!getAppointmentAllowOperation(order)?.cancel
-	}
-	return !!order?.allowOperationVO?.cancel
-}
-
-function navigateToOrderDetail(sn: string) {
-	uni.navigateTo({
-		url: './orderDetail?sn=' + sn,
-	})
-}
-
-function reasonChange(val: string) {
-	reason.value = val
-}
-
-function submitCancel() {
-	cancelOrder(orderSn.value, { reason: reason.value }).then((res) => {
-		if (res.data.success) {
-			uni.showToast({
-				title: '订单已取消',
-				duration: 2000,
-				icon: 'none',
-			})
-			initData(tabCurrentIndex.value)
-			cancelShow.value = false
-		} else {
-			uni.showToast({
-				title: res.data.message,
-				duration: 2000,
-				icon: 'none',
-			})
-			cancelShow.value = false
-		}
-	})
-}
-
-function onRog(sn: string) {
-	orderSn.value = sn
-	rogShow.value = true
-}
-
-function confirmRog() {
-	confirmReceipt(orderSn.value).then((res) => {
-		if (res.data.code == 200) {
-			uni.showToast({
-				title: '已确认收货',
-				duration: 2000,
-				icon: 'none',
-			})
-			initData(tabCurrentIndex.value)
-			rogShow.value = false
-		}
-	})
-}
-
-function onComment(_sn: string) {
-	uni.navigateTo({
-		url: './evaluate/myEvaluate',
-	})
-}
-
-function reBuy(order: any) {
-	const goods = order.orderItems?.[0]
-	if (!goods) return
-	uni.navigateTo({
-		url: '/pages/product/goods?id=' + goods.id + '&goodsId=' + goods.goodsId,
-	})
-}
-</script>
-
-<style lang="scss" scoped>
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100vh - 40px);
-		// #ifdef H5
-		height: calc(100vh - 40px - 44px);
-		// #endif
-	}
-
-	.list-scroll-content {
-		height: 100%;
-		padding: 16rpx 20rpx 0;
-	}
-
-	.navbar {
-		height: 40px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-		position: relative;
-		z-index: 10;
-		white-space: nowrap;
-
-		.navbar-inner {
-			display: inline-flex;
-			align-items: stretch;
-			height: 40px;
-			min-width: 100%;
-		}
-
-		.nav-item {
-			flex: none;
-			display: inline-flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			padding: 0 24rpx;
-			font-size: 26rpx;
-			color: $font-color-light;
-			position: relative;
-			white-space: nowrap;
-
-			&.current {
-				color: $main-color;
-
-				&:after {
-					content: "";
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $main-color;
-				}
-			}
-		}
-	}
-
-	.uni-swiper-item {
-		height: auto;
-	}
-
-	.seller-view {
-		border-radius: 20rpx;
-		background-color: #fff;
-		margin: 16rpx 0;
-
-		.seller-info {
-			padding: 24rpx 20rpx 16rpx;
-			align-items: center;
-
-			.seller-name {
-				flex: 10;
-				font-size: 28rpx;
-				font-weight: 600;
-				display: flex;
-				flex-direction: row;
-					text-align: center;
-				.name {
-					margin-left: 15rpx;
-				}
-			}
-
-			.order-sn {
-				flex: 2;
-				width: 120rpx;
-				text-align: center;
-				color: $aider-light-color;
-				font-size: 26rpx;
-			}
-		}
-
-		.after-sale-sn {
-			padding: 0 32rpx 8rpx;
-			font-size: 24rpx;
-			color: #999;
-		}
-
-		.goods-item-view {
-			display: flex;
-			flex-wrap: wrap;
-			flex-direction: row;
-			padding: 10rpx 20rpx;
-
-			.goods-img {
-				width: 131rpx;
-				height: 131rpx;
-				margin-right: 10rpx;
-				margin-bottom: 10rpx;
-			}
-
-			.goods-info {
-				padding-left: 30rpx;
-				flex: 1;
-
-				.goods-title {
-					margin-bottom: 10rpx;
-					color: #333333;
-				}
-
-				.goods-specs {
-					font-size: 24rpx;
-					margin-bottom: 10rpx;
-					color: #cccccc;
-				}
-
-				.goods-price {
-					font-size: 28rpx;
-					margin-bottom: 10rpx;
-					color: $aider-light-color;
-				}
-			}
-
-			.goods-num {
-				width: 60rpx;
-				color: $main-color;
-			}
-		}
-
-		.btn-view {
-			padding: 25rpx 30rpx;
-			font-size: 26rpx;
-
-			.description {
-				display: flex;
-				color: #909399;
-				size: 24rpx;
-				flex: 1;
-
-				.price {
-					color: $main-color;
-
-				}
-			}
-		}
-	}
-
-	.cancel-popup {
-		.header {
-			display: flex;
-			flex-direction: row;
-			justify-content: center;
-			margin: 15rpx 0rpx;
-		}
-
-		.body {
-			padding: 30rpx;
-
-			.title {
-				font-weight: 600;
-			}
-
-			.value {
-				display: flex;
-				flex-direction: column;
-				margin: 20rpx 0;
-
-				.radio-view {
-					margin: 20rpx 0rpx;
-				}
-			}
-		}
-
-		.footer {
-			text-align: center;
-		}
-	}
-
-	.goods-btn {
-		display: flex;
-	}
-
-	.cancel-btn,
-	.pay-btn,
-	.rebuy-btn {
-		text-align: center;
-		margin-left: 15rpx;
-		font-size: 24rpx;
-		padding: 14rpx 20rpx;
-		border-radius: 100px;
-
-	}
-
-	.cancel-btn {
-		color: #333639 !important;
-		background: rgba(46, 51, 56, .05) !important;
-	}
-
-	.pay-btn {
-
-		background-color: $light-color !important;
-
-		color: #ffffff !important;
-	}
-
-	.rebuy-btn {
-		color: $light-color !important;
-		border-color: $light-color !important;
-		background-color: #ffffff !important;
-	}
+<template>
+	<view class="content" :style="themeStyle">
+		<scroll-view class="navbar" scroll-x :show-scrollbar="false">
+			<view class="navbar-inner">
+				<view v-for="(item, index) in navList" :key="index" class="nav-item"
+					:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+			</view>
+		</scroll-view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
+					<!-- 空白页 -->
+					<u-empty :text="tabItem.kind === 'afterSale' ? '暂无售后记录' : '暂无订单'" mode="list"
+						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></u-empty>
+					<!-- 订单列表 -->
+					<view class="seller-view" :key="orderIndex" v-for="(order, orderIndex) in tabItem.orderList">
+						<template v-if="order.isAfterSale">
+							<view class="seller-info u-flex u-row-between">
+								<view class="seller-name wes">
+									<view class="name">{{ order.storeName }}</view>
+								</view>
+								<view class="order-sn">{{ orderCardStatus(order) }}</view>
+							</view>
+							<view class="after-sale-sn">售后单号：{{ order.serviceSn }}</view>
+							<view class="goods-item-view" @click="openOrder(order)">
+								<view class="goods-img">
+									<u-image border-radius="6" width="131rpx" height="131rpx" mode="aspectFill"
+										:src="getOrderItemImage(order.orderItems[0], order, 0)"></u-image>
+								</view>
+								<view class="goods-info">
+									<view class="goods-title u-line-2">{{ order.groupName }}</view>
+									<view class="goods-price">申请退款 ￥{{ unitPrice(order.applyRefundPrice) }}</view>
+								</view>
+								<view class="goods-num">
+									<view>x{{ order.groupNum }}</view>
+								</view>
+							</view>
+							<view class="btn-view u-flex u-row-between">
+								<view class="description">{{ afterSaleTypeText(order.serviceType) }}</view>
+								<view class="goods-btn flex flex-a-c">
+									<view class="cancel-btn" v-if="order.serviceStatus === 'APPLY'" @click="onCancelAfterSale(order)">取消售后</view>
+									<view class="pay-btn" v-if="order.serviceStatus === 'PASS' && order.serviceType !== 'RETURN_MONEY'" @click="onAfterSaleExpress(order)">提交物流</view>
+									<view class="pay-btn" @click="openOrder(order)">售后详情</view>
+								</view>
+							</view>
+						</template>
+						<template v-else>
+						<!-- 店铺名称 -->
+						<view class="seller-info u-flex u-row-between">
+							<view class="seller-name wes" @click="navigateToStore(order)">
+								<view class="name">{{ order.storeName }}</view>
+
+								<view class="name" v-if="renderOrderTag(order.orderPromotionType)">
+									<u-tag
+										:text="renderOrderTag(order.orderPromotionType)"
+										:type="renderOrderTagType(order.orderPromotionType)"
+										size="mini"
+									/>
+								</view>
+
+							</view>
+							<view class="order-sn">{{ orderCardStatus(order) }}</view>
+						</view>
+						<view>
+							<view>
+								<view class="goods-item-view" @click="openOrder(order)">
+									<view class="goods-img" v-for="(goods, goodsIndex) in order.orderItems"
+										:key="goodsIndex">
+										<u-image border-radius="6" width="131rpx" height="131rpx" mode="aspectFill"
+											:src="getOrderItemImage(goods, order, goodsIndex)"></u-image>
+									</view>
+									<view class="goods-info">
+										<view v-if="order.orderItems.length <= 1" class="goods-title u-line-2">
+											{{ order.groupName }}</view>
+										<view v-if="order.orderItems.length <= 1" class="goods-price">
+											￥{{unitPrice(order.flowPrice) }}
+										</view>
+									</view>
+									<view v-if="order.orderItems.length <= 1" class="goods-num">
+										<view>x{{ order.groupNum }}</view>
+									</view>
+								</view>
+							</view>
+							<view class="btn-view u-flex u-row-between">
+								<view class="description">
+									<!-- 等待付款 -->
+									<div v-if="order.payStatus === 'PAID'">已付金额:</div>
+									<div v-else>应付金额:</div>
+									<div class="price">￥{{unitPrice(order.flowPrice) }}</div>
+								</view>
+								<view class="goods-btn flex flex-a-c">
+									<!-- 全部 -->
+									<view ripple class="pay-btn" shape="circle" size="mini"
+										v-if="order.allowOperationVO.pay" @click="waitPay(order)">立即付款</view>
+									<!-- 取消订单 -->
+									<view ripple class="cancel-btn" shape="circle" size="mini"
+										v-if="showOrderCancel(order)" @click="onCancel(order.sn)">
+										取消订单
+									</view>
+									<!-- 等待收货 -->
+									<view ripple shape="circle" class="pay-btn" size="mini"
+										v-if="order.allowOperationVO.rog && !isECouponOrder(order.orderType)" @click="onRog(order.sn)">
+										确认收货
+									</view>
+								</view>
+							</view>
+						</view>
+						</template>
+					</view>
+					<uni-load-more v-if="tabItem.orderList.length > 0" :status="tabItem.loadStatus"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<u-popup class="cancel-popup" v-model:show="cancelShow" mode="bottom" length="60%">
+			<view class="header">取消订单</view>
+			<view class="body">
+				<view class="title">{{ cancelIsPickup ? '此订单使用提货卡兑换，取消不退还提货权益，无法再次兑换。是否继续？' : '取消订单后，本单享有的优惠可能会一并取消，是否继续？' }}</view>
+				<view>
+					<u-radio-group v-model="reason">
+						<view class="value">
+							<view class="radio-view" :key="index" v-for="(item, index) in cancelList">
+								<u-radio :active-color="lightColor" shape="circle" :name="item.reason"
+									:label="item.reason" @change="reasonChange"></u-radio>
+							</view>
+						</view>
+					</u-radio-group>
+				</view>
+			</view>
+			<view class="footer">
+				<u-button size="medium" ripple v-if="reason" shape="circle" @click="submitCancel">提交</u-button>
+			</view>
+		</u-popup>
+		<u-toast ref="uToast" />
+		<u-modal :confirm-color="lightColor" v-model:show="rogShow" :show-cancel-button="true" :content="'是否确认收货?'"
+			@confirm="confirmRog"></u-modal>
+		<u-modal :confirm-color="lightColor" v-model:show="cancelAfterSaleShow" :show-cancel-button="true" content="确认取消售后?"
+			@confirm="confirmCancelAfterSale"></u-modal>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, watch, getCurrentInstance } from 'vue'
+import { onLoad, onShow, onPullDownRefresh, onBackPress } from '@dcloudio/uni-app'
+import { useStore } from '@/store'
+import { getThemeStyle } from '@/utils/theme'
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
+import { getOrderList, cancelOrder, confirmReceipt } from '@/api/order.js'
+import { getClearReason, getAfterSaleList, cancelAfterSale } from '@/api/after-sale.js'
+import storage from '@/utils/storage'
+import LiLiWXPay from '@/js_sdk/lili-pay/wx-pay.js'
+import {
+	unitPrice,
+	parseGoodsImageUrl,
+	tipsToLogin,
+	orderStatusList,
+} from '@/utils/filters.js'
+// E_COUPON 订单不展示确认收货、退款/售后（FR-B-04）
+import { isECouponOrder, isAppointmentOrder } from '@/utils/goodsType.js'
+import { appointmentOrderStatusText, getAppointmentAllowOperation } from '@/utils/appointmentGoods.js'
+
+const store = useStore()
+const { proxy } = getCurrentInstance()!
+const themeStyle = computed(() => getThemeStyle(store.state.theme))
+const lightColor = computed(() => store.getters.lightColor)
+const mainColor = computed(() => store.getters.mainColor)
+
+interface NavTabItem {
+	state: number
+	text: string
+	tag: string
+	commentStatus?: string
+	kind?: 'order' | 'afterSale'
+	loadStatus: string
+	orderList: any[]
+	pageNumber: number
+	loaded?: boolean
+}
+
+const tabCurrentIndex = ref(0)
+const navList = reactive<NavTabItem[]>([
+	{ state: 0, text: '全部', tag: 'ALL', loadStatus: 'more', orderList: [], pageNumber: 1 },
+	{ state: 1, text: '待支付', tag: 'WAIT_PAY', loadStatus: 'more', orderList: [], pageNumber: 1 },
+	{ state: 2, text: '待发货', tag: 'WAIT_SHIP', loadStatus: 'more', orderList: [], pageNumber: 1 },
+	{ state: 3, text: '待收货/使用', tag: 'WAIT_USE', loadStatus: 'more', orderList: [], pageNumber: 1 },
+	{ state: 4, text: '评价', tag: 'ALL', commentStatus: 'UNFINISHED', loadStatus: 'more', orderList: [], pageNumber: 1 },
+	{ state: 5, text: '售后', tag: 'ALL', kind: 'afterSale', loadStatus: 'more', orderList: [], pageNumber: 1 },
+])
+
+const status = ref<number>(0)
+
+const afterSaleStatusText: Record<string, string> = {
+	APPLY: '申请中',
+	PASS: '已通过',
+	REFUSE: '已拒绝',
+	BUYER_RETURN: '待卖家收货',
+	SELLER_CONFIRM: '卖家确认收货',
+	SELLER_TERMINATION: '卖家终止售后',
+	BUYER_CANCEL: '买家取消售后',
+	WAIT_REFUND: '等待平台退款',
+	COMPLETE: '完成',
+}
+
+const cancelShow = ref(false)
+const orderSn = ref('')
+const reason = ref('')
+const cancelList = ref<any[]>([])
+const rogShow = ref(false)
+const cancelAfterSaleShow = ref(false)
+const pendingAfterSaleSn = ref('')
+
+function hideLoadingIfNeeded() {
+	if (store.state.isShowToast) uni.hideLoading()
+}
+
+onBackPress((e) => {
+	if (e.from == 'backbutton') {
+		uni.switchTab({ url: '/pages/tabbar/user/my' })
+		return true
+	}
+	return false
+})
+
+onPullDownRefresh(() => {
+	if (tabCurrentIndex.value) {
+		initData(tabCurrentIndex.value)
+	} else {
+		initData(0)
+	}
+})
+
+onShow(() => {
+	if (tipsToLogin()) {
+		if (!tabCurrentIndex.value) {
+			initData(0)
+		}
+	}
+})
+
+onLoad((options) => {
+	const statusNum = Number(options?.status)
+	status.value = statusNum
+	tabCurrentIndex.value = statusNum
+})
+
+watch(tabCurrentIndex, (val) => {
+	navList.forEach((res) => {
+		res.pageNumber = 1
+		res.loadStatus = 'more'
+		res.orderList = []
+		res.loaded = false
+	})
+	loadData(val)
+})
+
+function navigateToStore(val: any) {
+	uni.navigateTo({
+		url: '/pages/product/shopPage?id=' + val.storeId,
+	})
+}
+
+function renderOrderTag(orderPromotionType: string) {
+	switch (orderPromotionType) {
+		case 'NORMAL':
+			return ''
+		case 'PINTUAN':
+			return '拼团订单'
+		case 'GIFT':
+			return '赠品订单'
+		case 'POINTS':
+			return '积分订单'
+		case 'KANJIA':
+			return '砍价订单'
+		default:
+			return ''
+	}
+}
+
+function renderOrderTagType(orderPromotionType: string) {
+	switch (orderPromotionType) {
+		case 'PINTUAN':
+			return 'error'
+		case 'GIFT':
+			return 'primary'
+		case 'POINTS':
+			return 'info'
+		case 'KANJIA':
+			return 'warning'
+		default:
+			return 'info'
+	}
+}
+
+function getOrderItemImage(goods: any, order: any, index: number) {
+	let image = goods.image
+	if (!image && order.groupImages) {
+		const images = String(order.groupImages).split(',')
+		image = images[index] || images[0]
+	}
+	return parseGoodsImageUrl(image)
+}
+
+const cancelIsPickup = ref(false)
+
+function onCancel(sn: string) {
+	cancelIsPickup.value = !!navList.flatMap(tab => tab.orderList).find(order => order.sn === sn)?.pickupCardId
+	orderSn.value = sn
+	cancelShow.value = true
+	uni.showLoading({ title: '加载中' })
+	getClearReason().then((res) => {
+		if (res.data.result.length >= 1) {
+			cancelList.value = res.data.result
+		}
+		hideLoadingIfNeeded()
+	})
+}
+
+function initData(index: number) {
+	navList[index].pageNumber = 1
+	navList[index].loadStatus = 'more'
+	navList[index].orderList = []
+	navList[index].loaded = false
+	loadData(index)
+}
+
+function waitPay(val: any) {
+	proxy?.$u?.debounce?.(() => pay(val), 3000, true)?.()
+}
+
+function pay(val: any) {
+	if (val.sn) {
+		uni.navigateTo({
+			url: '/pages/cart/payment/payOrder?order_sn=' + val.sn,
+		})
+	}
+}
+
+function loadData(index: number) {
+	const tab = navList[index]
+	if (!tab || tab.loadStatus === 'noMore') {
+		return
+	}
+	const pageNumber = tab.pageNumber
+	const request = tab.kind === 'afterSale'
+		? getAfterSaleList({
+			pageNumber,
+			pageSize: 10,
+			sort: 'createTime',
+			order: 'desc',
+		})
+		: getOrderList({
+			pageNumber,
+			pageSize: 10,
+			tag: tab.tag,
+			...(tab.commentStatus ? { commentStatus: tab.commentStatus } : {}),
+		})
+	request.then((res) => {
+		uni.stopPullDownRefresh()
+		tab.loaded = true
+		if (!res.data.success) {
+			tab.loadStatus = 'noMore'
+			return false
+		}
+		let records = res.data.result.records || []
+		if (tab.kind === 'afterSale') {
+			records = records.map(mapAfterSaleOrder)
+		}
+		if (records.length < 10) {
+			tab.loadStatus = 'noMore'
+		}
+		if (records.length > 0) {
+			tab.orderList = tab.orderList.concat(records)
+			tab.pageNumber += 1
+		}
+	})
+}
+
+const afterSaleTypeTextMap: Record<string, string> = {
+	RETURN_MONEY: '仅退款',
+	RETURN_GOODS: '退货退款',
+	EXCHANGE_GOODS: '换货',
+	SUPPLY_AGAIN_GOODS: '补发商品',
+	CANCEL: '取消订单',
+}
+
+function afterSaleTypeText(type: string) {
+	return afterSaleTypeTextMap[type] || '售后'
+}
+
+function mapAfterSaleOrder(item: any) {
+	return {
+		...item,
+		isAfterSale: true,
+		serviceSn: item.sn,
+		sn: item.orderSn,
+		orderStatus: item.serviceStatus,
+		groupName: item.goodsName,
+		groupNum: item.num,
+		groupImages: item.goodsImage,
+		applyRefundPrice: item.applyRefundPrice,
+		orderItems: [
+			{
+				image: item.goodsImage,
+				name: item.goodsName,
+				num: item.num,
+			},
+		],
+		allowOperationVO: {},
+	}
+}
+
+function orderCardStatus(order: any) {
+	if (order?.isAfterSale) {
+		return afterSaleStatusText[order.serviceStatus] || '售后'
+	}
+	if (isAppointmentOrder(order?.orderType)) {
+		return appointmentOrderStatusText(order.orderStatus)
+	}
+	return orderStatusList(order.orderStatus)
+}
+
+function openOrder(order: any) {
+	if (order?.isAfterSale) {
+		uni.navigateTo({
+			url: './afterSales/applyDetail?sn=' + order.serviceSn,
+		})
+		return
+	}
+	navigateToOrderDetail(order.sn)
+}
+
+function onCancelAfterSale(order: any) {
+	pendingAfterSaleSn.value = order?.serviceSn || order?.sn || ''
+	cancelAfterSaleShow.value = true
+}
+
+async function confirmCancelAfterSale() {
+	if (!pendingAfterSaleSn.value) return
+	uni.showLoading({ title: '加载中' })
+	const res = await cancelAfterSale(pendingAfterSaleSn.value)
+	hideLoadingIfNeeded()
+	if (res?.data?.success) {
+		uni.showToast({ title: '取消成功!', duration: 2000, icon: 'none' })
+		initData(tabCurrentIndex.value)
+	}
+}
+
+function onAfterSaleExpress(order: any) {
+	const sku = (order?.orderItems && order.orderItems[0]) || {}
+	storage.setAfterSaleData({ ...order, ...sku, storeName: order.storeName })
+	uni.navigateTo({
+		url: `./afterSales/afterSalesDetailExpress?serviceSn=${order.serviceSn || order.sn}`,
+	})
+}
+
+function changeTab(e: any) {
+	// H5 的 swiper change 把下标放在 detail.current。
+	// 读 target.current 会得到 undefined，选中态被清掉，列表就停在「全部」。
+	const current = Number(e?.detail?.current ?? e?.target?.current)
+	if (!Number.isInteger(current) || current < 0 || current >= navList.length) return
+	tabCurrentIndex.value = current
+}
+
+function tabClick(index: number) {
+	tabCurrentIndex.value = index
+}
+
+function deleteOrder(index: number) {
+	uni.showLoading({ title: '请稍后' })
+	setTimeout(() => {
+		navList[tabCurrentIndex.value].orderList.splice(index, 1)
+		hideLoadingIfNeeded()
+	}, 600)
+}
+
+function cancelOrderLocal(item: any) {
+	uni.showLoading({ title: '请稍后' })
+	setTimeout(() => {
+		const { stateTip, stateTipColor } = orderStateExp(9)
+		Object.assign(item, {
+			state: 9,
+			stateTip,
+			stateTipColor,
+		})
+		const list = navList[1].orderList
+		const idx = list.findIndex((val) => val.id === item.id)
+		if (idx !== -1) list.splice(idx, 1)
+		hideLoadingIfNeeded()
+	}, 600)
+}
+
+function orderStateExp(state: number) {
+	let stateTip = ''
+	let stateTipColor = lightColor.value
+	switch (+state) {
+		case 1:
+			stateTip = '待付款'
+			break
+		case 2:
+			stateTip = '待发货'
+			break
+		case 9:
+			stateTip = '订单已关闭'
+			stateTipColor = '#909399'
+			break
+	}
+	return { stateTip, stateTipColor }
+}
+
+function showOrderCancel(order: any) {
+	if (isAppointmentOrder(order?.orderType)) {
+		return !!getAppointmentAllowOperation(order)?.cancel
+	}
+	return !!order?.allowOperationVO?.cancel
+}
+
+function navigateToOrderDetail(sn: string) {
+	uni.navigateTo({
+		url: './orderDetail?sn=' + sn,
+	})
+}
+
+function reasonChange(val: string) {
+	reason.value = val
+}
+
+function submitCancel() {
+	cancelOrder(orderSn.value, { reason: reason.value }).then((res) => {
+		if (res.data.success) {
+			uni.showToast({
+				title: '订单已取消',
+				duration: 2000,
+				icon: 'none',
+			})
+			initData(tabCurrentIndex.value)
+			cancelShow.value = false
+		} else {
+			uni.showToast({
+				title: res.data.message,
+				duration: 2000,
+				icon: 'none',
+			})
+			cancelShow.value = false
+		}
+	})
+}
+
+function onRog(sn: string) {
+	orderSn.value = sn
+	rogShow.value = true
+}
+
+function confirmRog() {
+	confirmReceipt(orderSn.value).then((res) => {
+		if (res.data.code == 200) {
+			uni.showToast({
+				title: '已确认收货',
+				duration: 2000,
+				icon: 'none',
+			})
+			initData(tabCurrentIndex.value)
+			rogShow.value = false
+		}
+	})
+}
+
+function onComment(_sn: string) {
+	uni.navigateTo({
+		url: './evaluate/myEvaluate',
+	})
+}
+
+function reBuy(order: any) {
+	const goods = order.orderItems?.[0]
+	if (!goods) return
+	uni.navigateTo({
+		url: '/pages/product/goods?id=' + goods.id + '&goodsId=' + goods.goodsId,
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.swiper-box {
+		height: calc(100vh - 40px);
+		// #ifdef H5
+		height: calc(100vh - 40px - 44px);
+		// #endif
+	}
+
+	.list-scroll-content {
+		height: 100%;
+		padding: 16rpx 20rpx 0;
+	}
+
+	.navbar {
+		height: 40px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+		white-space: nowrap;
+
+		.navbar-inner {
+			display: inline-flex;
+			align-items: stretch;
+			height: 40px;
+			min-width: 100%;
+		}
+
+		.nav-item {
+			flex: none;
+			display: inline-flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			padding: 0 24rpx;
+			font-size: 26rpx;
+			color: $font-color-light;
+			position: relative;
+			white-space: nowrap;
+
+			&.current {
+				color: $main-color;
+
+				&:after {
+					content: "";
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid $main-color;
+				}
+			}
+		}
+	}
+
+	.uni-swiper-item {
+		height: auto;
+	}
+
+	.seller-view {
+		border-radius: 20rpx;
+		background-color: #fff;
+		margin: 16rpx 0;
+
+		.seller-info {
+			padding: 24rpx 20rpx 16rpx;
+			align-items: center;
+
+			.seller-name {
+				flex: 10;
+				font-size: 28rpx;
+				font-weight: 600;
+				display: flex;
+				flex-direction: row;
+					text-align: center;
+				.name {
+					margin-left: 15rpx;
+				}
+			}
+
+			.order-sn {
+				flex: 2;
+				width: 120rpx;
+				text-align: center;
+				color: $aider-light-color;
+				font-size: 26rpx;
+			}
+		}
+
+		.after-sale-sn {
+			padding: 0 32rpx 8rpx;
+			font-size: 24rpx;
+			color: #999;
+		}
+
+		.goods-item-view {
+			display: flex;
+			flex-wrap: wrap;
+			flex-direction: row;
+			padding: 10rpx 20rpx;
+
+			.goods-img {
+				width: 131rpx;
+				height: 131rpx;
+				margin-right: 10rpx;
+				margin-bottom: 10rpx;
+			}
+
+			.goods-info {
+				padding-left: 30rpx;
+				flex: 1;
+
+				.goods-title {
+					margin-bottom: 10rpx;
+					color: #333333;
+				}
+
+				.goods-specs {
+					font-size: 24rpx;
+					margin-bottom: 10rpx;
+					color: #cccccc;
+				}
+
+				.goods-price {
+					font-size: 28rpx;
+					margin-bottom: 10rpx;
+					color: $aider-light-color;
+				}
+			}
+
+			.goods-num {
+				width: 60rpx;
+				color: $main-color;
+			}
+		}
+
+		.btn-view {
+			padding: 25rpx 30rpx;
+			font-size: 26rpx;
+
+			.description {
+				display: flex;
+				color: #909399;
+				size: 24rpx;
+				flex: 1;
+
+				.price {
+					color: $main-color;
+
+				}
+			}
+		}
+	}
+
+	.cancel-popup {
+		.header {
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			margin: 15rpx 0rpx;
+		}
+
+		.body {
+			padding: 30rpx;
+
+			.title {
+				font-weight: 600;
+			}
+
+			.value {
+				display: flex;
+				flex-direction: column;
+				margin: 20rpx 0;
+
+				.radio-view {
+					margin: 20rpx 0rpx;
+				}
+			}
+		}
+
+		.footer {
+			text-align: center;
+		}
+	}
+
+	.goods-btn {
+		display: flex;
+	}
+
+	.cancel-btn,
+	.pay-btn,
+	.rebuy-btn {
+		text-align: center;
+		margin-left: 15rpx;
+		font-size: 24rpx;
+		padding: 14rpx 20rpx;
+		border-radius: 100px;
+
+	}
+
+	.cancel-btn {
+		color: #333639 !important;
+		background: rgba(46, 51, 56, .05) !important;
+	}
+
+	.pay-btn {
+
+		background-color: $light-color !important;
+
+		color: #ffffff !important;
+	}
+
+	.rebuy-btn {
+		color: $light-color !important;
+		border-color: $light-color !important;
+		background-color: #ffffff !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 2890236..131bac4 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -257,7 +257,7 @@
     <u-popup class="cancel-popup" v-model:show="cancelShow" mode="bottom" length="60%">
       <view class="header">取消订单</view>
       <view class="body">
-        <view class="title">取消订单后，本单享有的优惠可能会一并取消，是否继续？</view>
+        <view class="title">{{ order.pickupCardId ? '此订单使用提货卡兑换，取消不退还提货权益，无法再次兑换。是否继续？' : '取消订单后，本单享有的优惠可能会一并取消，是否继续？' }}</view>
         <view>
           <u-radio-group v-model="reason">
             <view class="value">