feat(gift-card): 新增提货卡类型支持

- 列表页拆分为提货卡和现金卡两个独立创建入口
- 创建页支持提货卡兑换方式配置（任选一种/全部兑换/任选N种）
- 集成 SKU 商品选择器，支持最多50个商品兑换配置
- 批次凭证页增加"已提货"状态标签及提货卡面额展示适配
- 批次凭证页新增导出卡密功能
- 重构表单布局为响应式 grid 并优化有效期选项交互样式

README.md

@@ -162,18 +162,42 @@ lilishop-ui
 
 ## 8. 升级计划
 
-> 更新日期：2026-11-03，依据各端近期提交及当前代码实现同步。
-
 ### ✅ 已完成特性
-| 功能模块 | 功能模块 |
+
-| :--- | :--- |
+按可核实的实现或完善时间倒序记录；日期表示代码完成或功能更新时间，不代表生产上线时间。
-| ✅ 商品定时上下架 | ✅ 商品分组 / 会员分组 |
+
-| ✅ 商品虚拟销量 | ✅ 专用发票（发票上传） |
+| 时间 | 功能模块 | 完成内容 |
-| ✅ 置顶评论 | ✅ 客户等级体系 |
+| :--- | :--- | :--- |
-| ✅ 购物卡 | ✅ 腾讯云-云直播 |
+| 2026-11-05 | ✅ 付费会员 | 单一付费会员、开通与续费、有效期、关联权益、商家与商品折扣、平台补贴及付费记录。 |
-| ✅ 卡密商品 | ✅ 二级分销 |
+| 2026-11-04 | ✅ 客户等级体系 / 客户权益 | 等级配置、权益介绍、经验值任务与明细、权益发放及重试，提供默认等级与权益数据。 |
-| ✅ 定时任务管理（数据库配置驱动） | ✅ 预约服务商品 |
+| 2026-11-04 | ✅ 小程序订单管理 | 增加小程序订单查询入口及微信订单自动上报开关。 |
-| ✅ 主题色管理 | |
+| 2026-11-04 | ✅ 立减优惠券 | 新增立减券，完善优惠券校验、领取与订单优惠计算。 |
+| 2026-11-04 | ✅ 商品定时上下架 | 完善定时上下架计划管理、独立列表及执行校验。 |
+| 2026-11-04 | ✅ 微信小程序原生能力 | 接入微信地址导入、头像选择和昵称填写。 |
+| 2026-11-02 | ✅ 消息模板 | 支持多渠道模板矩阵维护，统一站内信、短信、微信公众号及小程序订阅消息的场景配置和异步发送。 |
+| 2026-10-30 | ✅ PC 页面装修 | 重构楼层组件，支持自适应高度、可视化热区绘制及配置交互优化。 |
+| 2026-10-29 | ✅ 定时任务管理 | 重构为数据库配置驱动，支持运营后台维护任务。 |
+| 2026-10-29 | ✅ 敏感词管理 | 支持按业务场景配置过滤开关，并优化词库加载。 |
+| 2026-10-29 | ✅ PC 店铺搜索 | 新增店铺列表，支持商品与店铺双模式搜索。 |
+| 2026-10-22 | ✅ 分类设置 | 支持四种分类页模板选择、商品列表展示字段开关及模板图片预览。 |
+| 2026-10-20 | ✅ 移动端页面装修 | 完善可视化编辑器，新增首页组合组件及优惠券、店铺、文章等楼层。 |
+| 2026-10-09 | ✅ 主题色管理 | 完善主题设置，支持自定义模式。 |
+| 2026-10-02 | ✅ 预约服务商品 | 完善预约商品、预约交易及订单详情功能。 |
+| 2026-08-05 | ✅ 二级分销 | 由一级分销扩展为二级分销，增加节点配置及分销员中心。 |
+| 2026-08-03 | ✅ 卡密商品 | 完善电子卡券履约、订单状态及卡池管理。 |
+| 2026-07-23 | ✅ 素材库管理 | 增加文件分类、目录管理及目录归属校验。 |
+| 2026-07-20 | ✅ 经营统计报表 | 新增店铺业绩、商品同比环比、销售订单明细及商品销售汇总报表。 |
+| 2026-07-13 | ✅ 腾讯云直播 | 接入并完善直播、聊天与直播商品相关功能。 |
+| 2026-06-30 | ✅ 移动端技术升级 | 升级 Vue 3 与 uView Plus，适配组件和页面。 |
+| 2026-06-29 | ✅ 电子面单发货 | 完善快递鸟电子面单，支持自动携带运单号发货。 |
+| 2026-06-05 | ✅ 后端与管理端框架升级 | 5 月 25 日至 6 月 5 日完成 Spring Boot 4、管理端 Vue 3 与 Element Plus 升级。 |
+| 2026-05-22 | ✅ 购物卡 | 新增礼品卡接口，以及选择、绑定、激活和列表管理。 |
+| 2026-05-20 | ✅ 微信提现 | 完善转账状态查询、确认回调和重试处理，后续补充提现规则说明配置。 |
+| 2026-04-16 | ✅ 置顶评论 | 支持评论置顶及商品评价管理。 |
+| 2026-04-13 | ✅ 专用发票（发票上传） | 完善发票信息字段、发票详情及管理展示。 |
+| 2026-04-01 | ✅ 商品虚拟销量 | 支持按商品规格设置虚拟销量，提供单个及批量设置入口。 |
+| 2026-03-30 | ✅ 商品分组 | 新增商品分组管理及商品关联功能。 |
+| 2026-03-24 | ✅ 会员分组 | 新增会员分组管理。 |
 
 ### 🔜 近期规划中
 - 🔜 微信小店对接

buyer/src/api/pickupCard.js

@@ -0,0 +1,13 @@
+/**
+ * 提货卡选品、试算及一次兑换接口。
+ * @author Bulbasaur
+ * @since 2026-11-05
+ */
+import request, { Method } from '@/plugins/request.js';
+
+/** 查询当前会员的卡规则及候选 SKU。 */
+export const getPickupCard = id => request({ url: `/buyer/promotion/pickupCard/${encodeURIComponent(id)}`, method: Method.GET, needToken: true });
+/** 服务端校验商品与地址，返回零现金试算。 */
+export const previewPickupCard = data => request({ url: '/buyer/promotion/pickupCard/preview', method: Method.POST, needToken: true, headers: { 'Content-Type': 'application/json' }, data });
+/** 一次兑换；重试返回同一卡已创建的交易。 */
+export const redeemPickupCard = data => request({ url: '/buyer/promotion/pickupCard/redeem', method: Method.POST, needToken: true, headers: { 'Content-Type': 'application/json' }, data });

buyer/src/components/drawer/Drawer.vue

@@ -39,7 +39,7 @@
               <div>
                 <span v-if="coupon.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{ $filters.unitPrice(coupon.price) }}</span></span>
                 <span v-if="coupon.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{coupon.couponDiscount}}</span>折</span>
-                <span class="describe">满{{coupon.consumeThreshold}}元可用</span>
+                <span class="describe">{{ coupon.consumeThreshold > 0 ? '满' + coupon.consumeThreshold + '元可用' : '无门槛使用' }}</span>
               </div>
               <p>使用范围：{{useScope(coupon.scopeType, coupon.storeName)}}</p>
               <p>有效期：{{coupon.endTime}}</p>

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -100,7 +100,7 @@
                   @click="handleReceiveCoupon(item.id)"
                 >
                   <span v-if="item.couponType == 'PRICE'"
-                    >满{{ item.consumeThreshold }}减{{ item.price }}</span>
+                    >{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '减' + item.price : '无门槛，立减' + item.price + '元' }}</span>
                   <span v-if="item.couponType == 'DISCOUNT'"
                     >满{{ item.consumeThreshold }}打{{
                       item.couponDiscount
@@ -117,7 +117,7 @@
                       @click="handleReceiveCoupon(item.id)"
                     >
                       <span v-if="item.couponType == 'PRICE'"
-                        >满{{ item.consumeThreshold }}减{{ item.price }}</span>
+                        >{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '减' + item.price : '无门槛，立减' + item.price + '元' }}</span>
                       <span v-if="item.couponType == 'DISCOUNT'"
                         >满{{ item.consumeThreshold }}打{{
                           item.couponDiscount
@@ -127,26 +127,6 @@
                 </div>
               </div>
             </div>
-            <!-- 限时折扣 -->
-            <div class="item-price-row" v-if="promotionMap['DISCOUNT']">
-              <p>
-                <span class="item-price-title">促销</span>
-                <span class="item-promotion">限时折扣</span>
-                <span class="item-desc-pintuan" v-if="promotionMap['DISCOUNT'].discount">
-                  享 {{ promotionMap["DISCOUNT"].discount }} 折
-                </span>
-              </p>
-            </div>
-            <!-- 第N件优惠 -->
-            <div class="item-price-row" v-if="promotionMap['NTH']">
-              <p>
-                <span class="item-price-title">促销</span>
-                <span class="item-promotion">第N件</span>
-                <span class="item-desc-pintuan">
-                  第 {{ promotionMap["NTH"].nthNum || promotionMap["NTH"].num }} 件优惠
-                </span>
-              </p>
-            </div>
             <!-- 拼团 -->
             <div class="item-price-row" v-if="promotionMap['PINTUAN']">
               <p>

buyer/src/components/indexDecorate/components/BrandWall.vue

@@ -49,7 +49,7 @@ const brandList = computed(() => {
     { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' },
     { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' },
     { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' },
-    { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
+    { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
   ];
 });
 

buyer/src/constants/goodsType.js

@@ -14,7 +14,7 @@ export const E_COUPON_ORDER_TYPE = "E_COUPON";
 /** 单次购买数量上限（O-09 默认：min(quantity, 999)） */
 export const E_COUPON_MAX_BUY_NUM = 999;
 
-/** 常规立即购买（秒杀/满减/券/限时/第N件等） */
+/** 常规立即购买（秒杀/满减/券等） */
 export const E_COUPON_CART_BUY_NOW = "BUY_NOW";
 export const E_COUPON_CART_PINTUAN = "PINTUAN";
 export const E_COUPON_CART_POINTS = "POINTS";
@@ -72,8 +72,6 @@ export function createEmptyPromotionMap() {
     SECKILL: null,
     FULL_DISCOUNT: null,
     COUPON: [],
-    DISCOUNT: null,
-    NTH: null,
     PINTUAN: null,
     KANJIA: null,
   };

buyer/src/pages/Cart.vue

@@ -75,7 +75,7 @@
                       >￥{{ item.price }}</span>
                     <span v-if="item.couponType === 'DISCOUNT'"
                       >{{ item.couponDiscount }}折</span>
-                    <span>满{{ item.consumeThreshold }}元可用</span>
+                    <span>{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '元可用' : '无门槛使用' }}</span>
                     <el-button
                       class="coupon-btn"
                       size="small"

buyer/src/pages/CouponCenter.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="coupon-center">
     <BaseHeader></BaseHeader>
+    <SearchHeader></SearchHeader>
     <div class="content">
       <h2 class="coupon-page-title">领券中心</h2>
 
@@ -48,6 +49,7 @@ import { onMounted, reactive, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { Modal } from "@/utils/message";
 import storage from "@/plugins/storage";
+import SearchHeader from "@/components/indexDecorate/components/SearchHeader.vue";
 import { couponList, receiveCoupon } from "@/api/member.js";
 
 const route = useRoute();

buyer/src/pages/Index.vue

@@ -11,7 +11,7 @@
                       <el-card shadow="never" v-for="(item, index) in autoCoupList" :key="index" style="margin: 10px 15px">
                             <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color" style="font-size: 15px;">￥<span class="price">{{ $filters.unitPrice(item.price) }}</span></span>
                             <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color" style="font-size: 15px;"><span class="price">{{item.discount}}</span>折</span>
-                            <span class="describe" style="font-size: 15px;margin-left: 5px;">满{{item.consumeThreshold}}元可用</span>
+                            <span class="describe" style="font-size: 15px;margin-left: 5px;">{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '元可用' : '无门槛使用' }}</span>
                             <p style="font-size: 14px;">使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
                             <p style="font-size: 14px;">有效期：{{item.endTime}}</p>
                       </el-card>

buyer/src/pages/home/memberCenter/MemberBenefitPanel.vue

@@ -0,0 +1,51 @@
+<template>
+  <section class="benefits-panel">
+    <h3>会员权益</h3>
+    <div class="grade-options">
+      <button v-for="item in enabledGrades" :key="item.grade.id" :class="{active: selectedId === item.grade.id}" @click="selectedId = item.grade.id">
+        {{ item.grade.gradeName }}<small v-if="item.grade.id === currentGradeId">当前等级</small>
+      </button>
+    </div>
+    <p class="benefit-subtitle">{{ selected?.grade?.gradeName || '暂无等级' }} · 点击查看权益说明</p>
+    <el-empty v-if="!selected?.benefits?.length" description="暂无权益" />
+    <div v-else class="benefits-grid">
+      <button v-for="benefit in selected.benefits" :key="benefit.id" class="benefit-card" :class="{locked: !owned(benefit)}" @click="detail = benefit">
+        <img v-if="benefit.benefitLogo" :src="benefit.benefitLogo" alt="" />
+        <strong>{{ benefit.benefitName }}</strong>
+        <span>{{ owned(benefit) ? '已享有' : '该等级专享' }}</span>
+      </button>
+    </div>
+    <el-dialog :model-value="!!detail" :title="detail?.benefitName || '权益说明'" width="520px" @close="detail = null">
+      <template v-if="detail">
+        <p>{{ owned(detail) ? '当前等级已享有该权益' : '此权益属于所选等级，当前尚未享有' }}</p>
+        <p v-if="detail.benefitType === 'POINT_MULTIPLIER'">购物积分倍率：{{ config(detail).multiplier || 1 }} 倍，同类权益取最高值。</p>
+        <p v-if="detail.benefitType === 'GIFT_POINT'">首次达到等级赠送 {{ config(detail).giftPoint || 0 }} 积分。</p>
+        <div class="benefit-description" v-html="detail.benefitDesc || '暂无说明'" />
+      </template>
+    </el-dialog>
+  </section>
+</template>
+<script setup>
+import { computed, ref, watch } from 'vue'
+const props = defineProps({gradeDetails:{type:Array,default:()=>[]},currentGradeId:{type:String,default:''}})
+const selectedId = ref(''), detail = ref(null)
+const enabledGrades = computed(()=>props.gradeDetails.filter(item=>item.grade?.gradeState === 'OPEN'))
+const selected = computed(()=>enabledGrades.value.find(item=>item.grade.id === selectedId.value))
+const current = computed(()=>enabledGrades.value.find(item=>item.grade.id === props.currentGradeId))
+const owned = benefit => (current.value?.benefits || []).some(item=>item.id === benefit.id)
+function config(benefit) { try { return JSON.parse(benefit.benefitConfig || '{}') } catch { return {} } }
+watch([()=>props.currentGradeId,enabledGrades],()=>{
+  if(!selectedId.value || !enabledGrades.value.some(item=>item.grade.id===selectedId.value)) selectedId.value=props.currentGradeId || enabledGrades.value[0]?.grade.id || ''
+},{immediate:true})
+</script>
+<style scoped>
+.benefits-panel { margin:20px 0; padding:24px; background:#fff; border:1px solid #eee; border-radius:8px; }
+h3 { margin:0 0 20px; font-size:18px; } .grade-options { display:flex; flex-wrap:wrap; gap:10px; }
+.grade-options button { padding:10px 18px; border:1px solid #ddd; background:#fff; border-radius:6px; cursor:pointer; }
+.grade-options button.active { background:#fff8eb; border-color:#c99a47; color:#866021; } small { margin-left:8px; }
+.benefit-subtitle { color:#777; margin:20px 0; }.benefits-grid { display:grid; grid-template-columns:repeat(auto-fill,minmax(140px,1fr)); gap:16px; }
+.benefit-card { padding:20px 10px; display:flex; align-items:center; flex-direction:column; gap:12px; border:1px solid #f0e3cb; background:#fffcf6; border-radius:8px; cursor:pointer; }
+.benefit-card img { width:48px; height:48px; object-fit:contain; }.benefit-card span { font-size:12px; color:#986d2a; }
+.benefit-card.locked { background:#fafafa; border-color:#eee; color:#888; }.locked img { filter:grayscale(1); opacity:.5; }
+.benefit-description { line-height:1.8; overflow-wrap:anywhere; }.benefit-description :deep(img) { max-width:100%; }
+</style>

buyer/src/pages/home/memberCenter/MemberGrade.vue

@@ -25,6 +25,8 @@
       </div>
     </div>
 
+    <MemberBenefitPanel :grade-details="gradeDetails" :current-grade-id="String(currentGradeId)" />
+
     <div class="grade-panel">
       <div class="grade-tabs">
         <div class="grade-tab" :class="{ active: activeGradeTab === 'rules' }" @click="activeGradeTab = 'rules'">获取经验值方式</div>
@@ -87,6 +89,7 @@
 
 <script setup>
 import { computed, onMounted, reactive, ref } from 'vue'
+import MemberBenefitPanel from './MemberBenefitPanel.vue'
 import { memberGradeCurrent, memberGradeList, memberGradeRules } from '@/api/member.js'
 
 defineOptions({ name: 'MemberGrade' })

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -176,6 +176,7 @@
       <el-skeleton size="large" fix v-if="spinShow"></el-skeleton>
     </div>
     <el-dialog v-model="cancelAvail" title="请选择取消订单原因">
+      <el-alert v-if="cancelIsPickup" title="此订单使用提货卡兑换，取消不退还提货权益，无法再次兑换。" type="warning" :closable="false" style="margin-bottom:16px" />
       <el-radio-group v-model="cancelParams.reason">
         <el-radio :label="item.reason" v-for="item in cancelReason" :key="item.id">
           {{ item.reason }}
@@ -227,6 +228,7 @@ const changeWay = ref(['全部', '待付款', '待发货', '待收货/使用']);
 const activeOrderTab = ref(0);
 const total = ref(0); // 数据总数
 const spinShow = ref(false); // 加载状态
+const cancelIsPickup = ref(false);
 const cancelAvail = ref(false); // 取消订单modal控制
 const cancelReason = ref([]); // 取消订单原因
 
@@ -365,6 +367,7 @@ function changePageSize (val) { // 修改页数
 }
 function handleCancelOrder (sn) {
   // 取消订单
+  cancelIsPickup.value = !!orderList.value.find(order => order.sn === sn)?.pickupCardId;
   cancelParams.orderSn = sn;
   afterSaleReason('CANCEL').then(res => {
     if (res.success) {

buyer/src/pages/home/orderCenter/OrderDetail.vue

@@ -341,6 +341,7 @@
       v-model="cancelAvail"
       title="请选择取消订单原因"
     >
+      <el-alert v-if="order.order?.pickupCardId" title="此订单使用提货卡兑换，取消不退还提货权益，无法再次兑换。" type="warning" :closable="false" style="margin-bottom:16px" />
       <el-radio-group
         v-model="cancelParams.reason"
       >

buyer/src/pages/home/userCenter/Coupons.vue

@@ -23,7 +23,7 @@
               v-if="item.couponType === 'DISCOUNT'"
               class="global_color coupon-amount"
               ><span class="price">{{ item.discount }}</span>折</span>
-            <span class="describe">满{{ item.consumeThreshold }}元可用</span>
+            <span class="describe">{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '元可用' : '无门槛使用' }}</span>
           </div>
           <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
           <p class="coupon-expire">有效期：{{ formatValidity(item) }}</p>

buyer/src/pages/home/userCenter/MyGiftCards.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="wrapper my-gift-cards">
     <UserCenterLayout>
-
+    <div class="gift-page-heading">
+      <div><h2>我的礼品卡</h2><p>查看卡片权益，兑换你的心意好礼</p></div>
+    </div>
     <div class="bind-section mb_20">
       <div class="section-title">兑换礼品卡</div>
-      <el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" inline class="bind-form">
+      <el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" class="bind-form">
         <el-form-item label="卡号" prop="cardNo" label-width="60px">
-          <el-input v-model="bindForm.cardNo" placeholder="请输入卡号" maxlength="64" style="width: 220px" />
+          <el-input v-model="bindForm.cardNo" placeholder="请输入卡号" maxlength="64" />
         </el-form-item>
         <el-form-item label="兑换码" prop="cardSecret" label-width="70px">
           <el-input
             v-model="bindForm.cardSecret"
             placeholder="请输入兑换码（卡密）"
             maxlength="128"
-            style="width: 220px"
           />
         </el-form-item>
         <el-form-item label-width="0px">
@@ -25,15 +26,20 @@
     <el-tabs v-model="statusTab" class="status-tabs mb_16" @tab-click="(tab) => onStatusTab(tab.paneName)">
       <el-tab-pane label="可用" name="AVAILABLE" />
       <el-tab-pane label="不可用" name="UNAVAILABLE" />
-      <el-tab-pane label="待激活" name="PENDING_ACTIVATION" />
+      <el-tab-pane name="PENDING_ACTIVATION">
+        <template #label>
+          <span class="pending-tab-label">待激活<span v-if="pendingCount !== null" class="pending-count">{{ pendingCount }}</span></span>
+        </template>
+      </el-tab-pane>
     </el-tabs>
 
     <div class="card-list-wrap">
-      <el-skeleton v-if="loading" fix />
+      <el-skeleton v-if="loading" :rows="5" animated />
       <template v-if="!loading">
-        <empty v-if="list.length === 0" />
+        <div v-if="loadFailed" class="gift-load-error"><p>卡片加载失败，请稍后重试</p><el-button @click="getList">重新加载</el-button></div>
+        <el-empty v-else-if="list.length === 0" :description="emptyDescription" :image-size="100" />
         <div v-else class="gift-card-grid">
-          <div v-for="item in list" :key="item.id || item.cardNo" class="gcc-card-item" :class="{ 'is-unavailable': statusTab === 'UNAVAILABLE' }">
+          <div v-for="item in list" :key="item.id || item.cardNo" class="gcc-card-item" :class="{ 'is-unavailable': statusTab === 'UNAVAILABLE', 'is-pickup': item.cardType === 'PICKUP' }">
             <div class="gcc-card-header">
               <div class="gcc-header-pattern" aria-hidden="true" />
               <div class="gcc-header-inner">
@@ -42,17 +48,19 @@
                     <div class="gcc-title">{{ item.giftCardName || "礼品卡" }}</div>
                     <span class="gcc-status-chip">{{ statusChipLabel }}</span>
                   </div>
-                  <div class="gcc-face"><span class="gcc-face-symbol">￥</span>{{ formatYuan(item.faceValue) }}</div>
+                  <div v-if="item.cardType === 'PICKUP'" class="gcc-face">兑换 <strong>{{ item.pickupCount }}</strong> 种商品</div>
-                  <div class="gcc-cardno">{{ item.cardNo }}</div>
+                  <div v-else class="gcc-face"><span class="gcc-face-symbol">￥</span>{{ formatYuan(item.faceValue) }}</div>
+                  <div class="gcc-cardno">卡号 {{ item.cardNo }}</div>
+                  <div class="gcc-expire">{{ formatValidity(item) }}</div>
                 </div>
                 <div class="gcc-header-right">
-                  <div class="gcc-type">现金卡</div>
+                  <div class="gcc-type">{{ item.cardType === 'PICKUP' ? '提货卡' : '现金卡' }}</div>
-                  <div class="gcc-expire">{{ formatValidity(item) }}</div>
                 </div>
               </div>
             </div>
             <div class="gcc-card-body">
-              <div class="gcc-row">
+              <div v-if="item.cardType === 'PICKUP'" class="gcc-row">每种一件 · 一次兑完 · 免邮</div>
+              <div v-else class="gcc-row">
                 当前余额：<span class="gcc-strong" v-if="item.balance != null">￥{{ $filters.unitPrice(item.balance) }}</span><span class="gcc-strong" v-else>—</span>
               </div>
               
@@ -112,6 +120,10 @@ const router = useRouter();
 const statusTab = ref("AVAILABLE");
 const loading = ref(false);
 const total = ref(0);
+const pendingCount = ref(null);
+const loadFailed = ref(false);
+let listRequestId = 0;
+let pendingCountRequestId = 0;
 const list = ref([]);
 const params = reactive({
   pageNumber: 1,
@@ -130,7 +142,6 @@ const bindRules = {
   cardSecret: [{ required: true, message: "请输入兑换码", trigger: "blur" }],
 };
 const noticeModal = ref(false);
-const serviceHotline = ref("12221111");
 const activatingId = ref("");
 const bindFormRef = ref(null);
 
@@ -153,11 +164,30 @@ const statusChipLabel = computed(() => {
   const map = { AVAILABLE: "可用", UNAVAILABLE: "不可用", PENDING_ACTIVATION: "待激活" };
   return map[statusTab.value] || "";
 });
+const emptyDescription = computed(() => ({
+  AVAILABLE: "暂无可用礼品卡，可输入卡号和兑换码添加",
+  UNAVAILABLE: "暂无不可用礼品卡",
+  PENDING_ACTIVATION: "暂无待激活礼品卡",
+}[statusTab.value]));
 
 onMounted(() => {
   getList();
+  refreshPendingCount();
 });
 
+/** 复用会员分页接口的 total 获取全部待激活数量，独立于当前标签和每页条数。 */
+async function refreshPendingCount() {
+  const requestId = ++pendingCountRequestId;
+  try {
+    const res = await getGiftCardCashMemberCardPage({ memberCardStatus: "PENDING_ACTIVATION", pageNumber: 1, pageSize: 1 });
+    if (requestId === pendingCountRequestId && res.success && res.result) {
+      pendingCount.value = Number(res.result.total) || 0;
+    }
+  } catch {
+    // 统计失败时保留已知数量，不将未知数量显示成零。
+  }
+}
+
 function formatYuan(val) {
   if (val == null || val === "") {
     return "—";
@@ -195,21 +225,32 @@ function onStatusTab(name) {
 }
 
 function getList() {
+  const requestId = ++listRequestId;
   loading.value = true;
+  loadFailed.value = false;
   const p = { ...params };
   if (p.memberCardStatus) {
     p.memberCardStatus = String(p.memberCardStatus);
   }
   getGiftCardCashMemberCardPage(p)
     .then((res) => {
+      if (requestId !== listRequestId) return;
       loading.value = false;
       if (res.success && res.result) {
         list.value = res.result.records || [];
         total.value = res.result.total || 0;
+        if (p.memberCardStatus === "PENDING_ACTIVATION") {
+          ++pendingCountRequestId;
+          pendingCount.value = Number(total.value);
+        }
+      } else {
+        loadFailed.value = true;
       }
     })
     .catch(() => {
+      if (requestId !== listRequestId) return;
       loading.value = false;
+      loadFailed.value = true;
     });
 }
 
@@ -250,6 +291,7 @@ function submitBind() {
           resetBindForm();
           params.pageNumber = 1;
           getList();
+          refreshPendingCount();
         }
       })
       .catch(() => {
@@ -274,6 +316,7 @@ function onCardPrimaryAction(item) {
         if (res.success) {
           Message.success(res.message || "激活成功");
           getList();
+          refreshPendingCount();
         }
       })
       .catch((err) => {
@@ -285,7 +328,7 @@ function onCardPrimaryAction(item) {
     return;
   }
   if (statusTab.value === "AVAILABLE") {
-    router.push({ path: "/goodsList" });
+    router.push(item.cardType === "PICKUP" ? { name: "PickupCard", query: { id: resolveMemberCardId(item) } } : { path: "/goodsList" });
   }
 }
 
@@ -308,195 +351,125 @@ function isActivating(item) {
 
 <style scoped lang="scss">
 .my-gift-cards {
+  .gift-page-heading {
+    padding: 10px 4px 22px;
+    h2 { margin: 0 0 8px; font-size: 22px; font-weight: 600; color: #252833; }
+    p { margin: 0; font-size: 13px; color: #909399; }
+  }
   .bind-section {
-    padding: 16px 18px;
+    padding: 20px 24px 24px;
-    border-radius: 8px;
+    border-radius: 10px;
-    border: 1px solid #eee;
+    border: 1px solid #f3e7e8;
-    @include white_background_color();
+    background: #fff9f9;
-  }
-  .section-title {
-    font-size: 15px;
-    font-weight: 500;
-    margin-bottom: 14px;
-    @include title_color($light_title_color);
   }
+  .section-title { margin-bottom: 18px; font-size: 15px; font-weight: 600; color: #303133; }
   .bind-form {
-    display: flex;
+    display: grid;
-    flex-wrap: wrap;
+    grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) auto;
-    align-items: flex-end;
+    align-items: start;
-    gap: 4px 8px;
+    gap: 16px;
+    :deep(.el-form-item) { margin: 0; min-width: 0; }
+    :deep(.el-form-item__content) { min-width: 0; }
+    :deep(.el-input__wrapper) { min-height: 36px; box-sizing: border-box; background: #fff; }
+    :deep(.el-button) { height: 36px; min-width: 88px; border-radius: 6px; }
   }
   .status-tabs {
-    :deep(.el-tabs__header) {
+    margin-top: 28px;
-      margin-bottom: 0;
+    :deep(.el-tabs__header) { margin-bottom: 0; }
-    }
+    :deep(.el-tabs__item) { height: 48px; font-size: 15px; }
+    :deep(.el-tabs__nav-wrap::after) { height: 1px; background: #eceef2; }
   }
-  .card-list-wrap {
+  .pending-tab-label { display: inline-flex; align-items: center; gap: 8px; }
-    position: relative;
+  .pending-count {
-    min-height: 200px;
+    display: inline-flex;
-    margin-top: 24px;
+    align-items: center;
+    justify-content: center;
+    min-width: 22px;
+    padding: 0 6px;
+    height: 20px;
+    box-sizing: border-box;
+    border-radius: 10px;
+    color: $theme_color;
+    background: #fff0f1;
+    font-size: 12px;
+    font-weight: 500;
+    font-variant-numeric: tabular-nums;
   }
+  .card-list-wrap { position: relative; min-height: 290px; margin-top: 24px; }
+  .gift-load-error { padding: 64px 0; text-align: center; color: #909399; }
   .gift-card-grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
-    gap: 16px;
+    gap: 24px;
     align-items: start;
   }
   .gcc-card-item {
-    border-radius: 12px;
     overflow: hidden;
-    box-shadow: 0 4px 14px rgba(0, 0, 0, 0.08);
+    border: 1px solid #f0e3e4;
-    @include white_background_color();
+    border-radius: 12px;
-  }
+    background: #fff;
-  .gcc-card-header {
+    transition: box-shadow .2s, border-color .2s;
-    position: relative;
+    &:hover { border-color: #edc9cd; box-shadow: 0 6px 20px rgba(100, 33, 40, .06); }
-    min-height: 128px;
-    padding: 0;
-    background: linear-gradient(125deg, #ff9a4a 0%, #ff7729 42%, #ff8f3d 100%);
   }
+  .gcc-card-header { position: relative; overflow: hidden; background: linear-gradient(120deg, #fff3f3, #fff9f7); }
   .gcc-header-pattern {
     position: absolute;
-    inset: 0;
+    width: 180px;
-    opacity: 0.22;
+    height: 180px;
+    right: -70px;
+    bottom: -110px;
+    border: 24px solid rgba(211, 134, 141, .07);
+    border-radius: 50%;
     pointer-events: none;
-    background-image: repeating-linear-gradient(
-      -36deg,
-      transparent,
-      transparent 5px,
-      rgba(255, 255, 255, 0.45) 5px,
-      rgba(255, 255, 255, 0.45) 6px
-    );
-  }
-  .gcc-header-inner {
-    position: relative;
-    z-index: 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    padding: 16px 14px 14px;
-    color: #fff;
-  }
-  .gcc-header-left {
-    flex: 1;
-    min-width: 0;
-    padding-right: 8px;
-  }
-  .gcc-title {
-    font-size: 14px;
-    font-weight: 600;
-    line-height: 1.3;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.12);
-  }
-  .gcc-name-row {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex-wrap: wrap;
-  }
-  .gcc-status-chip {
-    padding: 0 8px;
-    border-radius: 999px;
-    background: rgba(255, 255, 255, 0.2);
-    font-size: 11px;
-    line-height: 18px;
-  }
-  .gcc-face {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 700;
-    line-height: 1.2;
-  }
-  .gcc-face-symbol {
-    margin-right: 2px;
-    font-size: 15px;
-    font-weight: 500;
-  }
-  .gcc-cardno {
-    margin-top: 14px;
-    font-size: 12px;
-    letter-spacing: 0.02em;
-    opacity: 0.75;
-    word-break: break-all;
-  }
-  .gcc-header-right {
-    text-align: right;
-    flex-shrink: 0;
-  }
-  .gcc-type {
-    font-size: 18px;
-    font-weight: 700;
-    line-height: 1.2;
-  }
-  .gcc-expire {
-    margin-top: 10px;
-    font-size: 14px;
-    opacity: 0.9;
-    white-space: nowrap;
-  }
-  .gcc-card-body {
-    padding: 14px 14px 16px;
-  }
-  .gcc-row {
-    font-size: 13px;
-    line-height: 1.85;
-    @include title_color($light_title_color);
-  }
-  .gcc-muted {
-    color: #999;
-  }
-  .gcc-strong {
-    color: #ff6b22;
-    font-weight: 600;
-  }
-  .gcc-link {
-    color: $theme_color;
-    cursor: pointer;
-  }
-  .gcc-service {
-    color: #515a6e;
   }
+  .gcc-header-inner { position: relative; display: flex; gap: 12px; padding: 22px 20px 18px; }
+  .gcc-header-left { flex: 1; min-width: 0; }
+  .gcc-name-row { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }
+  .gcc-title { max-width: 100%; overflow-wrap: anywhere; font-size: 15px; font-weight: 600; line-height: 1.5; color: #523338; }
+  .gcc-status-chip { padding: 1px 7px; border-radius: 4px; background: rgba(255,255,255,.8); color: #a9757b; font-size: 11px; line-height: 18px; }
+  .gcc-face { margin-top: 18px; color: #a63e4a; font-size: 30px; font-weight: 600; line-height: 1.3; }
+  .gcc-face strong { font-size: 32px; font-weight: 600; }
+  .gcc-face-symbol { margin-right: 3px; font-size: 18px; }
+  .gcc-cardno { margin-top: 18px; color: #96777b; font-size: 12px; overflow-wrap: anywhere; letter-spacing: .03em; }
+  .gcc-header-right { flex-shrink: 0; text-align: right; }
+  .gcc-type { padding: 3px 7px; border: 1px solid #e9cdd0; border-radius: 4px; font-size: 12px; color: #a46f75; white-space: nowrap; }
+  .gcc-expire { margin-top: 8px; color: #a08a8d; font-size: 12px; }
+  .gcc-card-body { padding: 16px 20px 20px; }
+  .gcc-row { min-height: 22px; color: #777e89; font-size: 13px; line-height: 22px; }
+  .gcc-strong { color: #a63e4a; font-weight: 600; }
   .gcc-action {
     display: block;
     width: 100%;
-    margin-top: 14px;
+    margin-top: 16px;
-    padding: 9px 16px;
+    padding: 10px 16px;
     border: none;
-    border-radius: 999px;
+    border-radius: 6px;
+    background: $theme_color;
+    color: #fff;
     font-size: 14px;
     font-weight: 500;
     cursor: pointer;
-    color: #fff;
+    transition: opacity .2s;
-    background: $theme_color;
+    &:hover:not(.is-disabled) { opacity: .85; }
-    transition: opacity 0.2s, background 0.2s;
+    &:focus-visible { outline: 2px solid $theme_color; outline-offset: 3px; }
-  }
+    &.is-disabled { color: #aaa; background: #f3f4f6; cursor: not-allowed; }
-  .gcc-action:hover:not(.is-disabled) {
-    opacity: 0.9;
-  }
-  .gcc-action.is-disabled {
-    color: #c5c8ce;
-    cursor: not-allowed;
-    background: #f7f7f7;
   }
+  .is-pickup .gcc-face { font-size: 22px; }
   .gcc-card-item.is-unavailable {
-    .gcc-card-header {
+    border-color: #e8eaed;
-      background: linear-gradient(125deg, #c9c9c9 0%, #a8a8a8 100%);
+    .gcc-card-header { background: #f5f6f8; }
-    }
+    .gcc-title, .gcc-face, .gcc-strong { color: #92969e; }
-    .gcc-strong {
+    .gcc-cardno, .gcc-expire, .gcc-status-chip, .gcc-type { color: #a1a5ad; }
-      color: #999;
+    .gcc-type { border-color: #dddfe4; }
-    }
   }
-  .page-size {
+  .page-size { display: flex; justify-content: flex-end; margin-top: 28px; padding-top: 20px; border-top: 1px solid #f0f1f4; }
-    display: flex;
+  @media (max-width: 900px) {
-    justify-content: flex-end;
+    .bind-form { grid-template-columns: minmax(0, 1fr); gap: 22px; }
-    margin-top: 20px;
+    .bind-form :deep(.el-form-item__label) { width: 70px !important; }
+    .bind-form :deep(.el-form-item:last-child .el-form-item__content) { padding-left: 70px; }
+    .gift-card-grid { grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); }
   }
 }
-.gcc-notice-text {
+.gcc-notice-text { line-height: 1.7; color: #515a6e; margin-bottom: 16px; }
-  line-height: 1.7;
+.gcc-notice-footer { text-align: right; }
-  color: #515a6e;
+</style>
-  margin-bottom: 16px;
-}
-.gcc-notice-footer {
-  text-align: right;
-}
-</style>

buyer/src/pages/home/userCenter/PickupCard.vue

@@ -0,0 +1,194 @@
+<!--
+  提货卡选品与收货地址确认，兑换成功后进入普通订单履约。
+  @author Bulbasaur
+  @since 2026-11-05
+-->
+<template>
+  <UserCenterLayout>
+    <div v-loading="loading" class="pickup-page">
+      <header class="pickup-heading">
+        <div><div class="pickup-eyebrow">提货卡兑换</div><h2>{{ detail.giftCardName || '选择你的好礼' }}</h2></div>
+        <span v-if="detail.credentialId" class="pickup-validity">提货权益</span>
+      </header>
+      <el-result v-if="error" icon="warning" :title="error"><template #extra><el-button @click="load">重新加载</el-button></template></el-result>
+      <template v-else-if="detail.credentialId">
+        <el-result v-if="completed || detail.tradeSn" icon="success" title="该提货卡已兑换"><template #extra><el-button type="primary" @click="router.push({name:'MyOrder'})">查看订单</el-button></template></el-result>
+        <template v-else>
+          <div class="pickup-rules"><strong>{{ ruleText }}</strong><span>每种一件</span><span>一次兑完</span><span>免邮</span></div>
+          <section class="pickup-products">
+            <div class="pickup-section-title"><h3>选择兑换商品</h3><span>共 {{ detail.goods?.length || 0 }} 种商品 · 已选 <b>{{ selected.length }}</b> / {{ detail.pickupCount }} 种</span></div>
+            <el-checkbox-group v-model="selected" :max="detail.pickupCount" :disabled="busy || detail.pickupMode === 'ALL'" aria-label="可兑换商品">
+              <div class="pickup-grid">
+                <el-checkbox v-for="goods in detail.goods" :key="goods.id" :value="goods.id" :disabled="!goods.available" class="pickup-item" :class="{'is-selected': selected.includes(goods.id), 'is-unavailable': !goods.available}">
+                  <div class="pickup-image"><el-image :src="goods.thumbnail" fit="contain" :alt="goods.goodsName"><template #error><span class="pickup-image-fallback">暂无图片</span></template></el-image></div>
+                  <div class="pickup-goods-info">
+                    <strong class="pickup-goods-name" :title="goods.goodsName">{{ goods.goodsName }}</strong>
+                    <div class="pickup-specs" :title="specsText(goods.specs)">{{ specsText(goods.specs) }}</div>
+                    <div class="pickup-store">{{ goods.storeName }}</div>
+                    <div v-if="!goods.available" class="pickup-goods-unavailable">暂不可兑换</div>
+                  </div>
+                </el-checkbox>
+              </div>
+            </el-checkbox-group>
+          </section>
+          <section class="pickup-address">
+            <div class="pickup-section-title"><h3>收货地址</h3><div><el-button link :disabled="busy" @click="router.push({name:'MyAddress'})">管理地址</el-button><el-button link :disabled="busy" @click="loadAddresses">刷新</el-button></div></div>
+            <el-select v-model="addressId" placeholder="请选择收货地址" :disabled="busy" aria-label="收货地址" class="pickup-address-select">
+              <el-option v-for="address in addresses" :key="address.id" :value="address.id" :label="addressText(address)" />
+            </el-select>
+            <p v-if="!addresses.length" class="pickup-address-empty">还没有收货地址，请先添加地址后刷新。</p>
+          </section>
+          <footer class="pickup-checkout">
+            <div class="pickup-selection"><strong>已选 <b>{{ selected.length }}</b> / {{ detail.pickupCount }} 种商品</strong><span>{{ selectionHint }}</span></div>
+            <div class="pickup-submit"><div class="pickup-payable">实付 <strong>￥0<span>.00</span></strong><small>免运费</small></div><el-button type="primary" :loading="busy" :disabled="!canSubmit" @click="submit">确认兑换</el-button></div>
+          </footer>
+          <p class="pickup-terms">兑换成功后取消不退权益，不支持退款或退货。</p>
+        </template>
+      </template>
+    </div>
+  </UserCenterLayout>
+</template>
+
+<script setup>
+import { computed, onMounted, onBeforeUnmount, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { memberAddress } from '@/api/address';
+import storage from '@/plugins/storage';
+import { getPickupCard, previewPickupCard, redeemPickupCard } from '@/api/pickupCard';
+
+const route = useRoute(), router = useRouter();
+const detail = ref({}), selected = ref([]), addresses = ref([]), addressId = ref('');
+const loading = ref(false), busy = ref(false), error = ref(''), completed = ref(false);
+let active = true, requestVersion = 0;
+const owner = storage.getItem('userInfo') || '';
+/** 账号切换后丢弃旧请求结果，避免展示上一个账号的卡和地址。 */
+function sameOwner() { return active && owner === (storage.getItem('userInfo') || ''); }
+const canSubmit = computed(() => selected.value.length === detail.value.pickupCount && !!addressId.value && !loading.value && !detail.value.goods?.some(g => selected.value.includes(g.id) && !g.available));
+const ruleText = computed(() => detail.value.pickupMode === 'ALL' ? '兑换以下全部商品' : `从以下商品任选 ${detail.value.pickupCount || 1} 种`);
+const selectionHint = computed(() => {
+  const remaining = (detail.value.pickupCount || 0) - selected.value.length;
+  if (remaining > 0) return `还需选择 ${remaining} 种商品`;
+  return addressId.value ? '商品已选齐，请核对收货地址' : '请选择收货地址';
+});
+/** 兼容键值及旧数组规格，过滤图片元数据，避免展示原始 JSON。 */
+function specsText(value) {
+  try {
+    const specs = typeof value === 'string' ? JSON.parse(value || '{}') : value;
+    const values = Array.isArray(specs) ? specs.filter(s => s && s.specName !== 'images').map(s => s.specValue) : Object.entries(specs || {}).filter(([key]) => key !== 'images').map(([, val]) => val);
+    return values.filter(v => typeof v === 'string' || typeof v === 'number').join(' / ') || '默认规格';
+  } catch { return typeof value === 'string' && !/^[\s]*[\[{]/.test(value) ? value : '默认规格'; }
+}
+/** 地址仅用于展示，提交后仍由服务端校验当前会员归属。 */
+function addressText(address) { return `${address.name} ${address.mobile} ${address.consigneeAddressPath || ''} ${address.detail || ''}`; }
+/** 刷新地址，保留仍存在的选择。 */
+async function loadAddresses() {
+  const response = await memberAddress();
+  if (!sameOwner()) return;
+  if (!response.success) throw new Error(response.message || '地址加载失败');
+  addresses.value = response.result?.records || response.result || [];
+  if (!addresses.value.some(a => a.id === addressId.value)) addressId.value = (addresses.value.find(a => a.isDefault) || addresses.value[0])?.id || '';
+}
+/** 加载卡详情；离页或新请求发起后丢弃旧响应。 */
+async function load() {
+  const version = ++requestVersion;
+  loading.value = true; error.value = '';
+  try {
+    const response = await getPickupCard(route.query.id);
+    if (!sameOwner() || version !== requestVersion) return;
+    if (!response.success) throw new Error(response.message || '提货卡加载失败');
+    detail.value = response.result;
+    selected.value = detail.value.pickupMode === 'ALL' ? detail.value.goods.map(g => g.id) : [];
+    await loadAddresses();
+  } catch (e) { if (sameOwner() && version === requestVersion) error.value = e.message || '加载失败，请重试'; }
+  finally { if (sameOwner() && version === requestVersion) loading.value = false; }
+}
+/** 先服务端试算再确认核销，网络异常保留选项，允许幂等重试。 */
+async function submit() {
+  if (busy.value || !canSubmit.value || !sameOwner()) return;
+  busy.value = true;
+  const payload = { credentialId: detail.value.credentialId, skuIds: [...selected.value], addressId: addressId.value };
+  try {
+    const preview = await previewPickupCard(payload);
+    if (!sameOwner()) return;
+    if (!preview.success) throw new Error(preview.message || '兑换校验失败');
+    await ElMessageBox.confirm(`本次兑换 ${selected.value.length} 种商品，每种一件，免邮且实付为零。兑换后取消不退权益，不支持退款或退货。`, '确认兑换', { confirmButtonText: '确认兑换', cancelButtonText: '返回检查' });
+    if (!sameOwner()) return;
+    const response = await redeemPickupCard(payload);
+    if (!sameOwner()) return;
+    if (!response.success) throw new Error(response.message || '兑换失败');
+    completed.value = true;
+  } catch (e) {
+    if (sameOwner() && e !== 'cancel' && e !== 'close') {
+      // 网络超时可能发生在成功提交后，查询原卡确认结果，不重复创建订单。
+      try { const status = await getPickupCard(payload.credentialId); if (sameOwner() && status.success && status.result?.tradeSn) { detail.value = status.result; completed.value = true; return; } } catch { /* 保留原错误供重试 */ }
+      ElMessage.error(e.message || '兑换结果待确认，请重试或查看订单');
+    }
+  }
+  finally { if (sameOwner()) busy.value = false; }
+}
+onMounted(load);
+onBeforeUnmount(() => { active = false; requestVersion++; });
+</script>
+
+<style scoped lang="scss">
+.pickup-page { padding: 10px 4px 0; color: #303133; }
+.pickup-heading { display: flex; justify-content: space-between; align-items: center; gap: 20px; margin-bottom: 20px; }
+.pickup-eyebrow { margin-bottom: 8px; color: #909399; font-size: 12px; }
+.pickup-heading h2 { margin: 0; color: #252833; font-size: 22px; font-weight: 600; overflow-wrap: anywhere; }
+.pickup-validity { padding: 5px 10px; border: 1px solid #eee; border-radius: 4px; font-size: 12px; color: #777e89; white-space: nowrap; }
+.pickup-rules { display: flex; flex-wrap: wrap; align-items: center; gap: 10px 20px; padding: 16px 18px; border-radius: 6px; background: #f7f8fa; font-size: 13px; color: #858b95; }
+.pickup-rules strong { color: #434953; font-weight: 500; }
+.pickup-products { margin-top: 28px; }
+.pickup-section-title { display: flex; justify-content: space-between; align-items: center; gap: 16px; margin-bottom: 16px; }
+.pickup-section-title h3 { margin: 0; font-size: 16px; font-weight: 600; }
+.pickup-section-title > span { color: #909399; font-size: 13px; }
+.pickup-section-title b { color: $theme_color; font-weight: 500; }
+.pickup-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 16px; max-height: 570px; overflow-y: auto; padding: 2px 4px 2px 2px; }
+.pickup-item {
+  position: relative;
+  display: block;
+  width: 100%;
+  height: auto;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  border: 1px solid #e9ebef;
+  border-radius: 8px;
+  overflow: hidden;
+  background: #fff;
+  transition: border-color .2s, box-shadow .2s;
+  &:hover:not(.is-unavailable) { border-color: #e7acb1; }
+  &.is-selected { border-color: $theme_color; box-shadow: 0 0 0 1px $theme_color; }
+  &.is-unavailable { background: #f8f9fa; }
+  :deep(.el-checkbox__input) { position: absolute; z-index: 1; top: 12px; right: 12px; }
+  :deep(.el-checkbox__label) { display: block; padding: 0; width: 100%; white-space: normal; color: inherit; }
+}
+.pickup-image { display: flex; justify-content: center; align-items: center; height: 140px; margin: 14px 20px 0; background: #fff; }
+.pickup-image :deep(.el-image) { width: 100%; height: 100%; }
+.pickup-image-fallback { display: flex; height: 100%; align-items: center; justify-content: center; color: #a8abb2; background: #f7f8fa; font-size: 12px; }
+.pickup-goods-info { padding: 14px; }
+.pickup-goods-name { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; min-height: 40px; line-height: 20px; font-size: 14px; font-weight: 500; color: #303133; }
+.pickup-specs { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-top: 8px; color: #6b7280; font-size: 12px; line-height: 18px; }
+.pickup-store { margin-top: 4px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #a0a5ae; font-size: 12px; line-height: 18px; }
+.pickup-goods-unavailable { margin-top: 8px; color: #909399; font-size: 12px; }
+.is-unavailable .pickup-image { opacity: .5; }
+.pickup-address { margin-top: 28px; padding-top: 24px; border-top: 1px solid #eee; }
+.pickup-address-select { width: 100%; }
+.pickup-address-select :deep(.el-select__wrapper) { min-height: 42px; }
+.pickup-address-empty { color: #909399; font-size: 13px; }
+.pickup-checkout { position: sticky; bottom: 0; z-index: 2; display: flex; justify-content: space-between; align-items: center; gap: 20px; margin-top: 24px; padding: 20px 0; border-top: 1px solid #eee; background: #fff; }
+.pickup-selection { display: flex; flex-direction: column; gap: 8px; font-size: 14px; }
+.pickup-selection strong { font-weight: 500; }
+.pickup-selection b { color: $theme_color; font-weight: 600; }
+.pickup-selection > span { color: #909399; font-size: 12px; }
+.pickup-submit { display: flex; align-items: center; gap: 24px; }
+.pickup-payable { font-size: 13px; color: #606266; }
+.pickup-payable strong { margin-left: 6px; color: $theme_color; font-size: 26px; font-weight: 600; }
+.pickup-payable strong span { font-size: 16px; }
+.pickup-payable small { display: block; margin-top: 4px; text-align: right; font-size: 12px; color: #909399; }
+.pickup-submit :deep(.el-button) { min-width: 136px; height: 42px; border-radius: 6px; font-size: 15px; }
+.pickup-terms { margin: 0; padding-bottom: 6px; color: #a0a5ae; font-size: 12px; line-height: 1.6; }
+@media (max-width: 900px) { .pickup-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
+@media (max-width: 600px) { .pickup-grid { grid-template-columns: minmax(0, 1fr); } .pickup-checkout { flex-wrap: wrap; } .pickup-submit { width: 100%; justify-content: space-between; } .pickup-section-title { flex-wrap: wrap; } }
+</style>

buyer/src/pages/payment/Pay.vue

@@ -202,7 +202,7 @@
               <template v-else>{{ item.discount }}折</template>
             </div>
             <div class="pay-coupon-info">
-              <p>满{{ item.consumeThreshold }}元可用</p>
+              <p>{{ item.consumeThreshold > 0 ? '满' + item.consumeThreshold + '元可用' : '无门槛使用' }}</p>
               <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
               <p>有效期：{{ item.endTime }}</p>
             </div>

buyer/src/pages/promotion/seckill.vue

@@ -81,7 +81,7 @@ watch(currIndex, (val) => {
   interval = null;
   nowHour.value = new Date().getHours();
   countDown(val);
-  goodsList.value = list.value[val].seckillGoodsList;
+  goodsList.value = list.value[val]?.seckillGoodsList || [];
 });
 
 watch(diffSeconds, (val) => {
@@ -108,11 +108,11 @@ watch(diffSeconds, (val) => {
 });
 
 function getListByDay () {
-  // 当天秒杀活动
+  // 当天秒杀活动；result 可能为空数组（当天无活动），需判空避免取下标 0 报错
   seckillByDay().then((res) => {
-    if (res.success) {
+    if (res.success && res.result && res.result.length) {
       list.value = res.result;
-      goodsList.value = list.value[0].seckillGoodsList;
+      goodsList.value = list.value[0].seckillGoodsList || [];
       countDown(currIndex.value);
     }
   });

buyer/src/router/index.js

@@ -200,6 +200,12 @@ export const router = createRouter({
           component: MoneyManagement,
           meta: { title: "我的余额" },
         },
+        {
+          path: "PickupCard",
+          name: "PickupCard",
+          component: () => import("@/pages/home/userCenter/PickupCard.vue"),
+          meta: { title: "提货卡兑换" },
+        },
         {
           path: "MyGiftCards",
           name: "MyGiftCards",

manager/src/api/member.js

@@ -239,3 +239,6 @@ export const deleteMemberBenefit = (id) => {
 export const getMemberBenefitTypes = () => {
   return getRequest("/member/benefit/types");
 };
+
+export const getMemberBenefitDeliveries = params => getRequest('/member/benefit/deliveries', params);
+export const retryMemberBenefitDelivery = id => postRequest('/member/benefit/deliveries/' + id + '/retry');

manager/src/api/paid-member.js

@@ -0,0 +1,6 @@
+import { getRequest, putRequestWithNoForm } from '@/libs/axios';
+export const getPaidConfig = () => getRequest('/member/paid/config');
+export const savePaidConfig = data => putRequestWithNoForm('/member/paid/config', data);
+export const getPaidOrders = params => getRequest('/member/paid/orders', params);
+export const getPaidResources = (type, ids) => getRequest('/member/paid/resources', { type, ids: ids.join(',') });
+export const getPaidDiscountSkus = params => getRequest('/member/paid/discount-skus', params);

manager/src/api/promotion.js

@@ -319,6 +319,11 @@ export const giftCardCashBatchCreate = (activityId, params) => {
   );
 };
 
+/** 导出指定制卡批次的全部卡号、卡密，不受页面筛选和分页限制。 */
+export const exportGiftCardCashCreateBatch = (createBatchId) => {
+  return getRequest(`/promotion/giftCardCash/createBatch/${encodeURIComponent(createBatchId)}/export`, {}, "blob");
+};
+
 // 下载批量发卡 Excel 模板
 export const downloadGiftCardCashIssueTemplate = () => {
   return getRequest("/promotion/giftCardCash/issue/template", {}, "blob");
@@ -350,4 +355,4 @@ export const getGiftCardCashUsageRecordPage = (params) => {
 // 卡密凭证分页（平台库存+会员资产）
 export const getGiftCardCashCredentialPage = (params) => {
   return getRequest("/promotion/giftCardCash/credential", params);
-};
+};

manager/src/api/setting.js

@@ -5,14 +5,10 @@ import {
   postRequest
 } from '@/libs/axios';
 
-// 查询短信站内信信息
+// 查询站内信信息
 export const getMessageData = params => {
   return getRequest("/other/message", params);
 };
-//修改短信模板
-export const editSmsMessageTemplate = (id, params) => {
-  return putRequest(`/sms/sms/${id}`, params)
-}
 //修改站内信模板
 export const editNoticeMessage = (id, params) => {
   return putRequest(`/setting/noticeMessage/${id}`, params)
@@ -45,14 +41,6 @@ export const openNoticeMessage = (id) => {
 export const updateMessageStatus = (id,status) => {
   return putRequest(`/setting/noticeMessage/${id}/${status}`);
 };
-//获取短信模板
-export const getSmsTemplatePage = (params) => {
-  return getRequest("/sms/sms/template", params);
-};
-//获取短信签名
-export const getSmsSignPage = (params) => {
-  return getRequest("/sms/sms/sign", params);
-};
 //获取设置
 export const getSetting = (key) => {
   return getRequest(`/setting/setting/get/${key}`);
@@ -66,42 +54,6 @@ export const setSetting = (key, params) => {
   return postRequest(`/setting/setting/put/${key}`, params);
 };
 
-//查看短信签名
-export const getSmsSign = () => {
-  return getRequest(`/sms/sms/sign`);
-};
-//添加短信签名
-export const addSmsSign = (params) => {
-  return postRequest(`/sms/sms/sign`, params);
-};
-//修改短信签名
-export const editSmsSign = (params) => {
-  return putRequest(`/sms/sms/sign`, params);
-};
-//删除短信签名
-export const delSmsSign = (id) => {
-  return deleteRequest(`/sms/sms/sign/${id}`);
-};
-//添加短信模板
-export const addSmsTemplate = (params) => {
-  return postRequest(`/sms/sms/template`, params);
-};
-//修改短信模板
-export const editSmsTemplate = (params) => {
-  return putRequest(`/sms/sms/template`, params);
-};
-//删除短信模板
-export const delSmsTemplate = (id) => {
-  return deleteRequest(`/sms/sms/template/${id}`);
-};
-//查询短信发送记录
-export const getSmsReachPage = (params) => {
-  return getRequest(`/sms/sms`, params);
-};
-//重新发送
-export const repeatSendSms = (id) => {
-  return postRequest(`/sms/sms/repeat/${id}`);
-};
 //获取设置
 export const getExperienceData = (key) => {
   return getRequest(`/setting/experience/get/${key}`);
@@ -218,41 +170,11 @@ export const updateWechatMpMessageTemplate = params => {
 
 
 // -------------------------------------------------------------
-// 补充缺失的系统配置、短信、版本及验证码 API
+// 补充缺失的系统配置、版本及验证码 API
 // -------------------------------------------------------------
 
-// 短信任务发送与记录 (sms.vue)
-export const getSmsPage = (params) => {
-  return getRequest(`/sms/sms`, params);
-};
-export const sendSms = (params) => {
-  return postRequest(`/sms/sms`, params);
-};
 
-// 短信签名同步与详细 (sms.vue, smsSign.vue)
-export const syncSign = () => {
-  return putRequest(`/sms/sign/querySmsSign`);
-};
-export const deleteSign = (id) => {
-  return deleteRequest(`/sms/sign/${id}`);
-};
-export const smsSignDetail = (id) => {
-  return getRequest(`/sms/sign/${id}`);
-};
 
-// 短信模板管理与同步 (sms.vue)
-export const syncTemplate = () => {
-  return putRequest(`/sms/template/querySmsSign`);
-};
-export const addSmsTemplatePage = (params) => {
-  return postRequest(`/sms/template`, params);
-};
-export const editSmsTemplatePage = (params) => {
-  return putRequest(`/sms/template/modifySmsTemplate`, params);
-};
-export const deleteSmsTemplatePage = (params) => {
-  return deleteRequest(`/sms/template`, params);
-};
 
 // 支付支持方式表单 (PAYMENT_SUPPORT.vue)
 export const getPaymentSupportForm = () => {

manager/src/components/editor/index.vue

@@ -3,7 +3,7 @@
     <!-- 使用 fullscreen 类来控制是否全屏显示 -->
     <div :class="{ fullscreen: fullscreen }" class="tinymce-container">
       <!-- 使用 tinymce-textarea 类作为编辑器的文本区域 -->
-      <uploadImage @callback="insertImage" />
+      <uploadImage :use-image-picker="imagePicker" @callback="insertImage" />
       <textarea :id="tinymceId" class="tinymce-textarea" />
     </div>
   </div>
@@ -21,10 +21,15 @@ import {
 } from "vue";
 import { initEditor } from "@/components/editor/config";
 import uploadImage from "@/components/editor/upload-image.vue";
+import { useFormItem } from "element-plus";
 
 defineOptions({ name: "Tinymce" });
 
 const props = defineProps({
+  imagePicker: {
+    type: Boolean,
+    default: false,
+  },
   modelValue: {
     type: String,
     default: "",
@@ -39,6 +44,7 @@ const props = defineProps({
   },
 });
 const emit = defineEmits(["update:modelValue", "input"]);
+const { formItem } = useFormItem();
 
 // 引入编辑器的配置（data 中的 initEditor 与 import 同名，直接使用 import）
 const hasChange = ref(false); // 标记内容是否有更改
@@ -66,6 +72,9 @@ watch(editorContent, (val) => {
 function emitContent(content) {
   emit("update:modelValue", content);
   emit("input", content);
+  if (props.imagePicker && content) {
+    nextTick(() => formItem?.validate("change").catch(() => {}));
+  }
 }
 // 数据返回并给富文本框插入图片
 function insertImage(arr) {

manager/src/components/editor/upload-image.vue

@@ -57,6 +57,7 @@
 
     <el-dialog
       v-model="showOssManager"
+      title="选择图片"
       width="1000px"
       append-to-body
       :z-index="3600"
@@ -94,6 +95,7 @@ import { Message } from "@/utils/message";
 import OssManage from "@/views/sys/oss-manage/ossManage.vue";
 
 defineOptions({ name: "upload-image" });
+const props = defineProps({ useImagePicker: { type: Boolean, default: false } });
 
 const emit = defineEmits(["callback"]);
 
@@ -120,6 +122,10 @@ function draggableItemKey(item) {
   return item?.url || item;
 }
 function handleClickUploadImage() {
+  if (props.useImagePicker) {
+    importOSS();
+    return;
+  }
   show.value = true;
 }
 function handleView(url) {
@@ -158,7 +164,16 @@ function handleUploadError(err) {
   Message.error(err?.message || String(err));
 }
 function confirmUrls() {
-  applySelectedImages();
+  if (props.useImagePicker) {
+    const urls = [...new Set(selectedImage.value.map(parseOssSelectionUrl).filter(Boolean))];
+    if (!urls.length) {
+      Message.warning("请选择图片");
+      return;
+    }
+    emit("callback", urls);
+  } else {
+    applySelectedImages();
+  }
   showOssManager.value = false;
 }
 function cancelOssImport() {

manager/src/components/lili-dialog/goods-dialog.vue

@@ -92,6 +92,9 @@
             <span>{{ row.simpleSpecs || "默认规格" }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="店铺名称" prop="storeName" min-width="160" show-overflow-tooltip>
+          <template #default="{ row }">{{ row.storeName || '—' }}</template>
+        </el-table-column>
         <el-table-column label="销售价" width="120" align="right">
           <template #default="{ row }">
             <span class="goods-price font-semibold">
@@ -111,7 +114,7 @@
         </el-table-column>
         <el-table-column label="商品类型" width="100" align="center">
           <template #default="{ row }">
-            <el-tag size="small" type="info">{{ goodsTypeLabel(row.goodsType) }}</el-tag>
+            <span>{{ goodsTypeLabel(row.goodsType) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -136,11 +139,13 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, reactive, ref, watch } from "vue";
+import { nextTick, onMounted, onUnmounted, reactive, ref, watch } from "vue";
 import * as API_Goods from "@/api/goods";
 import { goodsTypeLabel } from "@/constants/goodsType";
 
 const props = defineProps({
+  goodsLoader: { type: Function, default: null },
+  queryParams: { type: Object, default: () => ({}) },
   selectedWay: {
     type: Array,
     default: () => [],
@@ -167,6 +172,8 @@ const category = ref([]);
 const goodsData = ref([]);
 const loading = ref(false);
 const tableRef = ref(null);
+let syncingSelection = false;
+let querySequence = 0;
 
 watch(category, (val) => {
   goodsParams.categoryPath = val && val.length ? val[2] : "";
@@ -194,6 +201,8 @@ watch(
 onMounted(() => {
   init();
 });
+watch(() => props.queryParams, onSearchGoods, { deep: true });
+onUnmounted(() => { querySequence++; });
 
 function onSearchGoods() {
   goodsData.value = [];
@@ -222,13 +231,14 @@ function onPageSizeChange(val) {
 }
 
 function getQueryGoodsList() {
+  const sequence = ++querySequence;
   loading.value = true;
-  API_Goods.getGoodsSkuData(goodsParams)
+  (props.goodsLoader || API_Goods.getGoodsSkuData)({ ...goodsParams, ...props.queryParams })
     .then((res) => {
-      initGoods(res);
+      if (sequence === querySequence) initGoods(res);
     })
     .finally(() => {
-      loading.value = false;
+      if (sequence === querySequence) loading.value = false;
     });
 }
 
@@ -245,16 +255,18 @@ function initGoods(res) {
 function syncTableSelection() {
   const table = tableRef.value;
   if (!table) return;
-  if (!selectedList.value.length) {
+  // 将不在当前页的已选 SKU 也加入保留选择，避免翻页回显时丢失。
+  syncingSelection = true;
+  try {
     table.clearSelection();
-    return;
+    selectedList.value.forEach((item) => {
+      const id = String(item.id || item.skuId);
+      const current = goodsData.value.find(row => String(row.id || row.skuId) === id);
+      table.toggleRowSelection(current || item, true);
+    });
+  } finally {
+    syncingSelection = false;
   }
-  goodsData.value.forEach((item) => {
-    const selected = selectedList.value.some(
-      (e) => (e.id || e.skuId) && String(e.id || e.skuId) === String(item.id || item.skuId)
-    );
-    table.toggleRowSelection(item, selected);
-  });
 }
 
 function emitSelected(list) {
@@ -263,6 +275,7 @@ function emitSelected(list) {
 }
 
 function onSelectionChange(rows) {
+  if (syncingSelection) return;
   if (type.value !== "multiple") {
     if (!rows.length) {
       emitSelected([]);

manager/src/components/lili-dialog/index.vue

@@ -16,6 +16,8 @@
       v-if="flag"
       ref="goodsDialogRef"
       :selectedWay="goodsData"
+      :goods-loader="goodsLoader"
+      :query-params="queryParams"
       @selected="
         (val) => {
           goodsData = val;
@@ -69,6 +71,7 @@ import goodsDialog from "./goods-dialog";
 import linkDialog from "./link-dialog";
 
 const emit = defineEmits(["closeFlag", "selectedGoodsData", "selectedLink"]);
+defineProps({ goodsLoader: { type: Function, default: null }, queryParams: { type: Object, default: () => ({}) } });
 
 const goodsFlag = ref(false); // 是否商品选择器
 const goodsData = ref([]); // 选择的商品

manager/src/components/lili-dialog/template/shops.vue

@@ -1,174 +1,10 @@
 <template>
-  <div class="shop">
+  <StoreSelector embedded :multiple="false" :query-params="shopQuery" @selected="selectShop" />
-    <div class="wap-content">
-      <div class="query-wrapper">
-        <div class="query-item">
-          <div>店铺名称</div>
-          <el-input
-            v-model="params.storeName"
-            placeholder="请输入店铺名称"
-            clearable
-            style="width: 150px"
-            @clear="resetSearch"
-            @keyup.enter="resetSearch"
-          />
-        </div>
-        <div class="query-item">
-          <el-button type="primary" @click="resetSearch">搜索</el-button>
-        </div>
-      </div>
-      <div>
-        <el-table
-          ref="tableRef"
-          v-loading="loading"
-          class="shops-select-table"
-          :data="shopsData"
-          row-key="id"
-          height="340"
-          empty-text="暂无店铺信息"
-          @selection-change="onSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            label="选择"
-            width="60"
-            align="center"
-            reserve-selection
-          />
-          <el-table-column label="店铺图片" width="100" align="center">
-            <template #default="{ row }">
-              <img class="shop-logo" :src="row.storeLogo" alt="" />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="storeName"
-            label="店铺名称"
-            min-width="240"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="180"
-            show-overflow-tooltip
-          />
-          <el-table-column label="店铺类型" width="120">
-            <template #default="{ row }">
-              <span :class="{ theme_color: row.selfOperated }">
-                {{ row.selfOperated ? "自营" : "非自营" }}
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="店铺状态" width="120">
-            <template #default="{ row }">
-              <span :class="{ theme_color: row.storeDisable === 'OPEN' }">
-                {{ row.storeDisable === "OPEN" ? "开启中" : "未开启" }}
-              </span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          class="pageration"
-          size="small"
-          layout="total, prev, pager, next, jumper"
-          :total="total"
-          :page-size="params.pageSize"
-          :current-page="params.pageNumber"
-          @current-change="changePageSize"
-        />
-      </div>
-    </div>
-  </div>
 </template>
 <script setup>
-import { nextTick, reactive, ref } from "vue";
+import StoreSelector from '@/components/store-selector/index.vue';
-import { getShopListData } from "@/api/shops.js";
+// Author: Bulbasaur; 2026-11-05. 装修链接复用统一店铺选择组件，保留单选及启用店铺范围。
-
+const emit = defineEmits(['selected']);
-const emit = defineEmits(["selected"]);
+const shopQuery = { storeDisable: 'OPEN' };
-
+function selectShop(rows) { emit('selected', rows.map(row => ({ ...row, ___type: 'shops' }))); }
-const loading = ref(false);
-const total = ref(0);
-const params = reactive({
-  pageNumber: 1,
-  pageSize: 12,
-  storeDisable: "OPEN",
-  storeName: "",
-});
-const shopsData = ref([]);
-const tableRef = ref(null);
-const selectedShop = ref(null);
-
-// 无 defineExpose：grep manager/src 全量确认无外部 ref/$refs/$parent 访问本组件成员
-// （link-dialog.vue 的 $refs["lili-component"][0].type 写入指向首个 tab 的 goods-dialog，与本组件无关）
-
-// created
-init();
-
-function resetSearch() {
-  shopsData.value = [];
-  params.pageNumber = 1;
-  init();
-}
-
-function changePageSize(v) {
-  params.pageNumber = v;
-  init();
-}
-
-function init() {
-  loading.value = true;
-  getShopListData(params)
-    .then((res) => {
-      if (res.success) {
-        total.value = res.result.total;
-        shopsData.value = res.result.records;
-        nextTick(syncTableSelection);
-      }
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-}
-
-function syncTableSelection() {
-  const table = tableRef.value;
-  if (!table || !selectedShop.value) return;
-  shopsData.value.forEach((row) => {
-    table.toggleRowSelection(row, row.id === selectedShop.value.id);
-  });
-}
-
-function onSelectionChange(rows) {
-  // 选择链接只能保留一个店铺，勾选新店铺时自动取消上一个
-  if (!rows.length) {
-    selectedShop.value = null;
-    emit("selected", []);
-    return;
-  }
-  const row = rows[rows.length - 1];
-  if (rows.length > 1) {
-    tableRef.value?.clearSelection();
-    tableRef.value?.toggleRowSelection(row, true);
-  }
-  selectedShop.value = row;
-  emit("selected", [{ ...row, ___type: "shops" }]);
-}
 </script>
-<style lang="scss" scoped>
-@import "../style.scss";
-.shop {
-  display: flex;
-}
-.shop-logo {
-  display: block;
-  width: 48px;
-  height: 48px;
-  margin: 0 auto;
-  border-radius: 4px;
-  object-fit: contain;
-}
-.pageration {
-  margin-top: 12px;
-  justify-content: flex-end;
-}
-</style>

manager/src/components/lili/upload-pic-input.vue

@@ -105,6 +105,7 @@ const props = defineProps({
     default: false,
   },
   maxlength: Number,
+  beforeSelect: Function,
 });
 const emit = defineEmits(["update:modelValue", "input", "on-change"]);
 const attrs = useAttrs();
@@ -131,6 +132,7 @@ function handleCLickImg(val, index) {
   });
 }
 function handleOssCallback(item) {
+  if (item?.url && props.beforeSelect && props.beforeSelect(item) === false) return;
   picModalFlag.value = false;
   if (!item?.url) return;
   currentValue.value = item.url;

manager/src/components/store-selector/README.md

@@ -0,0 +1,25 @@
+# 统一店铺选择器
+
+作者：Bulbasaur；2026-11-05。
+
+默认从右侧打开抽屉，支持搜索、分页、多选和已选回显。取消不提交，确认通过 `selected` 返回完整已选店铺数组。店铺类型、状态均为普通文字，无右侧预览区。
+
+```vue
+<StoreSelector ref="selector" @selected="onSelected" />
+```
+
+导入 `@/components/store-selector/index.vue`，通过 `selector.value.open(selectedRows)` 打开。`selectedRows` 为包含 `id` 的店铺对象数组；每次打开建立独立选择草稿。
+
+| 参数 | 默认值 | 用途 |
+| --- | --- | --- |
+| multiple | true | false 时单选，返回数组最多一项 |
+| embedded | false | true 时在父容器展示列表，并在选择时立即通知；适用于装修链接面板 |
+| selectedWay | [] | 初始店铺数组；内嵌模式监听外部选择变化 |
+| queryParams | {} | 店铺查询限制，例如 `{ storeDisable: 'OPEN' }` |
+| title | 选择店铺 | 抽屉标题 |
+| size | 1080px | 抽屉宽度，最大为视口宽度 |
+| tableHeight | 自动 | 可选表格高度 |
+
+已接入付费会员、装修链接单选、移动端装修店铺列表配置。查询复用 `getShopListData`（`/store/store`），不新增后端接口。
+
+验证：在工作区根目录运行 `node scripts/test-store-selector.cjs`。

manager/src/components/store-selector/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <component :is="embedded ? 'div' : ElDrawer" v-bind="embedded ? {} : { modelValue: visible, title, size, direction: 'rtl', appendToBody: true, destroyOnClose: true }" :class="embedded ? 'store-selector-inline' : 'store-picker-drawer'" @update:model-value="visible = $event" @close="request++">
+    <el-form class="picker-search" inline @submit.prevent="search">
+      <el-form-item label="店铺名称"><el-input v-model="keyword" clearable placeholder="请输入店铺名称" /></el-form-item>
+      <el-form-item><el-button type="primary" @click="search">搜索</el-button><el-button @click="reset">重置</el-button></el-form-item>
+    </el-form>
+    <div class="picker-content">
+      <div class="picker-results">
+        <el-alert v-if="error" title="加载失败，请重试" type="error" :closable="false"><el-button link type="primary" @click="load">重新加载</el-button></el-alert>
+        <el-table ref="table" v-loading="loading" :data="rows" row-key="id" border :height="tableHeight || (embedded ? '340px' : 'max(300px, calc(100vh - 270px))')" :empty-text="error ? '加载失败' : '暂无匹配结果'" @select="selectStore" @select-all="selectPage" @row-click="toggleStore">
+          <el-table-column v-if="multiple" type="selection" :reserve-selection="false" width="48" align="center" />
+          <el-table-column v-else label="选择" width="60" align="center"><template #default="{row}"><el-radio :model-value="selectedStores[0]?.id" :value="row.id" :aria-label="'选择' + row.storeName" @click.stop @change="chooseSingle(row)" /></template></el-table-column>
+            <el-table-column label="店铺信息" min-width="265"><template #default="{row}"><div class="store-info"><el-avatar :size="40" shape="square" :src="row.storeLogo || ''">店</el-avatar><div class="store-copy"><div class="store-name" :title="row.storeName">{{ row.storeName || '未命名店铺' }}</div><div class="store-id">ID：{{ row.id }}</div></div></div></template></el-table-column>
+            <el-table-column label="店铺类型" width="96" align="center"><template #default="{row}">{{ selfOperated(row) ? '自营' : '非自营' }}</template></el-table-column>
+            <el-table-column label="状态" width="100" align="center"><template #default="{row}">{{ storeStatus(row.storeDisable) }}</template></el-table-column>
+        </el-table>
+        <el-pagination v-model:current-page="page" :total="total" :page-size="10" layout="total, prev, pager, next" @current-change="load" />
+      </div>
+    </div>
+    <template v-if="!embedded" #footer><div class="picker-footer"><span class="selected-count">已选择 <b>{{ selectedStores.length }}</b> 家店铺</span><div><el-button @click="visible = false">取消</el-button><el-button type="primary" :disabled="loading" @click="confirm">确定</el-button></div></div></template>
+  </component>
+</template>
+<script setup>
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
+import { ElDrawer } from 'element-plus';
+import { getShopListData } from '@/api/shops';
+// Author: Bulbasaur; 2026-11-05.
+const props = defineProps({
+  multiple: { type: Boolean, default: true },
+  embedded: { type: Boolean, default: false },
+  selectedWay: { type: Array, default: () => [] },
+  queryParams: { type: Object, default: () => ({}) },
+  title: { type: String, default: '选择店铺' },
+  size: { type: [String, Number], default: '1080px' },
+  tableHeight: { type: String, default: '' },
+});
+const emit = defineEmits(['selected']);
+const visible = ref(false), keyword = ref(''), rows = ref([]), total = ref(0), page = ref(1), loading = ref(false), error = ref(false), table = ref();
+const storeSelection = ref({});
+const selectedStores = computed(() => Object.values(storeSelection.value));
+let request = 0;
+const selfOperated = row => [true, 1, 'true', '1'].includes(row.selfOperated);
+const storeStatus = value => ({OPEN:'营业中',CLOSED:'已关闭',APPLY:'待审核',APPLYING:'待审核',REFUSED:'审核拒绝',EXPIRED:'已过期'}[value] || value || '—');
+async function syncStores() {
+  await nextTick();
+  if (!table.value) return;
+  table.value.clearSelection();
+  rows.value.forEach(row => { if (storeSelection.value[String(row.id)]) table.value.toggleRowSelection(row, true); });
+}
+function notifyEmbedded() { if (props.embedded) emit('selected', selectedStores.value.map(row => ({...row}))); }
+function chooseSingle(row) { storeSelection.value = { [String(row.id)]: {...row} }; notifyEmbedded(); }
+function selectStore(selected, row) {
+  const key = String(row.id);
+  if (selected.some(item => String(item.id) === key)) storeSelection.value[key] = row;
+  else delete storeSelection.value[key];
+  notifyEmbedded();
+}
+function selectPage(selected) {
+  const ids = new Set(selected.map(row => String(row.id)));
+  rows.value.forEach(row => { if (ids.has(String(row.id))) storeSelection.value[String(row.id)] = row; else delete storeSelection.value[String(row.id)]; });
+  notifyEmbedded();
+}
+function toggleStore(row, column) {
+  if (column?.type === 'selection') return;
+  if (!props.multiple) { chooseSingle(row); return; }
+  const key = String(row.id);
+  if (storeSelection.value[key]) delete storeSelection.value[key]; else storeSelection.value[key] = row;
+  syncStores();
+  notifyEmbedded();
+}
+async function load() {
+  const id = ++request; loading.value = true; error.value = false;
+  try {
+    const res = await getShopListData({ ...props.queryParams, pageNumber: page.value, pageSize: 10, storeName: keyword.value.trim() });
+    if (id !== request || !visible.value) return;
+    if (!res.success) throw new Error('load');
+    rows.value = res.result.records || []; total.value = res.result.total || 0;
+    rows.value.forEach(row => { if (storeSelection.value[String(row.id)]) storeSelection.value[String(row.id)] = row; });
+    await syncStores();
+  } catch { if (id === request) { error.value = true; rows.value = []; total.value = 0; } }
+  finally { if (id === request) loading.value = false; }
+}
+function search() { page.value = 1; load(); }
+function reset() { keyword.value = ''; search(); }
+async function open(selected = props.selectedWay) {
+  request++; keyword.value = ''; rows.value = []; total.value = 0; page.value = 1; error.value = false;
+  setSelection(selected);
+  visible.value = true;
+  await nextTick(); table.value?.clearSelection();
+  await load();
+}
+function setSelection(selected) {
+  const valid = (Array.isArray(selected) ? selected : []).filter(row => row && row.id != null);
+  storeSelection.value = Object.fromEntries((props.multiple ? valid : valid.slice(0,1)).map(row => [String(row.id), {...row}]));
+}
+function confirm() { emit('selected', selectedStores.value.map(row => ({...row}))); visible.value = false; }
+watch(() => props.selectedWay, selected => { if (props.embedded) { setSelection(selected); syncStores(); } }, { deep: true });
+watch(() => props.queryParams, () => { if (visible.value) search(); }, { deep: true });
+onMounted(() => { if (props.embedded) open(); });
+defineExpose({ open });
+</script>
+<style scoped>
+:global(.store-picker-drawer) { max-width: 100vw; }
+:global(.store-picker-drawer .el-drawer__header) { margin-bottom: 0; padding: 20px; border-bottom: 1px solid #ebeef5; }
+:global(.store-picker-drawer .el-drawer__body) { padding: 20px; }
+:global(.store-picker-drawer .el-drawer__footer) { padding: 0 20px 20px; }
+.picker-search { display: flex; flex-wrap: wrap; align-items: center; gap: 12px; padding: 16px 18px 0; margin-bottom: 18px; background: #f7f8fa; border-radius: 6px; }
+.picker-search .el-form-item { margin-right: 0; margin-bottom: 16px; }.picker-search .el-input { width: 240px; }
+.picker-content { min-width: 0; }.picker-results { min-width: 0; }
+.el-pagination { margin-top: 18px; }.store-info { display: flex; align-items: center; gap: 12px; min-height: 50px; }.el-avatar { flex-shrink: 0; background: #edf2f8; color: #7b8da6; }
+.store-copy { min-width: 0; flex: 1; }.store-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 500; color: #303133; }.store-id { margin-top: 3px; font-size: 12px; color: #909399; overflow-wrap: anywhere; }
+.selected-count b { color: var(--el-color-primary); }
+.picker-footer { display: flex; justify-content: space-between; align-items: center; border-top: 1px solid #ebeef5; padding-top: 16px; }.selected-count { color: #909399; }
+@media(max-width: 800px) { .picker-search .el-input { width: 180px; } }
+</style>

manager/src/libs/util.js

@@ -7,6 +7,8 @@ let util = {};
 
 /** 已弃用、前端未实现或已移除的菜单 frontRoute，注册路由时跳过 */
 const DEPRECATED_FRONT_ROUTES = new Set([
+  "sys/message/sms",
+  "sys/message/smsSign",
   "goods/goods-manage/spec",
   "member/list/memberRecycle",
   "order/order/fictitiousOrderList",

manager/src/router/router.js

@@ -169,6 +169,12 @@ export const otherRouter = {
       name: "order-detail",
       component: () => import("@/views/order/order/orderDetail.vue")
     },
+    {
+      path: "wechat-order-list",
+      title: "小程序订单",
+      name: "wechat-order-list",
+      component: () => import("@/views/order/wechat/orderList.vue")
+    },
     {
       path: "appointment/work-orders",
       title: "预约工单",
@@ -218,6 +224,20 @@ export const otherRouter = {
       name: "member-benefit",
       component: () => import("@/views/member/benefit/index.vue")
     },
+    {
+      path: "paid-member-settings", title: "付费会员", name: "paid-member-settings",
+      component: () => import("@/views/member/paid/settings.vue")
+    },
+    {
+      path: "paid-member-records", title: "付费记录", name: "paid-member-records",
+      component: () => import("@/views/member/paid/records.vue")
+    },
+    {
+      path: "member-benefit-deliveries",
+      title: "权益发放明细",
+      name: "member-benefit-deliveries",
+      component: () => import("@/views/member/benefit/BenefitDeliveryRecords.vue")
+    },
     {
       path: "member-grade-experience",
       title: "等级权益设置",
@@ -379,12 +399,6 @@ export const otherRouter = {
       component: () => import("@/views/promotions/seckill/seckill-goods.vue")
     },
 
-    {
-      path: "add-sms-sign",
-      title: "短信签名",
-      name: "add-sms-sign",
-      component: () => import("@/views/sys/message/smsSign.vue")
-    },
     {
       path: "live-add",
       title: "创建直播",

manager/src/utils/specs.js

@@ -0,0 +1,44 @@
+/**
+ * 商品规格展示：兼容简要规格、键值 JSON 和旧数组结构，过滤图片数据，不展示原始 JSON。
+ * @author Bulbasaur
+ * @since 2026-11-06
+ */
+
+/** 将规格中的简单值转为文字，图片对象等复杂数据不参与规格展示。 */
+function specValueText(value) {
+  if (typeof value === "string") return value.trim();
+  if (typeof value === "number" && Number.isFinite(value)) return String(value);
+  if (typeof value === "boolean") return String(value);
+  if (Array.isArray(value)) return value.filter(item => !item || typeof item !== "object").map(specValueText).filter(Boolean).join("、");
+  return "";
+}
+
+/**
+ * 生成可读的 SKU 规格，优先复用接口已有的 simpleSpecs；无有效规格时显示默认规格。
+ * @param {string|object|Array|null} specs SKU 原始规格
+ * @param {string|null} simpleSpecs 接口提供的简要规格
+ * @returns {string} 排除 images 后的规格值，以斜线分隔
+ */
+export function formatSkuSpecs(specs, simpleSpecs) {
+  if (typeof simpleSpecs === "string" && simpleSpecs.trim()) return simpleSpecs.trim();
+  let parsed = specs;
+  if (typeof parsed === "string") {
+    const text = parsed.trim();
+    if (!text) return "默认规格";
+    try {
+      parsed = JSON.parse(text);
+    } catch {
+      return /^[\[{]/.test(text) ? "默认规格" : text;
+    }
+  }
+  let values;
+  if (Array.isArray(parsed)) {
+    values = parsed.filter(item => item && typeof item === "object" && item.specName !== "images")
+      .map(item => specValueText(item.specValue));
+  } else if (parsed && typeof parsed === "object") {
+    values = Object.entries(parsed).filter(([name]) => name !== "images").map(([, value]) => specValueText(value));
+  } else {
+    values = [specValueText(parsed)];
+  }
+  return values.filter(Boolean).join(" / ") || "默认规格";
+}

manager/src/views/member/benefit/BenefitConfigFields.vue

@@ -0,0 +1,40 @@
+<template>
+  <el-form-item v-if="form.benefitType === 'POINT_MULTIPLIER'" label="积分倍率" required>
+    <div class="number-field"><el-input-number v-model="form.multiplier" :min="1" :max="100" :precision="2" controls-position="right" /><span>倍</span></div>
+    <div class="hint">购物积分基数 × 倍率，同类权益取最高倍率。</div>
+  </el-form-item>
+  <div v-if="['CUSTOM', 'GRADE_BADGE', 'EXCLUSIVE_CUSTOMER_SERVICE'].includes(form.benefitType)" class="rule-description">{{ typeDescription }}</div>
+  <template v-if="form.benefitType === 'COUPON_PACKAGE'">
+    <el-form-item label="发券规则" required>
+      <el-radio-group v-model="form.grantRule">
+        <el-radio value="ONCE">发放一次</el-radio>
+        <el-radio value="MONTHLY">每月发放</el-radio>
+        <el-radio value="PERIOD">按周期发放</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item v-if="form.grantRule === 'MONTHLY'" label="发放日期" required>
+      <div class="number-field"><el-input-number v-model="form.grantDay" :min="1" :max="31" :precision="0" controls-position="right" /><span>号</span></div>
+      <div class="hint">当月不存在指定日期时，取当月最后一天。</div>
+    </el-form-item>
+    <el-form-item v-if="form.grantRule === 'PERIOD'" label="发放周期" required>
+      <div class="number-field"><el-input-number v-model="form.periodMonths" :min="1" :max="12" :precision="0" controls-position="right" /><span>个月</span></div>
+      <div class="hint">以首次达到等级的日期为起点，首期立即发放。</div>
+    </el-form-item>
+    <div class="rule-description coupon-description">最多选择 10 张平台优惠券，每券赠送 1～10 张。仅发放当前周期，暂停期间未生成的历史周期不追发。</div>
+  </template>
+</template>
+<script setup>
+import { computed } from 'vue';
+const props = defineProps({ form: { type: Object, required: true } });
+const typeDescription = computed(() => ({
+  GRADE_BADGE: '展示会员的等级徽章。请在下方配置权益图标和介绍，并在客户等级中关联使用。',
+  EXCLUSIVE_CUSTOMER_SERVICE: '展示会员专属客服权益。会员可通过商城现有客服入口联系，具体服务内容请在权益介绍中说明。',
+  CUSTOM: '展示自定义会员权益。请在权益介绍中说明适用条件、参与方式及服务内容。',
+}[props.form.benefitType] || ''));
+</script>
+<style scoped>
+.number-field { display: flex; align-items: center; gap: 10px; }
+.hint { width: 100%; margin-top: 6px; color: var(--el-text-color-secondary); font-size: 12px; line-height: 20px; }
+.rule-description { padding: 12px 16px; color: var(--el-text-color-regular); background: #f6f8fb; border-radius: 6px; font-size: 13px; line-height: 22px; }
+.coupon-description { margin-bottom: 20px; }
+</style>

manager/src/views/member/benefit/BenefitDeliveryRecords.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="search benefit-delivery-page">
+    <el-card shadow="never">
+    <el-form :model="query" inline class="search-form" label-width="70px" @submit.prevent @keyup.enter="search">
+      <el-form-item label="会员ID"><el-input v-model="query.memberId" placeholder="请输入会员ID" clearable style="width:240px" /></el-form-item>
+      <el-form-item label="状态"><el-select v-model="query.status" clearable placeholder="全部状态" style="width:240px">
+        <el-option label="成功" value="SUCCESS" /><el-option label="失败" value="FAILED" /><el-option label="待发放" value="PENDING" />
+      </el-select></el-form-item>
+      <el-form-item><el-button type="primary" class="search-btn" @click="search">搜索</el-button><el-button @click="reset">重置</el-button></el-form-item>
+    </el-form>
+    </el-card>
+    <el-card shadow="never" class="mt_10">
+      <template #header><div class="records-header"><span>权益发放明细</span><el-button @click="router.push({ name: 'member-benefit' })">返回客户权益</el-button></div></template>
+    <el-table :data="rows" v-loading="loading" border>
+      <el-table-column prop="memberId" label="会员ID" min-width="160" show-overflow-tooltip />
+      <el-table-column prop="benefitName" label="权益" min-width="130" />
+      <el-table-column prop="sourceRef" label="来源等级ID" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="cycleKey" label="发放周期" min-width="130" />
+      <el-table-column label="状态" width="100"><template #default="{row}">{{ statuses[row.status] || row.status }}</template></el-table-column>
+      <el-table-column prop="attempts" label="尝试次数" width="90" />
+      <el-table-column prop="errorMessage" label="失败原因" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="updateTime" label="更新时间" width="170" />
+      <el-table-column label="操作" width="90"><template #default="{row}"><el-button v-if="row.status === 'FAILED'" link type="primary" :loading="retrying === row.id" @click="retry(row)">重试</el-button></template></el-table-column>
+    </el-table>
+    <el-pagination v-model:current-page="query.pageNumber" :total="total" :page-size="query.pageSize" layout="total, prev, pager, next" @current-change="load" />
+    </el-card>
+  </div>
+</template>
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { getMemberBenefitDeliveries, retryMemberBenefitDelivery } from '@/api/member';
+defineOptions({ name: 'memberBenefitDeliveries' });
+const router = useRouter();
+const loading = ref(false), rows = ref([]), total = ref(0), retrying = ref('');
+const query = reactive({memberId:'',status:'',pageNumber:1,pageSize:20});
+const statuses = {SUCCESS:'成功',FAILED:'失败',PENDING:'待发放'};
+async function load() {
+  loading.value = true;
+  try { const res = await getMemberBenefitDeliveries({ ...query }); if(res.success) { rows.value = res.result.records || []; total.value = res.result.total || 0; } }
+  catch { ElMessage.error('发放明细加载失败，请重新搜索'); }
+  finally { loading.value = false; }
+}
+function search() { query.pageNumber = 1; load(); }
+function reset() { query.memberId = ''; query.status = ''; search(); }
+async function retry(row) {
+  try { await ElMessageBox.confirm('按原发放配置补发此权益，系统会检查会员当前资格。', '重试权益发放'); }
+  catch { return; }
+  retrying.value = row.id;
+  try { const res = await retryMemberBenefitDelivery(row.id); if(res.success) ElMessage.success('补发成功'); await load(); }
+  catch { ElMessage.error('补发失败，请稍后重试'); }
+  finally { retrying.value = ''; }
+}
+onMounted(load);
+</script>
+<style scoped>
+.records-header { display: flex; align-items: center; justify-content: space-between; gap: 16px; }
+.el-pagination { margin-top: 20px; justify-content: flex-end; }
+</style>

manager/src/views/member/benefit/BenefitFormFields.vue

@@ -0,0 +1,129 @@
+<template>
+  <section class="benefit-section">
+    <div class="benefit-section-heading"><h3>基本信息</h3></div>
+    <div class="benefit-form-grid">
+      <el-form-item label="权益名称" prop="benefitName">
+        <el-input v-model="form.benefitName" maxlength="50" show-word-limit placeholder="请输入权益名称" />
+      </el-form-item>
+      <el-form-item label="权益类型" prop="benefitType">
+        <el-select v-model="form.benefitType" :disabled="editing" :clearable="!editing" placeholder="请选择权益类型" @change="$emit('type-change', $event)">
+          <el-option v-for="item in typeOptions" :key="item.value" :value="item.value" :label="item.description" />
+        </el-select>
+        <div v-if="editing" class="benefit-field-hint">权益创建后不支持修改类型</div>
+      </el-form-item>
+    </div>
+  </section>
+
+  <section v-if="form.benefitType" class="benefit-section">
+    <div class="benefit-section-heading"><h3>权益规则</h3><span>{{ typeLabel }}</span></div>
+    <el-form-item v-if="form.benefitType === 'GIFT_POINT'" label="赠送积分" prop="giftPoint" required>
+      <div class="benefit-number-field">
+        <el-input-number v-model="form.giftPoint" :min="0" :max="99999" :precision="0" controls-position="right" placeholder="请输入积分数量" />
+        <span class="benefit-input-unit">积分</span>
+      </div>
+      <div class="benefit-field-hint">首次达到关联等级时赠送，范围为 0～99999 积分。</div>
+    </el-form-item>
+
+    <BenefitConfigFields :form="form" />
+
+    <el-form-item v-if="form.benefitType === 'COUPON_PACKAGE'" label="赠送优惠券" prop="couponPackageRows" required class="benefit-coupon-form-item">
+      <div class="benefit-coupon-field">
+        <div class="benefit-coupon-toolbar">
+          <span>已选择 <strong>{{ form.couponPackageRows.length }}</strong> / 10 张优惠券</span>
+          <el-button type="primary" plain @click="$emit('select-coupons', which)">添加优惠券</el-button>
+        </div>
+        <el-table border size="small" class="benefit-coupon-table" :data="form.couponPackageRows" empty-text="暂未选择优惠券，请点击右上方添加">
+          <el-table-column prop="couponName" label="优惠券名称" min-width="160" show-overflow-tooltip />
+          <el-table-column label="有效期" min-width="200"><template #default="{ row }"><span v-if="row" v-html="row.validRange || '-'" /></template></el-table-column>
+          <el-table-column prop="faceValueLabel" label="面额" min-width="95" />
+          <el-table-column label="赠送张数" width="135"><template #default="{ row, $index }">
+            <el-input-number v-if="row" :model-value="row.quantity" :min="1" :max="10" :precision="0" controls-position="right" style="width: 104px" @change="value => $emit('quantity-change', which, $index, value)" />
+          </template></el-table-column>
+          <el-table-column label="操作" width="70" align="center"><template #default="{ row, $index }">
+            <el-button v-if="row" link type="danger" @click="$emit('remove-coupon', which, $index)">删除</el-button>
+          </template></el-table-column>
+        </el-table>
+      </div>
+    </el-form-item>
+  </section>
+
+  <section class="benefit-section">
+    <div class="benefit-section-heading"><h3>展示内容</h3><span>用于会员端权益展示</span></div>
+    <el-form-item label="权益图标" prop="benefitLogo">
+      <div class="benefit-logo-field">
+        <div class="benefit-logo-preview">
+          <el-image v-if="form.benefitLogo" :src="form.benefitLogo" fit="contain" :preview-src-list="[form.benefitLogo]" preview-teleported>
+            <template #error><span class="benefit-logo-placeholder">图片不可用</span></template>
+          </el-image>
+          <span v-else class="benefit-logo-placeholder">图标预览</span>
+        </div>
+        <BenefitLogoInput v-model="form.benefitLogo" class="benefit-logo-upload" />
+      </div>
+    </el-form-item>
+    <el-form-item label="权益介绍" prop="benefitDesc">
+      <RichEditor v-model="form.benefitDesc" image-picker height="300px" class="benefit-rich-editor" />
+    </el-form-item>
+  </section>
+
+  <section class="benefit-section">
+    <div class="benefit-section-heading"><h3>发布设置</h3></div>
+    <div class="benefit-form-grid">
+      <el-form-item label="启用状态" prop="benefitState">
+        <el-radio-group v-model="form.benefitState"><el-radio value="OPEN">开启</el-radio><el-radio value="CLOSE">关闭</el-radio></el-radio-group>
+        <div class="benefit-field-hint">关闭后，会员端隐藏该权益并停止后续发放。</div>
+      </el-form-item>
+      <el-form-item label="显示排序" prop="benefitSort">
+        <el-input-number v-model="form.benefitSort" :min="1" :max="9999" :precision="0" controls-position="right" />
+        <div class="benefit-field-hint">数字越小越靠前，范围为 1～9999。</div>
+      </el-form-item>
+    </div>
+  </section>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import BenefitConfigFields from './BenefitConfigFields.vue';
+import BenefitLogoInput from './BenefitLogoInput.vue';
+import RichEditor from '@/components/editor/index.vue';
+const props = defineProps({
+  form: { type: Object, required: true },
+  typeOptions: { type: Array, default: () => [] },
+  editing: { type: Boolean, default: false },
+  which: { type: String, required: true },
+});
+defineEmits(['type-change', 'select-coupons', 'quantity-change', 'remove-coupon']);
+const typeLabel = computed(() => props.typeOptions.find(item => item.value === props.form.benefitType)?.description || '');
+</script>
+
+<style lang="scss" scoped>
+.benefit-section { padding: 24px; border: 1px solid var(--el-border-color-lighter); border-radius: 8px; background: #fff; }
+.benefit-section + .benefit-section { margin-top: 16px; }
+.benefit-section-heading { display: flex; align-items: center; flex-wrap: wrap; gap: 12px; margin-bottom: 22px; }
+.benefit-section-heading h3 { margin: 0; color: var(--el-text-color-primary); font-size: 15px; font-weight: 600; line-height: 22px; }
+.benefit-section-heading span { color: var(--el-text-color-secondary); font-size: 12px; line-height: 20px; }
+.benefit-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 24px; }
+.benefit-field-hint { width: 100%; margin-top: 6px; color: var(--el-text-color-secondary); font-size: 12px; line-height: 20px; }
+.benefit-section :deep(.el-form-item) { margin-bottom: 22px; }
+.benefit-section > :deep(.el-form-item:last-child), .benefit-form-grid > :deep(.el-form-item) { margin-bottom: 0; }
+.benefit-section :deep(.el-form-item__label) { padding: 0; margin-bottom: 8px; font-weight: 500; line-height: 22px; }
+.benefit-section :deep(.el-form-item__content) { min-width: 0; }
+.benefit-section :deep(.el-select) { width: 100%; }
+.benefit-section :deep(.el-input-number) { width: 180px; max-width: 100%; }
+.benefit-number-field { display: flex; gap: 10px; align-items: center; }
+.benefit-input-unit { color: var(--el-text-color-regular); }
+.benefit-coupon-field, .benefit-rich-editor { width: 100%; min-width: 0; }
+.benefit-coupon-toolbar { display: flex; gap: 12px; flex-wrap: wrap; justify-content: space-between; align-items: center; margin-bottom: 12px; color: var(--el-text-color-secondary); font-size: 12px; }
+.benefit-coupon-toolbar strong { color: var(--el-color-primary); font-weight: 500; }
+.benefit-coupon-table { border-radius: 6px; overflow: hidden; }
+.benefit-logo-field { display: flex; align-items: center; gap: 20px; width: 100%; }
+.benefit-logo-preview { width: 88px; height: 88px; flex: 0 0 88px; display: flex; align-items: center; justify-content: center; border: 1px dashed var(--el-border-color); border-radius: 8px; background-color: #fafbfc; overflow: hidden; }
+.benefit-logo-preview :deep(.el-image) { width: 64px; height: 64px; }
+.benefit-logo-placeholder { color: var(--el-text-color-placeholder); font-size: 12px; }
+.benefit-logo-upload { flex: 1; min-width: 0; }
+@media (max-width: 640px) {
+  .benefit-section { padding: 18px 16px; }
+  .benefit-form-grid { grid-template-columns: minmax(0, 1fr); gap: 22px; }
+  .benefit-logo-field { flex-direction: column; align-items: flex-start; gap: 12px; }
+  .benefit-logo-upload { width: 100%; }
+}
+</style>

manager/src/views/member/benefit/BenefitLogoInput.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="logo-input">
+    <UploadPicInput :model-value="modelValue" :before-select="validateSelection" placeholder="请选择图标或粘贴图片地址" @update:model-value="updateLogo" />
+    <span class="hint">透明PNG，建议100×100像素，上传大小不超过10KB。</span>
+  </div>
+</template>
+<script setup>
+import UploadPicInput from '@/components/lili/upload-pic-input.vue';
+import { nextTick } from 'vue';
+import { ElMessage, useFormItem } from 'element-plus';
+defineProps({modelValue:{type:String,default:''}});
+const emit = defineEmits(['update:modelValue']);
+const { formItem } = useFormItem();
+function validateSelection({ file }) {
+  if (!file || file.fileType !== 'image/png' || Number(file.fileSize) > 10240) {
+    ElMessage.error('请选择不超过10KB的PNG图标');
+    return false;
+  }
+  return true;
+}
+async function updateLogo(value) {
+  emit('update:modelValue', value);
+  await nextTick();
+  formItem?.validate('change').catch(() => {});
+}
+</script>
+<style scoped>
+.logo-input { width: 100%; min-width: 0; }
+.hint { display: block; margin-top: 8px; color: var(--el-text-color-secondary); font-size: 12px; line-height: 20px; }
+</style>

manager/src/views/member/grade/index.vue

@@ -76,9 +76,11 @@
         </el-form-item>
         <el-form-item label="等级图标" prop="gradeImage">
           <upload-pic-input v-model="formAdd.gradeImage" />
+          <div class="image-size-hint">推荐 100 × 100 像素，使用透明背景 PNG。</div>
         </el-form-item>
         <el-form-item label="等级背景图" prop="gradeBackground">
           <upload-pic-input v-model="formAdd.gradeBackground" />
+          <div class="image-size-hint">推荐 750 × 460 像素</div>
         </el-form-item>
         <el-form-item label="字体颜色" prop="gradeFontColor">
           <el-input v-model="formAdd.gradeFontColor" maxlength="20" placeholder="如：#333333" />
@@ -133,9 +135,11 @@
         </el-form-item>
         <el-form-item label="等级图标" prop="gradeImage">
           <upload-pic-input v-model="formEdit.gradeImage" />
+          <div class="image-size-hint">推荐 100 × 100 像素，使用透明背景 PNG。</div>
         </el-form-item>
         <el-form-item label="等级背景图" prop="gradeBackground">
           <upload-pic-input v-model="formEdit.gradeBackground" />
+          <div class="image-size-hint">推荐 750 × 460 像素</div>
         </el-form-item>
         <el-form-item label="字体颜色" prop="gradeFontColor">
           <el-input v-model="formEdit.gradeFontColor" maxlength="20" placeholder="如：#333333" />
@@ -456,6 +460,13 @@ onMounted(() => {
 });
 </script>
 <style scoped>
+.image-size-hint {
+  width: 100%;
+  margin-top: 6px;
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+  line-height: 20px;
+}
 .ops a {
   color: #2d8cf0;
   cursor: pointer;

manager/src/views/member/paid/records.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="search">
+    <el-card shadow="never"><el-form inline :model="query" class="search-form" @submit.prevent @keyup.enter="search">
+      <el-form-item label="客户名称"><el-input v-model="query.keyword" placeholder="请输入客户昵称" clearable /></el-form-item><el-form-item label="会员ID"><el-input v-model="query.memberId" placeholder="请输入会员ID" clearable /></el-form-item>
+      <el-form-item label="支付状态"><el-select v-model="query.status" clearable placeholder="全部状态" style="width:160px"><el-option label="未支付" value="UNPAID" /><el-option label="已支付" value="PAID" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item>
+      <el-form-item><el-button type="primary" @click="search">搜索</el-button><el-button @click="reset">重置</el-button></el-form-item>
+    </el-form></el-card>
+    <el-card shadow="never" class="mt_10"><div class="actions"><el-button :loading="exporting" @click="exportRecords">导出记录</el-button><el-button @click="router.push({name:'paid-member-settings'})">付费会员</el-button></div>
+      <el-table v-loading="loading" :data="rows" border>
+        <el-table-column prop="sn" label="会员费订单号" min-width="200" /><el-table-column prop="memberName" label="客户" width="130" /><el-table-column prop="memberId" label="会员ID" min-width="180" />
+        <el-table-column label="会员名称" min-width="140"><template #default="{row}">{{ name(row) }}</template></el-table-column>
+        <el-table-column prop="amount" label="付费金额(元)" width="115" /><el-table-column prop="months" label="有效月数" width="90" /><el-table-column label="支付状态" width="110"><template #default="{row}">{{ status(row) }}</template></el-table-column>
+        <el-table-column label="会员状态" width="110"><template #default="{row}">{{ membership(row) }}</template></el-table-column><el-table-column prop="payTime" label="支付时间" width="175" /><el-table-column prop="startTime" label="生效时间" width="175" /><el-table-column prop="endTime" label="到期时间" width="175" />
+        <el-table-column prop="paymentMethod" label="支付方式" width="115" /><el-table-column prop="createTime" label="创建时间" width="175" />
+      </el-table>
+      <el-pagination v-model:current-page="query.pageNumber" :page-size="20" :total="total" layout="total, prev, pager, next" @current-change="load" />
+    </el-card>
+  </div>
+</template>
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import { getPaidOrders } from '@/api/paid-member';
+defineOptions({name:'paidMemberRecords'});
+const router=useRouter(), query=reactive({keyword:'',memberId:'',status:'',pageNumber:1,pageSize:20});
+const rows=ref([]), total=ref(0), loading=ref(false), exporting=ref(false);
+let request=0;
+const time=value => value ? new Date(String(value).replace(/-/g,'/')).getTime() : 0;
+function status(row) { return row.status === 'UNPAID' && time(row.payDeadline)<Date.now() ? '已超时' : ({UNPAID:'未支付',PAID:'已支付',CANCELLED:'已取消'}[row.status] || row.status); }
+function membership(row) { return row.status !== 'PAID' ? '未开通' : time(row.startTime)>Date.now() ? '待生效' : time(row.endTime)<=Date.now() ? '已到期' : '有效'; }
+function name(row) { try { return JSON.parse(row.configSnapshot).name; } catch { return '付费会员'; } }
+async function load() { const id=++request;loading.value=true;try {const res=await getPaidOrders({...query});if(id===request && res.success){rows.value=res.result.records||[];total.value=res.result.total||0;}} finally {if(id===request)loading.value=false;} }
+function search(){query.pageNumber=1;load();} function reset(){query.keyword='';query.memberId='';query.status='';search();}
+async function exportRecords() {
+  exporting.value=true;
+  try {
+    const list=[], filters={...query}; let page=1;
+    while(true){const res=await getPaidOrders({...filters,pageNumber:page,pageSize:100});if(!res.success)return;const records=res.result.records||[];if(!records.length)break;list.push(...records);if(list.length>=res.result.total)break;if(list.length>=10000){ElMessage.warning('一次最多导出10000条，请缩小筛选范围');return;}page++;}
+    const quote=value=>{let text=String(value??'');if(/^[=+\-@]/.test(text))text="'"+text;return '"'+text.replace(/"/g,'""')+'"';};
+    const csv=[['会员费订单号','客户','会员ID','会员名称','付费金额','有效月数','支付状态','会员状态','支付时间','生效时间','到期时间','支付方式'],...list.map(r=>[r.sn,r.memberName,r.memberId,name(r),r.amount,r.months,status(r),membership(r),r.payTime,r.startTime,r.endTime,r.paymentMethod])].map(row=>row.map(quote).join(',')).join('\r\n');
+    const url=URL.createObjectURL(new Blob(['\uFEFF'+csv],{type:'text/csv;charset=utf-8;'}));const a=document.createElement('a');a.href=url;a.download='付费记录.csv';a.click();URL.revokeObjectURL(url);
+  } finally {exporting.value=false;}
+}
+onMounted(load);
+</script>
+<style scoped>.actions { display:flex; gap:12px; margin-bottom:18px; }.el-pagination { margin-top:20px;justify-content:flex-end; }</style>

manager/src/views/member/paid/settings.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="paid-settings" v-loading="loading">
+    <el-alert v-if="loadError" title="设置加载失败，请点击重试" type="error" :closable="false"><el-button link @click="loadSettings">重新加载</el-button></el-alert>
+    <el-form :model="form" label-width="150px" @submit.prevent>
+      <el-card shadow="never"><template #header>基本信息</template>
+        <el-form-item label="开放购买/续费"><el-switch v-model="form.enabled" /><span class="hint inline">关闭后，已支付会员仍有效至到期</span></el-form-item>
+        <el-form-item label="会员名称" required><el-input v-model="form.name" maxlength="50" style="width:360px" /></el-form-item>
+        <el-form-item label="会员图标"><UploadPicInput v-model="form.icon" /><div class="hint">推荐100 × 100像素，透明PNG</div></el-form-item>
+        <el-form-item label="会员背景"><el-radio-group v-model="form.backgroundType"><el-radio value="COLOR">背景色</el-radio><el-radio value="IMAGE">背景图</el-radio></el-radio-group><el-color-picker v-if="form.backgroundType === 'COLOR'" v-model="form.backgroundColor" class="inline" /></el-form-item>
+        <el-form-item v-if="form.backgroundType === 'IMAGE'" label="背景图"><UploadPicInput v-model="form.backgroundImage" /></el-form-item>
+        <el-form-item label="字体颜色"><el-color-picker v-model="form.fontColor" /></el-form-item>
+        <el-form-item label="开通价格" required><el-input-number v-model="form.price" :min="0.01" :max="1000000" :precision="2" :controls="false" /><span class="inline">元</span></el-form-item>
+        <el-form-item label="会员有效期" required><el-input-number v-model="form.months" :min="1" :max="120" :precision="0" :controls="false" /><span class="inline">个月</span><div class="hint">按自然月计算；未到期续费从原到期时间顺延。</div></el-form-item>
+        <el-form-item label="关联客户权益"><el-select v-model="form.benefitIds" multiple filterable style="width:480px;max-width:100%" placeholder="选择权益"><el-option v-for="b in benefitOptions" :key="b.id" :label="b.benefitName" :value="String(b.id)" /></el-select></el-form-item>
+      </el-card>
+      <el-card shadow="never"><template #header>商家设置</template>
+        <el-form-item label="商家范围"><el-radio-group v-model="form.storeScope"><el-radio value="SELF">自营商家</el-radio><el-radio value="CUSTOM">自定义选择</el-radio></el-radio-group></el-form-item>
+        <el-form-item v-if="form.storeScope === 'CUSTOM'" label="选择商家"><el-button @click="openPicker('stores')">添加商家</el-button><div class="picked-tags"><el-tag v-for="id in form.storeIds" :key="id" closable @close="remove('storeIds', id)">{{ stores[id]?.storeName || id }}</el-tag></div></el-form-item>
+      </el-card>
+      <el-card shadow="never"><template #header>商品折扣</template>
+        <el-form-item label="商品会员折扣"><el-radio-group v-model="form.discountMode"><el-radio value="ALL">所有适用商品统一折扣</el-radio><el-radio value="CUSTOM">自定义商品折扣</el-radio></el-radio-group></el-form-item>
+        <el-form-item v-if="form.discountMode === 'ALL'" label="统一折扣"><el-input-number v-model="form.discount" :min="0.01" :max="10" :precision="2" :controls="false" /><span class="inline">折</span></el-form-item>
+        <el-form-item v-else label="折扣商品"><div class="full"><el-button @click="openPicker('discount')">添加商品</el-button><el-table :data="filteredDiscountRules" border class="mt_10"><el-table-column label="商品" min-width="230"><template #default="{row}">{{ goods[row.skuId]?.goodsName || row.skuId }}</template></el-table-column><el-table-column label="SKU编码" width="180"><template #default="{row}">{{ goods[row.skuId]?.sn || row.skuId }}</template></el-table-column><el-table-column label="规格" min-width="160" show-overflow-tooltip><template #default="{row}">{{ goods[row.skuId]?.simpleSpecs?.trim() || '—' }}</template></el-table-column><el-table-column label="分类" min-width="180" show-overflow-tooltip><template #default="{row}">{{ goods[row.skuId]?.categoryName || '—' }}</template></el-table-column><el-table-column label="品牌" min-width="120" show-overflow-tooltip><template #default="{row}">{{ goods[row.skuId]?.brandName || '—' }}</template></el-table-column><el-table-column label="售价" width="120" align="right"><template #default="{row}">{{ goods[row.skuId]?.price == null ? '—' : '¥' + Number(goods[row.skuId].price).toFixed(2) }}</template></el-table-column><el-table-column label="折扣" width="190"><template #default="{row}"><el-input-number v-model="row.discount" :min="0.01" :max="10" :precision="2" style="width:140px" :controls="false" /> 折</template></el-table-column><el-table-column label="操作" width="80"><template #default="{row}"><el-button link type="danger" @click="form.goodsRules = form.goodsRules.filter(r => r.skuId !== row.skuId)">移除</el-button></template></el-table-column></el-table></div></el-form-item>
+      </el-card>
+      <el-card shadow="never"><template #header>会员中心推荐商品</template>
+        <el-button @click="openPicker('recommended')">添加商品</el-button>
+        <el-table :data="form.recommendedSkuIds.map(id => goods[id] || {id})" border class="mt_10"><el-table-column prop="sn" label="SKU编码" width="180" /><el-table-column label="商品名称" min-width="240"><template #default="{row}">{{ row.goodsName || row.id }}</template></el-table-column><el-table-column label="规格" min-width="160" show-overflow-tooltip><template #default="{row}">{{ row.simpleSpecs?.trim() || '—' }}</template></el-table-column><el-table-column label="分类" min-width="180" show-overflow-tooltip><template #default="{row}">{{ row.categoryName || '—' }}</template></el-table-column><el-table-column label="品牌" min-width="120" show-overflow-tooltip><template #default="{row}">{{ row.brandName || '—' }}</template></el-table-column><el-table-column label="售价" width="120" align="right"><template #default="{row}">{{ row.price == null ? '—' : '¥' + Number(row.price).toFixed(2) }}</template></el-table-column><el-table-column label="操作" width="90"><template #default="{row}"><el-button link type="danger" @click="remove('recommendedSkuIds', String(row.id))">移除</el-button></template></el-table-column></el-table>
+      </el-card>
+      <el-card shadow="never">
+        <template #header>展示设置</template>
+        <div class="entry-settings-grid">
+          <section class="entry-settings-block">
+            <h4>未开通会员入口</h4>
+            <el-form-item label="入口文案" required><el-input v-model="form.unopenedText" maxlength="50" show-word-limit class="entry-text-input" /></el-form-item>
+            <el-form-item label="字体颜色" required><el-color-picker v-model="form.unopenedFontColor" /><span class="entry-color-value">{{ form.unopenedFontColor }}</span></el-form-item>
+            <el-form-item label="背景图"><UploadPicInput v-model="form.unopenedBackground" /><div class="hint">用于个人中心未开通及已到期入口，推荐 750 × 160 像素，支持 PNG/JPG；不设置时使用默认渐变背景。</div></el-form-item>
+            <el-form-item label="效果预览"><div class="entry-preview" :style="{color: form.unopenedFontColor}"><img v-if="form.unopenedBackground" :src="form.unopenedBackground" alt="未开通入口背景" /><div class="entry-preview-content"><div><strong>{{ form.unopenedText || '开通付费会员，享专属权益' }}</strong><small>开通享商品优惠与专属权益</small></div><span>›</span></div></div></el-form-item>
+          </section>
+          <section class="entry-settings-block">
+            <h4>已开通会员入口</h4>
+            <el-form-item label="入口文案" required><el-input v-model="form.openedText" maxlength="50" show-word-limit class="entry-text-input" /></el-form-item>
+            <el-form-item label="字体颜色" required><el-color-picker v-model="form.openedFontColor" /><span class="entry-color-value">{{ form.openedFontColor }}</span></el-form-item>
+            <el-form-item label="背景图"><UploadPicInput v-model="form.openedBackground" /><div class="hint">用于个人中心有效会员入口，推荐 750 × 160 像素，支持 PNG/JPG；不设置时使用默认渐变背景。</div></el-form-item>
+            <el-form-item label="效果预览"><div class="entry-preview" :style="{color: form.openedFontColor}"><img v-if="form.openedBackground" :src="form.openedBackground" alt="已开通入口背景" /><div class="entry-preview-content"><div><strong>{{ form.openedText || '我的付费会员' }}</strong><small>有效期至 2027-11-05（示例）</small></div><span>›</span></div></div></el-form-item>
+          </section>
+        </div>
+        <el-form-item label="会员价格标签"><UploadPicInput v-model="form.priceLabel" /><div class="hint">展示在商品列表、商品详情的会员价前，推荐 48 × 48 像素、透明 PNG；不设置时只显示会员价文字。</div></el-form-item>
+        <el-form-item label="标签预览"><div class="price-label-preview"><img v-if="form.priceLabel" :src="form.priceLabel" alt="会员价格标签" /><span>会员价 ¥88.00</span></div></el-form-item>
+      </el-card>
+      <el-card shadow="never" class="document-card">
+        <template #header><div class="document-heading"><div><span>购买说明</span><div class="document-hint">展示在移动端付费会员页面，可填写权益介绍和使用说明。</div></div><el-button @click="fullscreenEditor(descriptionEditor)">全屏编辑</el-button></div></template>
+        <el-form-item label-width="0" class="document-field"><RichEditor ref="descriptionEditor" v-model="form.description" image-picker height="520px" class="full" /></el-form-item>
+      </el-card>
+      <el-card shadow="never" class="document-card">
+        <template #header><div class="document-heading"><div><span>会员协议</span><div class="document-hint">用户购买前阅读并同意的协议，开启购买前请完善内容。</div></div><el-button @click="fullscreenEditor(agreementEditor)">全屏编辑</el-button></div></template>
+        <el-form-item label-width="0" class="document-field"><RichEditor ref="agreementEditor" v-model="form.agreement" image-picker height="600px" class="full" /></el-form-item>
+      </el-card>
+      <div class="save-bar"><el-button type="primary" :loading="saving" :disabled="loading || !loaded" @click="save">保存设置</el-button></div>
+    </el-form>
+    <StoreSelector ref="picker" @selected="selected" />
+    <GoodsSelector ref="goodsPicker" :goods-loader="discountPicking ? getPaidDiscountSkus : undefined" :query-params="discountQuery" @selectedGoodsData="selected" />
+  </div>
+</template>
+<script setup>
+import { reactive, ref, onMounted, watch, computed } from 'vue';
+import { ElMessage } from 'element-plus';
+import UploadPicInput from '@/components/lili/upload-pic-input.vue';
+import RichEditor from '@/components/editor/index.vue';
+import StoreSelector from '@/components/store-selector/index.vue';
+import GoodsSelector from '@/components/lili-dialog/index.vue';
+import { getPaidConfig, savePaidConfig, getPaidResources, getPaidDiscountSkus } from '@/api/paid-member';
+import { getMemberBenefitByPage } from '@/api/member';
+defineOptions({name:'paidMemberSettings'});
+const form = reactive({ goodsRules: [], storeIds: [], recommendedSkuIds: [], benefitIds: [] });
+const loading = ref(false), loaded = ref(false), loadError = ref(false), saving = ref(false), picker = ref(), benefitOptions = ref([]), stores = reactive({}), goods = reactive({});
+const descriptionEditor = ref(), agreementEditor = ref(), goodsPicker = ref(), discountPicking = ref(false);
+const discountQuery = computed(() => discountPicking.value ? { storeScope: form.storeScope, storeIds: form.storeIds.join(',') } : {});
+const filteredDiscountRules = computed(() => form.goodsRules.filter(rule => storeAllowed(goods[rule.skuId])));
+function fullscreenEditor(editor) { editor?.getEditor()?.execCommand('mceFullScreen'); }
+let target = '';
+function remember(rows, type) { rows.forEach(row => { const cache = type === 'STORE' ? stores : goods; cache[String(row.id)] = { ...cache[String(row.id)], ...row }; }); }
+function remove(field, id) { form[field] = form[field].filter(value => value !== id); }
+async function openPicker(value) {
+  target = value;
+  if (value === 'stores') {
+    picker.value.open(form.storeIds.map(id => ({ ...stores[id], id: String(id) })));
+    return;
+  }
+  discountPicking.value = value === 'discount';
+  if (discountPicking.value) {
+    if (form.storeScope === 'CUSTOM' && !form.storeIds.length) { ElMessage.warning('请先选择参与商家'); return; }
+    try { await reconcileDiscounts(); } catch { ElMessage.error('商品商家信息加载失败，请重试'); return; }
+  }
+  const ids = value === 'discount' ? form.goodsRules.map(rule => rule.skuId) : form.recommendedSkuIds;
+  goodsPicker.value.goodsData = ids.map(id => ({ ...goods[id], id: String(id) }));
+  goodsPicker.value.open('goods');
+}
+async function selected(rows) {
+  remember(rows, target === 'stores' ? 'STORE' : 'SKU');
+  if (target === 'stores') { form.storeIds = rows.map(row => String(row.id)); return; }
+  if (target === 'discount') {
+    try { await hydrate('SKU', rows.map(row => String(row.id))); } catch { ElMessage.error('商品商家信息加载失败，请重试'); return; }
+    const validRows = rows.filter(row => storeAllowed(goods[String(row.id)]));
+    if (validRows.length !== rows.length) ElMessage.warning('已排除不属于参与商家的商品');
+    const discounts = new Map(form.goodsRules.map(rule => [String(rule.skuId), rule.discount]));
+    form.goodsRules = validRows.map(row => ({ skuId: String(row.id), discount: discounts.get(String(row.id)) ?? form.discount ?? 9.5 }));
+  } else { form.recommendedSkuIds = rows.map(row => String(row.id)); }
+  const missing = rows.filter(row => !Object.hasOwn(row, 'categoryName') || !Object.hasOwn(row, 'brandName'));
+    if (missing.length) { try { await hydrate('SKU', missing.map(row => String(row.id))); } catch { ElMessage.warning('商品分类和品牌加载失败，可刷新页面重试'); } }
+}
+async function save() { saving.value = true; try { await reconcileDiscounts(); const res = await savePaidConfig({...form}); if (res.success) ElMessage.success('付费会员设置已保存'); } finally { saving.value = false; } }
+function storeAllowed(sku) {
+  return !!sku && (form.storeScope === 'SELF' ? sku.storeSelfOperated === true : form.storeIds.map(String).includes(String(sku.storeId)));
+}
+async function reconcileDiscounts() {
+  const missing = form.goodsRules.filter(rule => !Object.hasOwn(goods[rule.skuId] || {}, 'storeSelfOperated'));
+  if (missing.length) await hydrate('SKU', missing.map(rule => rule.skuId));
+  const remaining = form.goodsRules.filter(rule => storeAllowed(goods[rule.skuId]));
+  if (remaining.length !== form.goodsRules.length) { form.goodsRules = remaining; ElMessage.warning('已移除不属于当前参与商家的折扣商品'); }
+}
+watch(() => [form.storeScope, ...form.storeIds], () => {
+  if (loading.value || !loaded.value) return;
+  reconcileDiscounts().catch(() => ElMessage.error('商品商家信息加载失败，请重试'));
+}, { flush: 'sync' });
+async function hydrate(type, ids) {
+  for (let i=0; i<ids.length; i+=100) { const res = await getPaidResources(type, ids.slice(i,i+100)); if (!res.success) throw new Error('resources'); remember(res.result, type); }
+}
+async function loadSettings() {
+  loading.value = true; loaded.value = false; loadError.value = false;
+  try {
+    const [config, rights] = await Promise.all([getPaidConfig(), getMemberBenefitByPage({pageNumber:1,pageSize:200})]);
+    if (!config.success) { loadError.value = true; return; }
+    Object.assign(form, config.result); loaded.value = true; benefitOptions.value = rights.result?.records || [];
+    const ids = [...new Set([...form.recommendedSkuIds, ...form.goodsRules.map(r => r.skuId)])];
+    await Promise.all([hydrate('SKU',ids), hydrate('STORE',form.storeIds)]);
+  } catch { loadError.value = true; } finally { loading.value = false; }
+}
+onMounted(loadSettings);
+</script>
+<style scoped>
+.entry-settings-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 24px; margin-bottom: 24px; }
+.entry-settings-block { min-width: 0; border: 1px solid #ebeef5; border-radius: 6px; padding: 20px 16px 0; }
+.entry-settings-block h4 { margin: 0 0 24px; color: #303133; font-size: 14px; }
+.entry-text-input { width: 480px; max-width: 100%; }
+.entry-color-value { margin-left: 12px; color: #909399; font-size: 12px; }
+.entry-preview { position: relative; overflow: hidden; width: 375px; max-width: 100%; min-height: 80px; border-radius: 10px; background: linear-gradient(110deg, #423c36, #756149); }
+.entry-preview > img { position: absolute; inset: 0; width: 100%; height: 100%; object-fit: cover; }
+.entry-preview-content { position: relative; display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 16px; min-height: 80px; box-sizing: border-box; line-height: 1.5; }
+.entry-preview-content strong { font-size: 14px; }.entry-preview-content small { display: block; margin-top: 4px; opacity: .75; font-size: 11px; }.entry-preview-content > span { font-size: 24px; }
+.price-label-preview { display: flex; align-items: center; gap: 6px; color: #a77c3e; font-size: 13px; }.price-label-preview img { width: 24px; height: 24px; object-fit: contain; }
+@media (max-width: 1400px) { .entry-settings-grid { grid-template-columns: minmax(0, 1fr); } }
+.document-heading { display: flex; align-items: center; justify-content: space-between; gap: 20px; }
+.document-heading > div { min-width: 0; }
+.document-hint { margin-top: 8px; color: #909399; font-size: 12px; font-weight: normal; line-height: 20px; }
+.document-field { margin-bottom: 0; }
+.document-field :deep(.el-form-item__content) { min-width: 0; }
+.document-card :deep(.tox-tinymce) { border-color: #dcdfe6; }
+.paid-settings { padding-bottom: 70px; }.el-card { margin-top: 16px; }.hint { width: 100%; font-size: 12px; line-height: 20px; margin-top: 6px; color: #909399; }.inline { margin-left: 12px; }.hint.inline { width: auto; margin-top: 0; }.full { width: 100%; min-width: 0; }.picked-tags { width: 100%; display: flex; flex-wrap: wrap; gap: 8px; margin-top: 12px; }.save-bar { position: sticky; bottom: 0; padding: 16px; background: #fff; border-top: 1px solid #ebeef5; display: flex; justify-content: flex-end; z-index: 10; }
+</style>

manager/src/views/order/order/orderList.vue

@@ -37,7 +37,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="支付方式" prop="paymentMethod">
-          <el-select v-model="searchForm.paymentMethod" placeholder="请选择支付方式" clearable>
+          <el-select v-model="searchForm.paymentMethod" placeholder="请选择支付方式" :disabled="!!fixedPaymentMethod" :clearable="!fixedPaymentMethod">
             <el-option v-for="item in paymentOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -70,7 +70,7 @@
           />
         </el-tabs>
       </div>
-      <div>
+      <div v-if="allowExport">
         <el-button type="warning" class="export" :loading="exporting" @click="exportOrder">导出订单</el-button>
       </div>
 
@@ -157,6 +157,13 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { unitPrice, customRouterPush } from "@/utils/filters";
 const PAGE_SIZES = [20, 50, 100];
 
+// 独立渠道页面复用列表，来源限制不从地址栏或可重置表单中读取。
+const props = defineProps({
+  fixedClientType: { type: String, default: "" },
+  fixedPaymentMethod: { type: String, default: "" },
+  allowExport: { type: Boolean, default: true },
+});
+
 const PROMOTION_OPTIONS = [
   { label: "普通订单", value: "NORMAL" },
   { label: "拼团订单", value: "PINTUAN" },
@@ -195,7 +202,7 @@ function emptySearchForm(pageSize = 20) {
     consigneeMobile: "",
     storeName: "",
     orderStatus: "",
-    paymentMethod: "",
+    paymentMethod: props.fixedPaymentMethod,
     orderPromotionType: "",
   };
 }
@@ -367,7 +374,7 @@ function selectDateRange(v) {
   }
 }
 function countParams() {
-  const params = { ...searchForm.value };
+  const params = listParams();
   delete params.orderStatus;
   delete params.pageNumber;
   delete params.pageSize;
@@ -375,9 +382,15 @@ function countParams() {
   delete params.order;
   return params;
 }
+function listParams() {
+  const params = { ...searchForm.value };
+  if (props.fixedClientType) params.clientType = props.fixedClientType;
+  if (props.fixedPaymentMethod) params.paymentMethod = props.fixedPaymentMethod;
+  return params;
+}
 function getDataList() {
   loading.value = true;
-  API_Order.getOrderList(searchForm.value)
+  API_Order.getOrderList(listParams())
     .then((res) => {
       if (res.success) {
         data.value = res.result.records;
@@ -395,6 +408,7 @@ function detail(v) {
   });
 }
 async function exportOrder() {
+  if (!props.allowExport) return;
   if (!searchForm.value.startDate || !searchForm.value.endDate) {
     try {
       await ElMessageBox.confirm(
@@ -407,7 +421,7 @@ async function exportOrder() {
     }
   }
   exporting.value = true;
-  API_Order.exportOrder(searchForm.value)
+  API_Order.exportOrder(listParams())
     .then((res) => {
       const blob = new Blob([res], {
         type: "application/vnd.ms-excel;charset=utf-8",

manager/src/views/order/wechat/orderList.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <el-alert
+      title="小程序订单"
+      type="info"
+      :closable="false"
+      show-icon
+      class="wechat-order-notice"
+      description="仅展示微信小程序下单且使用微信支付的订单。自动上报开关开启且微信侧已开通发货管理时，按现有履约流程上报。"
+    />
+    <OrderList fixed-client-type="WECHAT_MP" fixed-payment-method="WECHAT" :allow-export="false" />
+  </div>
+</template>
+
+<script setup>
+import OrderList from "../order/orderList.vue";
+
+defineOptions({ name: "wechatOrderList" });
+</script>
+
+<style scoped>
+.wechat-order-notice {
+  margin-bottom: 16px;
+}
+</style>

manager/src/views/page-decoration/pc/config.js

@@ -443,7 +443,7 @@ export const COMPONENT_DEFINITIONS = [
         { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' },
         { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' },
         { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' },
-        { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
+        { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
       ]
     },
     defaultComponentStyle: {

manager/src/views/page-decoration/pc/template/TplBrandWall.vue

@@ -49,7 +49,7 @@ const brandList = computed(() => {
     { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' },
     { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' },
     { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' },
-    { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
+    { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
   ];
 });
 

manager/src/views/page-decoration/pc/template/TplCoupon.vue

@@ -10,7 +10,7 @@
           <span class="val">{{ cp.price }}</span>
         </div>
         <div class="right-info">
-          <span class="title">满{{ cp.consumeThreshold }}可用</span>
+          <span class="title">{{ cp.consumeThreshold > 0 ? '满' + cp.consumeThreshold + '可用' : '无门槛使用' }}</span>
           <span class="scope" v-if="cp.title">{{ cp.title }}</span>
           <span class="btn">立即领取</span>
         </div>

manager/src/views/page-decoration/wap/config-panel/PanelShop.vue

@@ -80,7 +80,7 @@
           <div class="ctrl-row">
             <div class="ctrl-label">选择店铺</div>
             <div class="ctrl-body">
-              <el-button plain type="primary" @click="shopDialogVisible = true">选择店铺</el-button>
+              <el-button plain type="primary" @click="openShops">选择店铺</el-button>
             </div>
           </div>
           <div class="shop-chips" v-if="firstItem.shopList && firstItem.shopList.length">
@@ -176,38 +176,7 @@
       />
     </el-dialog>
 
-    <el-dialog
+    <StoreSelector ref="storeSelector" :query-params="{ storeDisable: 'OPEN' }" @selected="confirmShops" />
-      v-model="shopDialogVisible"
-      title="选择店铺"
-      width="720px"
-      append-to-body
-      destroy-on-close
-      @open="loadShops"
-    >
-      <el-table
-        :data="shopOptions"
-        v-loading="shopLoading"
-        max-height="400"
-        @selection-change="onShopSelection"
-      >
-        <el-table-column type="selection" width="50" />
-        <el-table-column label="店铺" min-width="220">
-          <template #default="{ row }">
-            <div class="shop-cell">
-              <img :src="row.storeLogo" class="shop-cell-logo" alt="" />
-              <span>{{ row.storeName }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="类型" width="100">
-          <template #default="{ row }">{{ row.selfOperated ? "自营" : "旗舰店" }}</template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <el-button @click="shopDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmShops">确定</el-button>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -217,7 +186,7 @@ import ColorField from "../controls/ColorField.vue";
 import SliderField from "../controls/SliderField.vue";
 import ossManage from "@/views/sys/oss-manage/ossManage";
 import ways from "@/components/lili-dialog/wap.js";
-import { getShopListData } from "@/api/shops";
+import StoreSelector from "@/components/store-selector/index.vue";
 
 const DEFAULTS = {
   bgColor1: "#FFFFFF",
@@ -247,7 +216,7 @@ const DEFAULT_ITEM = {
 export default {
   name: "PanelShop",
   hideDecorateTitle: true,
-  components: { GradientField, ColorField, SliderField, ossManage },
+  components: { GradientField, ColorField, SliderField, ossManage, StoreSelector },
   props: {
     res: { type: Object, required: true },
   },
@@ -260,10 +229,6 @@ export default {
         { key: "style", title: "样式" },
       ],
       picModelFlag: false,
-      shopDialogVisible: false,
-      shopLoading: false,
-      shopOptions: [],
-      selectedShops: [],
     };
   },
   computed: {
@@ -284,30 +249,15 @@ export default {
     if (!Array.isArray(item.shopList)) item.shopList = [];
   },
   methods: {
-    // 加载店铺列表供选择
+    openShops() { this.$refs.storeSelector.open(this.firstItem.shopList); },
-    loadShops() {
+    confirmShops(rows) {
-      this.shopLoading = true;
+      this.firstItem.shopList = rows.map((s) => ({
-      this.selectedShops = [];
-      getShopListData({ pageNumber: 1, pageSize: 100, status: "OPEN" })
-        .then((res) => {
-          this.shopOptions = (res && res.result && res.result.records) || [];
-        })
-        .finally(() => {
-          this.shopLoading = false;
-        });
-    },
-    onShopSelection(rows) {
-      this.selectedShops = rows;
-    },
-    confirmShops() {
-      this.firstItem.shopList = this.selectedShops.map((s) => ({
         id: s.id,
         storeName: s.storeName,
         storeLogo: s.storeLogo,
         selfOperated: s.selfOperated,
         storeBanner: s.storeBanner || "",
       }));
-      this.shopDialogVisible = false;
     },
     removeShop(index) {
       this.firstItem.shopList.splice(index, 1);

manager/src/views/promotions/coupon-activity/coupon-info.vue

@@ -91,7 +91,7 @@
         <el-table-column label="优惠券类型" width="130" align="center">
           <template #default="{ row }">
             <el-tag v-if="row" size="small" effect="light" :type="row.couponType === 'DISCOUNT' ? 'warning' : 'danger'">
-              {{ couponTypeText(row.couponType) }}
+              {{ couponTypeText(row) }}
             </el-tag>
           </template>
         </el-table-column>
@@ -181,9 +181,9 @@ onMounted(() => {
   getCouponActivity();
 });
 
-function couponTypeText(v) {
+function couponTypeText(row) {
-  if (v === "DISCOUNT") return "打折券";
+  if (row.couponType === "DISCOUNT") return "满折优惠券";
-  if (v === "PRICE") return "减免现金券";
+  if (row.couponType === "PRICE") return Number(row.consumeThreshold) === 0 ? "立减优惠券" : "满减优惠券";
   return "未知类型";
 }
 

manager/src/views/promotions/coupon-activity/coupon-publish.vue

@@ -25,13 +25,6 @@
               />
             </el-form-item>
 
-            <el-form-item label="优惠券活动类型" prop="couponActivityType">
-              <el-radio-group v-model="form.couponActivityType">
-                <el-radio-button value="REGISTERED">新人发券</el-radio-button>
-                <el-radio-button value="SPECIFY">精确发券</el-radio-button>
-                <el-radio-button value="AUTO_COUPON">自动赠券</el-radio-button>
-              </el-radio-group>
-            </el-form-item>
             <el-form-item
               label="领取频率"
               v-if="form.couponActivityType === 'AUTO_COUPON'"
@@ -170,8 +163,8 @@
 </template>
 
 <script setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, watch } from "vue";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import couponTemplate from "@/views/promotions/coupon/coupon";
 import userList from "@/views/member/list/index";
 import { saveActivityCoupon } from "@/api/promotion";
@@ -182,6 +175,7 @@ import { unixToDate } from "@/utils/filters";
 defineOptions({ name: "add-coupon-activity" });
 
 const router = useRouter();
+const route = useRoute();
 const appStore = useAppStore();
 
 const options = reactive({
@@ -205,6 +199,15 @@ const form = reactive({
   couponActivityItems: [],
   couponFrequencyEnum: "",
 });
+watch(
+  () => route.query.couponActivityType,
+  (type) => {
+    if (["REGISTERED", "SPECIFY", "AUTO_COUPON"].includes(type)) {
+      form.couponActivityType = type;
+    }
+  },
+  { immediate: true }
+);
 const submitLoading = ref(false);
 const selectCouponList = ref([]);
 const formRule = reactive({

manager/src/views/promotions/coupon-activity/coupon.vue

@@ -2,7 +2,9 @@
   <div class="search">
     <el-card>
       <div class="operation padding-row">
-        <el-button type="primary" @click="add">添加活动</el-button>
+        <el-button type="primary" plain @click="addRegistered">注册赠券</el-button>
+        <el-button type="primary" plain @click="addSpecify">精准发券</el-button>
+        <el-button type="primary" plain @click="addAutoCoupon">自动赠券</el-button>
       </div>
 
       <el-table
@@ -105,7 +107,7 @@ function activityTypeText(type) {
     REGISTERED: "注册赠券",
     AUTO_COUPON: "自动发券",
   };
-  return map[type] || "精确发券";
+  return map[type] || "精准发券";
 }
 function activityScopeText(scope) {
   return scope === "DESIGNATED" ? "指定会员" : "全部会员";
@@ -145,8 +147,23 @@ function promotionStatusTagType(status) {
 function init() {
   getDataList();
 }
-function add() {
+function addRegistered() {
-  router.push({ name: "add-coupon-activity" });
+  router.push({
+    name: "add-coupon-activity",
+    query: { couponActivityType: "REGISTERED" },
+  });
+}
+function addSpecify() {
+  router.push({
+    name: "add-coupon-activity",
+    query: { couponActivityType: "SPECIFY" },
+  });
+}
+function addAutoCoupon() {
+  router.push({
+    name: "add-coupon-activity",
+    query: { couponActivityType: "AUTO_COUPON" },
+  });
 }
 function info(v) {
   router.push({ name: "coupon-activity-info", query: { id: v.id } });

manager/src/views/promotions/coupon/coupon-receive.vue

@@ -72,7 +72,7 @@
         <el-table-column label="面额/折扣" width="100">
           <template #default="{ row }">
             <priceColorScheme
-              v-if="row && row.price"
+              v-if="row && row.couponType === 'PRICE'"
               :value="row.price"
               :color="$mainColor"
             />

manager/src/views/promotions/coupon/coupon.vue

@@ -93,7 +93,7 @@
         <el-table-column label="面额/折扣" width="150">
           <template #default="{ row }">
             <span v-if="row">
-              <span v-if="row.price" :style="{ color: $mainColor }">
+              <span v-if="row.couponType === 'PRICE'" :style="{ color: $mainColor }">
                 {{ $filters.unitPrice(row.price, "￥") }}</span>
               <span v-else>{{ row.couponDiscount }}折</span>
             </span>
@@ -118,7 +118,7 @@
         <el-table-column label="优惠券类型" width="120">
           <template #default="{ row }">
             <el-tag v-if="row" :type="couponTypeTagType(row.couponType)">
-              {{ couponTypeText(row.couponType) }}
+              {{ couponTypeText(row) }}
             </el-tag>
           </template>
         </el-table-column>
@@ -362,12 +362,10 @@ function getTypeTagType(type) {
   };
   return map[type] || "";
 }
-function couponTypeText(type) {
+function couponTypeText(row) {
-  const map = {
+  if (row.couponType === "DISCOUNT") return "满折优惠券";
-    DISCOUNT: "打折",
+  if (row.couponType === "PRICE") return Number(row.consumeThreshold) === 0 ? "立减优惠券" : "满减优惠券";
-    PRICE: "减免现金",
+  return "未知";
-  };
-  return map[type] || "未知";
 }
 function couponTypeTagType(type) {
   const map = {

manager/src/views/promotions/gift-card-cash/gift-card-cash-activity-add.vue

@@ -1,38 +1,28 @@
 <template>
-  <div class="gift-card-activity-page">
+  <div class="gift-card-activity-page" :class="{ 'pickup-page': form.cardType === 'PICKUP', 'view-page': onlyView }">
-    <!-- 顶部标题与返回栏 -->
+    <!-- 礼品卡基础信息卡片 -->
-    <el-card shadow="never" class="header-card">
+    <el-card shadow="never" v-loading="detailLoading" class="info-card">
-      <div class="page-header-row">
+      <template #header>
-        <div class="header-left">
+        <div class="page-header-row">
-          <div class="header-title">
+          <div class="header-left">
-            <span>{{ pageTitle }}</span>
+            <div class="header-title">
-            <el-tag
+              <span>{{ pageTitle }}</span>
-              v-if="onlyView || isEditMode"
+              <el-tag
-              size="small"
+                v-if="onlyView || isEditMode"
-              effect="plain"
+                size="small"
-              :type="onlyView ? 'info' : (isEditMode ? 'warning' : 'primary')"
+                effect="plain"
-              class="mode-tag"
+                :type="onlyView ? 'info' : (isEditMode ? 'warning' : 'primary')"
-            >
+                class="mode-tag"
-              {{ onlyView ? "查看模式" : "编辑模式" }}
+              >
-            </el-tag>
+                {{ onlyView ? "查看模式" : "编辑模式" }}
-            <span v-if="route.query.id" class="activity-id font-mono">
+              </el-tag>
-              ID: {{ route.query.id }}
+              <span v-if="route.query.id" class="activity-id font-mono">
-            </span>
+                ID: {{ route.query.id }}
+              </span>
+            </div>
           </div>
         </div>
-        <div class="header-right">
+      </template>
-          <el-button @click="closeCurrentPage">返回礼品卡列表</el-button>
-        </div>
-      </div>
-    </el-card>
-
-    <!-- 礼品卡基础信息卡片 -->
-    <el-card shadow="never" v-loading="detailLoading" class="info-card mt_10">
-      <div class="section-header">
-        <span class="section-indicator"></span>
-        <span class="section-title">礼品卡配置信息</span>
-      </div>
-
       <!-- 查看模式：以结构化描述列表呈现 -->
       <template v-if="onlyView">
         <el-descriptions :column="2" border class="custom-descriptions">
@@ -46,7 +36,7 @@
             </el-tag>
           </el-descriptions-item>
 
-          <el-descriptions-item label="礼品卡面值">
+          <el-descriptions-item v-if="form.cardType === 'CASH'" label="礼品卡面值">
             <span class="price-highlight font-mono font-semibold">
               {{ form.faceValue ? $filters.unitPrice(form.faceValue, "￥") : "-" }}
             </span>
@@ -56,7 +46,6 @@
             <span class="font-mono text-dark font-semibold">
               {{ form.stockTotal != null ? `${form.stockTotal} 张` : "-" }}
             </span>
-            <span class="hint-inline">（最多可制发凭证张数）</span>
           </el-descriptions-item>
 
           <el-descriptions-item label="有效期限" :span="2">
@@ -71,6 +60,17 @@
             <span class="font-mono text-secondary">{{ route.query.id }}</span>
           </el-descriptions-item>
         </el-descriptions>
+        <template v-if="form.cardType === 'PICKUP'">
+          <p>兑换规则：{{ {ONE:'任选一种',ALL:'全部兑换',ANY:'任选 ' + form.pickupCount + ' 种'}[form.pickupMode] }}，每种一件</p>
+          <el-table :data="pickupGoods">
+            <el-table-column prop="id" label="SKU ID" />
+            <el-table-column prop="goodsName" label="商品" />
+            <el-table-column label="规格" min-width="160" show-overflow-tooltip>
+              <template #default="{ row }">{{ formatSkuSpecs(row.specs, row.simpleSpecs) }}</template>
+            </el-table-column>
+            <el-table-column prop="storeName" label="店铺" />
+          </el-table>
+        </template>
       </template>
 
       <!-- 编辑 / 新增模式：表单输入 -->
@@ -78,11 +78,12 @@
         <el-form
           ref="formRef"
           :model="form"
-          label-width="120px"
+          label-position="top"
+          size="large"
           :rules="formRule"
           class="edit-form"
         >
-          <el-form-item label="礼品卡名称" prop="giftCardName">
+          <el-form-item label="礼品卡名称" prop="giftCardName" class="full-row">
             <el-input
               v-model="form.giftCardName"
               type="text"
@@ -90,100 +91,112 @@
               clearable
               maxlength="64"
               show-word-limit
-              style="width: 380px"
+              class="form-control"
             />
           </el-form-item>
 
-          <el-form-item label="礼品卡类型" prop="cardType">
+          <el-form-item v-if="form.cardType === 'CASH'" label="面值" prop="faceValue">
-            <el-radio-group v-model="form.cardType">
-              <el-radio value="CASH">现金卡</el-radio>
-              <el-radio value="PICKUP" disabled>提货卡（暂未开放）</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="面值" prop="faceValue">
             <el-input
               v-model="form.faceValue"
+              :disabled="coreLocked"
               type="number"
               placeholder="请填写面值金额"
               clearable
-              style="width: 260px"
+              class="form-control"
             >
               <template #append>元</template>
             </el-input>
           </el-form-item>
 
-          <el-form-item label="总库存" prop="stockTotal">
+          <template v-if="form.cardType === 'PICKUP'">
-            <el-input-number
+            <el-form-item label="兑换方式" required class="full-row">
-              v-model="form.stockTotal"
+              <el-radio-group v-model="form.pickupMode" :disabled="coreLocked">
-              :min="1"
+                <el-radio value="ONE">任选一种</el-radio>
-              :precision="0"
+                <el-radio value="ALL">全部兑换</el-radio>
-              placeholder="最多可制发凭证张数"
+                <el-radio value="ANY">任选 N 种</el-radio>
-              style="width: 220px"
+              </el-radio-group>
-            />
+              <el-input-number v-if="form.pickupMode === 'ANY'" v-model="form.pickupCount" :min="1" :max="50" :precision="0" :controls="false" :disabled="coreLocked" style="width:100px;margin-left:12px" />
-            <span class="input-tip-text">张（最多可制发凭证张数）</span>
+            </el-form-item>
+            <el-form-item label="兑换商品" required class="full-row">
+              <el-button :disabled="coreLocked" @click="openPickupGoods">选择商品</el-button>
+              <span class="input-tip-text">最多 50 个 SKU，每种一件，每卡一次兑完</span>
+            </el-form-item>
+            <el-table :data="pickupGoods" border class="full-row" style="margin-bottom:4px">
+              <el-table-column prop="id" label="SKU ID" min-width="160" />
+              <el-table-column prop="goodsName" label="商品名称" min-width="220" />
+              <el-table-column label="规格" min-width="160" show-overflow-tooltip>
+                <template #default="{ row }">{{ formatSkuSpecs(row.specs, row.simpleSpecs) }}</template>
+              </el-table-column>
+              <el-table-column prop="storeName" label="店铺" min-width="140" />
+              <el-table-column label="销售价（元）" width="130"><template #default="{row}">{{ row.price }}</template></el-table-column>
+              <el-table-column label="操作" width="90"><template #default="{row}"><el-button link :disabled="coreLocked" @click="pickupGoods = pickupGoods.filter(g => g.id !== row.id)">移除</el-button></template></el-table-column>
+            </el-table>
+          </template>
+          <el-form-item label="总库存" prop="stockTotal" class="stock-form-item">
+            <div class="form-control unit-control">
+              <el-input-number
+                v-model="form.stockTotal"
+                :min="1"
+                :precision="0"
+                :controls="false"
+                placeholder="请输入总库存"
+              />
+              <span class="unit-addon">张</span>
+            </div>
           </el-form-item>
 
-          <el-form-item label="有效期限" required class="validity-form-item">
+          <el-form-item label="有效期限" required class="validity-form-item full-row">
-            <el-radio-group v-model="form.validityType" class="validity-radio-group">
+            <div class="validity-control">
-              <div class="validity-row">
+              <el-radio-group v-model="form.validityType" :disabled="coreLocked" class="validity-radio-group">
                 <el-radio value="LONG_TERM">长期有效</el-radio>
-              </div>
+                <el-radio value="AFTER_ACTIVATE_MONTHS">激活后有效</el-radio>
-
+                <el-radio value="FIXED_UNTIL">指定到期</el-radio>
-              <div class="validity-row">
+              </el-radio-group>
-                <el-radio value="AFTER_ACTIVATE_MONTHS">
+              <div v-if="form.validityType === 'AFTER_ACTIVATE_MONTHS'" class="validity-detail">
-                  <span class="radio-inline-text">自激活后</span>
+                <div class="unit-control month-control">
                   <el-input-number
                     v-model="form.validMonthsAfterActivate"
                     :min="1"
                     :max="99"
                     :precision="0"
+                    :controls="false"
+                    :disabled="coreLocked"
                     placeholder="1-99"
-                    :disabled="form.validityType !== 'AFTER_ACTIVATE_MONTHS'"
-                    class="validity-input-num"
                   />
-                  <span class="radio-inline-text">个月内有效</span>
+                  <span class="unit-addon">个月</span>
-                </el-radio>
+                </div>
               </div>
-
+              <div v-else-if="form.validityType === 'FIXED_UNTIL'" class="validity-detail">
-              <div class="validity-row">
+              <el-date-picker
-                <el-radio value="FIXED_UNTIL">
+                v-model="form.validEndTime"
-                  <span class="radio-inline-text">指定有效期至</span>
+                type="datetime"
-                  <el-date-picker
+                format="YYYY-MM-DD HH:mm:ss"
-                    v-model="form.validEndTime"
+                value-format="YYYY-MM-DD HH:mm:ss"
-                    type="datetime"
+                placeholder="选择有效截止时间"
-                    format="YYYY-MM-DD HH:mm:ss"
+                clearable
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="coreLocked"
-                    placeholder="选择有效截止时间"
+                class="validity-date-control"
-                    clearable
+              />
-                    :disabled="form.validityType !== 'FIXED_UNTIL'"
-                    class="validity-date-picker"
-                    style="width: 220px"
-                  />
-                </el-radio>
               </div>
-            </el-radio-group>
+            </div>
           </el-form-item>
         </el-form>
       </template>
-    </el-card>
-
-    <!-- 底部操作栏 -->
-    <el-card shadow="never" class="footer-card mt_10">
       <div class="footer-actions">
-        <el-button @click="closeCurrentPage">
-          {{ onlyView ? "返回" : "取消" }}
-        </el-button>
         <el-button
           v-if="!onlyView"
           type="primary"
           :loading="submitLoading"
           @click="handleSubmit"
         >
-          {{ isEditMode ? "保存修改" : "提交创建" }}
+          {{ isEditMode ? "保存修改" : (form.cardType === "PICKUP" ? "创建提货卡" : "创建现金卡") }}
         </el-button>
+        <el-button @click="closeCurrentPage">{{ onlyView ? "返回" : "取消" }}</el-button>
       </div>
     </el-card>
+
+    <lili-dialog ref="pickupSelector" :query-params="{ goodsType: 'PHYSICAL_GOODS', marketEnable: 'UPPER', authFlag: 'PASS' }" @selectedGoodsData="confirmPickupGoods" />
+
   </div>
 </template>
 
@@ -197,8 +210,10 @@ import {
 } from "@/api/promotion";
 import { regular } from "@/utils";
 import { unixToDate } from "@/utils/filters";
+import { formatSkuSpecs } from "@/utils/specs";
 import { Message } from "@/utils/message";
 import { useAppStore } from "@/stores/app";
+import LiliDialog from "@/components/lili-dialog/index.vue";
 
 defineOptions({ name: "addGiftCardCashActivity" });
 
@@ -212,7 +227,9 @@ const activityDetail = ref({});
 
 const form = reactive({
   giftCardName: "",
-  cardType: "CASH",
+  cardType: route.query.cardType === "PICKUP" ? "PICKUP" : "CASH",
+  pickupMode: "ONE",
+  pickupCount: 1,
   faceValue: "",
   stockTotal: null,
   validityType: "LONG_TERM",
@@ -221,6 +238,19 @@ const form = reactive({
 });
 
 const formRef = ref(null);
+const pickupGoods = ref([]);
+const pickupSelector = ref(null);
+const coreLocked = computed(() => Number(activityDetail.value.stockTotal || 0) - Number(activityDetail.value.remainingStock ?? activityDetail.value.stockTotal ?? 0) > 0);
+/** 复用公共 SKU 选择器，取消不改变已确认商品。 */
+function openPickupGoods() {
+  pickupSelector.value.goodsData = pickupGoods.value.map(g => ({ ...g }));
+  pickupSelector.value.open('goods');
+}
+/** 选择确认时校验数量并按 SKU 去重，服务端仍执行完整校验。 */
+function confirmPickupGoods(rows) {
+  if (rows.length > 50) return Message.warning('最多选择 50 个 SKU');
+  pickupGoods.value = Array.from(new Map(rows.map(row => [String(row.id || row.skuId), { ...row, id: String(row.id || row.skuId) }])).values());
+}
 
 const onlyView = computed(() => {
   const q = route.query.onlyView;
@@ -232,13 +262,14 @@ const isEditMode = computed(() => {
 });
 
 const pageTitle = computed(() => {
+  const name = form.cardType === "PICKUP" ? "提货卡" : "现金卡";
   if (onlyView.value) {
-    return "查看礼品卡";
+    return `查看${name}`;
   }
   if (isEditMode.value) {
-    return "编辑礼品卡";
+    return `编辑${name}`;
   }
-  return "添加礼品卡";
+  return `添加${name}`;
 });
 
 const validityDisplayText = computed(() => {
@@ -288,7 +319,7 @@ const formRule = {
     { required: true, message: "活动名称不能为空", trigger: "blur" },
     { type: "string", max: 64, message: "活动名称过长", trigger: "blur" },
   ],
-  faceValue: [{ required: true, message: "请输入面额" }, { validator: checkFaceValue }],
+  faceValue: [{ validator: (rule, value, cb) => form.cardType === "PICKUP" ? cb() : checkFaceValue(rule, value, cb) }],
   stockTotal: [{ required: true, validator: validateStock, trigger: "blur" }],
 };
 
@@ -314,6 +345,8 @@ const loadDetail = (id) => {
       const d = res.result;
       form.giftCardName = d.giftCardName || "";
       form.cardType = d.cardType || "CASH";
+      form.pickupMode = d.pickupMode || "ONE"; form.pickupCount = d.pickupCount || 1;
+      pickupGoods.value = d.pickupGoods || [];
       form.faceValue =
         d.faceValue !== null && d.faceValue !== undefined ? String(d.faceValue) : "";
       form.stockTotal =
@@ -370,7 +403,10 @@ const buildPayload = () => {
   const payload = {
     giftCardName: (form.giftCardName || "").trim(),
     cardType: form.cardType || "CASH",
-    faceValue: parseFloat(form.faceValue),
+    faceValue: form.cardType === "PICKUP" ? 0 : parseFloat(form.faceValue),
+    pickupMode: form.cardType === "PICKUP" ? form.pickupMode : null,
+    pickupCount: form.pickupMode === "ALL" ? pickupGoods.value.length : form.pickupMode === "ONE" ? 1 : form.pickupCount,
+    pickupSkuIds: form.cardType === "PICKUP" ? pickupGoods.value.map(g => g.id) : null,
     validityType: form.validityType || "LONG_TERM",
     stockTotal: form.stockTotal,
   };
@@ -397,6 +433,9 @@ const handleSubmit = () => {
     if (!validateByValidityType()) {
       return;
     }
+    if (form.cardType === 'PICKUP' && (!pickupGoods.value.length || (form.pickupMode === 'ANY' && (!Number.isInteger(form.pickupCount) || form.pickupCount < 1 || form.pickupCount > pickupGoods.value.length)))) {
+      Message.warning('请选择兑换商品，并填写不超过商品种数的兑换数量'); return;
+    }
     submitLoading.value = true;
     const req = isEditMode.value
       ? updateGiftCardCashActivity(route.query.id, buildPayload())
@@ -426,6 +465,13 @@ watch(
   }
 );
 
+watch(
+  () => route.query.cardType,
+  (type) => {
+    if (!route.query.id) form.cardType = type === "PICKUP" ? "PICKUP" : "CASH";
+  }
+);
+
 watch(
   () => route.query.id,
   (id) => {
@@ -444,180 +490,59 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .gift-card-activity-page {
-  padding: 16px 20px;
+  padding: 28px 24px;
-  background-color: #f0f2f5;
-  min-height: 100vh;
   box-sizing: border-box;
-
+  .info-card { width: 100%; max-width: 1040px; margin: 0 auto; border: 1px solid var(--el-border-color-extra-light); border-radius: 8px; }
-  .mt_10 {
+  .info-card :deep(.el-card__header) { padding: 30px 40px 0; border-bottom: 0; }
-    margin-top: 12px;
+  .info-card :deep(.el-card__body) { padding: 28px 40px 32px; }
-  }
+  .page-header-row { max-width: 640px; margin: 0 auto; }
-
+  .header-title { display: flex; align-items: center; flex-wrap: wrap; gap: 12px; color: var(--el-text-color-primary); font-size: 20px; font-weight: 600; line-height: 28px; }
-  .font-mono {
+  .mode-tag { font-weight: normal; }
-    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  .activity-id { color: var(--el-text-color-secondary); font-size: 12px; font-weight: normal; }
-  }
+  .edit-form { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); gap: 24px 20px; max-width: 640px; margin: 0 auto; }
-
+  .full-row { grid-column: 1 / -1; }
-  .font-semibold {
+  .edit-form :deep(.el-form-item) { min-width: 0; margin: 0; }
-    font-weight: 600;
+  .edit-form :deep(.el-form-item__label) { margin-bottom: 10px; padding: 0; font-size: 14px; line-height: 20px; color: var(--el-text-color-regular); }
-  }
+  .edit-form :deep(.el-form-item__content) { min-width: 0; }
-
+  .edit-form :deep(.el-input__wrapper) { border-radius: 5px; }
-  .text-dark {
+  .form-control { width: 100%; max-width: 100%; }
-    color: #303133;
+  .input-tip-text { margin-left: 12px; font-size: 12px; color: var(--el-text-color-secondary); }
-  }
+  .unit-control { display: flex; align-items: stretch; }
-
+  .unit-control :deep(.el-input-number) { flex: 1; width: 0; min-width: 0; }
-  .text-secondary {
+  .unit-control :deep(.el-input__wrapper) { border-radius: 5px 0 0 5px; }
-    color: #606266;
+  .unit-control :deep(.el-input__inner) { text-align: left; }
-  }
+  .unit-addon { display: flex; align-items: center; flex-shrink: 0; padding: 0 14px; border: 1px solid var(--el-border-color); border-left: 0; border-radius: 0 5px 5px 0; color: var(--el-text-color-regular); background: var(--el-fill-color-light); box-sizing: border-box; font-size: 14px; }
-
+  .validity-control { width: 100%; min-width: 0; }
-  .header-card {
+  .validity-radio-group { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 12px; width: 100%; }
-    border: none;
+  .validity-radio-group :deep(.el-radio) { display: flex; justify-content: center; height: 48px; margin: 0; padding: 0 12px; border: 1px solid var(--el-border-color); border-radius: 6px; box-sizing: border-box; transition: border-color .15s, background-color .15s; }
-    border-radius: 4px;
+  .validity-radio-group :deep(.el-radio:hover:not(.is-disabled)) { border-color: var(--el-color-primary-light-5); }
-
+  .validity-radio-group :deep(.el-radio.is-checked) { border-color: var(--el-color-primary); background: var(--el-color-primary-light-9); }
-    :deep(.el-card__body) {
+  .validity-radio-group :deep(.el-radio__label) { font-size: 14px; }
-      padding: 16px 20px;
+  .validity-detail { display: flex; margin-top: 12px; padding: 16px; background: #f7f9fc; border: 1px solid var(--el-border-color-extra-light); border-radius: 6px; }
-    }
+  .month-control { width: 200px; max-width: 100%; }
-
+  .validity-date-control { width: 100%; max-width: 360px; }
-    .page-header-row {
+  .footer-actions { display: flex; flex-wrap: wrap; gap: 12px; max-width: 640px; margin: 32px auto 0; padding-top: 24px; border-top: 1px solid var(--el-border-color-lighter); }
-      display: flex;
+  .footer-actions :deep(.el-button) { min-width: 88px; height: 36px; border-radius: 5px; }
-      align-items: center;
+  .footer-actions :deep(.el-button + .el-button) { margin-left: 0; }
-      justify-content: space-between;
+  .font-mono { font-variant-numeric: tabular-nums; }
-
+  .font-semibold { font-weight: 600; }
-      .header-left {
+  .text-dark { color: var(--el-text-color-primary); }
-        .header-title {
+  .text-secondary { color: var(--el-text-color-regular); }
-          display: flex;
+  .custom-descriptions :deep(.el-descriptions__label) { width: 130px; font-weight: normal; }
-          align-items: center;
+  .price-highlight { color: var(--el-text-color-primary); }
-          gap: 12px;
+  &.pickup-page .info-card { max-width: 1200px; }
-          font-size: 18px;
+  &.pickup-page .page-header-row, &.pickup-page .edit-form, &.pickup-page .footer-actions { max-width: none; }
-          font-weight: 600;
+  &.pickup-page .stock-form-item { max-width: 420px; }
-          color: #1f2d3d;
+}
-
+@media (max-width: 760px) {
-          .mode-tag {
+  .gift-card-activity-page {
-            font-weight: normal;
+    padding: 16px 12px;
-          }
+    .info-card :deep(.el-card__header) { padding: 24px 20px 0; }
-
+    .info-card :deep(.el-card__body) { padding: 24px 20px; }
-          .activity-id {
+    .edit-form { grid-template-columns: minmax(0, 1fr); }
-            font-size: 13px;
+    .validity-radio-group { grid-template-columns: minmax(0, 1fr); gap: 8px; }
-            color: #909399;
+    .validity-radio-group :deep(.el-radio) { justify-content: flex-start; height: 40px; }
-            font-weight: normal;
+    .validity-detail { padding: 12px; }
-          }
-        }
-      }
-    }
-  }
-
-  .info-card {
-    border: none;
-    border-radius: 4px;
-
-    :deep(.el-card__body) {
-      padding: 20px;
-    }
-
-    .section-header {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      margin-bottom: 16px;
-
-      .section-indicator {
-        width: 4px;
-        height: 16px;
-        background-color: #409eff;
-        border-radius: 2px;
-      }
-
-      .section-title {
-        font-size: 15px;
-        font-weight: 600;
-        color: #303133;
-      }
-    }
-
-    .custom-descriptions {
-      :deep(.el-descriptions__label) {
-        width: 130px;
-        background-color: #f8f9fb;
-        color: #606266;
-        font-weight: 500;
-      }
-
-      :deep(.el-descriptions__content) {
-        color: #303133;
-      }
-
-      .price-highlight {
-        color: #f56c6c;
-        font-size: 16px;
-      }
-
-      .hint-inline {
-        font-size: 12px;
-        color: #909399;
-        margin-left: 6px;
-      }
-    }
-
-    .edit-form {
-      padding: 8px 12px;
-
-      .input-tip-text {
-        font-size: 13px;
-        color: #909399;
-        margin-left: 10px;
-      }
-
-      .validity-radio-group {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 12px;
-        width: 100%;
-
-        .validity-row {
-          display: flex;
-          align-items: center;
-
-          :deep(.el-radio) {
-            margin-right: 0;
-            display: inline-flex;
-            align-items: center;
-          }
-
-          :deep(.el-radio__label) {
-            display: inline-flex;
-            align-items: center;
-          }
-
-          .radio-inline-text {
-            font-size: 14px;
-          }
-
-          .validity-input-num {
-            width: 130px;
-            margin: 0 10px;
-          }
-
-          .validity-date-picker {
-            margin-left: 10px;
-          }
-        }
-      }
-    }
-  }
-
-  .footer-card {
-    border: none;
-    border-radius: 4px;
-
-    :deep(.el-card__body) {
-      padding: 16px 20px;
-    }
-
-    .footer-actions {
-      display: flex;
-      justify-content: center;
-      gap: 16px;
-    }
   }
 }
 </style>

manager/src/views/promotions/gift-card-cash/gift-card-cash-activity.vue

@@ -25,7 +25,8 @@
 
     <el-card>
       <div class="operation padding-row">
-        <el-button type="primary" @click="addActivity">添加礼品卡</el-button>
+        <el-button type="primary" @click="addActivity('PICKUP')">添加提货卡</el-button>
+        <el-button type="primary" @click="addActivity('CASH')">添加现金卡</el-button>
       </div>
 
       <el-table
@@ -45,10 +46,11 @@
           <template #default="{ row }">
             <span v-if="row">
               <span
-                v-if="row.faceValue != null && row.faceValue !== ''"
+                v-if="row.cardType !== 'PICKUP' && row.faceValue != null && row.faceValue !== ''"
                 :style="{ color: $mainColor }"
               >
                 {{ $filters.unitPrice(row.faceValue, "￥") }}</span>
+              <span v-else-if="row.cardType === 'PICKUP'">兑换 {{ row.pickupCount }} 种</span>
               <span v-else>-</span>
             </span>
           </template>
@@ -387,8 +389,9 @@ function formatValidity(row) {
   }
   return parts.join(" ");
 }
-function addActivity() {
+/** 从独立入口创建指定类型的卡，类型在创建页固定展示。 */
-  router.push({ name: "add-gift-card-cash-activity" });
+function addActivity(cardType) {
+  router.push({ name: "add-gift-card-cash-activity", query: { cardType } });
 }
 function goEdit(row) {
   if (!canEdit(row)) {

manager/src/views/promotions/gift-card-cash/gift-card-cash-batch-credentials.vue

@@ -2,52 +2,56 @@
   <div class="search gcc-batch-credentials">
     <el-card>
       <div class="gcc-records-toolbar">
-        <el-button type="primary" class="gcc-records-back" @click="closePage">返回</el-button>
+        <div class="gcc-batch-heading">
-      </div>
+          <h3>{{ giftCardName || "批次凭证" }}</h3>
-      <div v-if="giftCardName" class="gcc-records-meta mb_10">
+          <div class="gcc-records-meta">
-        <strong>礼品卡：</strong>{{ giftCardName }}
+            <span>{{ batchTypeLabel }}：{{ batchIdDisplay || "—" }}</span>
-      </div>
+            <span v-if="batchRemark">本批备注：{{ batchRemark }}</span>
-      <div class="gcc-records-meta mb_10">
+          </div>
-        <strong>{{ batchTypeLabel }}：</strong>{{ batchIdDisplay || "—" }}
+        </div>
-        <span v-if="batchRemark" style="margin-left: 12px">
+        <div class="gcc-batch-actions">
-          <strong>本批备注：</strong>{{ batchRemark }}</span>
+          <el-button
+            v-if="activityId && createBatchId && !isIssueBatchMode"
+            type="primary"
+            :loading="exporting"
+            title="导出当前制卡批次全部卡号、卡密，不受筛选和分页限制"
+            @click="handleExport"
+          >导出卡密</el-button>
+          <el-button @click="closePage">返回</el-button>
+        </div>
       </div>
       <el-alert v-if="!activityId || !hasBatchId" type="warning" show-icon :closable="false">
         缺少活动或批次参数，请从{{ batchSourceLabel }}进入。
       </el-alert>
       <template v-else>
-        <div class="gcc-status-tabs">
+        <el-tabs :model-value="lifecycleTab" class="gcc-status-tabs" @tab-change="onLifecycleTab">
-          <span
+          <el-tab-pane
             v-for="t in statusTabList"
             :key="t.key"
-            :class="{ active: lifecycleTab === t.key }"
+            :name="t.key"
-            @click="onLifecycleTab(t.key)"
+            :label="t.label"
-          >
+          />
-            {{ t.label }}</span>
+        </el-tabs>
-        </div>
+        <el-form ref="searchFormRef" :model="searchForm" label-width="72px" class="gcc-filter-form">
-        <el-form ref="searchFormRef" :model="searchForm" inline class="search-form mb_10 gcc-filter-form">
+          <el-form-item label="卡号" prop="cardNo">
-          <el-form-item label="卡号" prop="cardNo" label-width="60px">
             <el-input
               v-model="searchForm.cardNo"
               placeholder="请输入卡号"
               clearable
-              style="width: 160px"
             />
           </el-form-item>
-          <el-form-item label-width="0" class="gcc-combo-item">
+          <el-form-item label="兑换会员" class="gcc-combo-item">
-            <span class="gcc-combo-label">兑换会员</span>
+            <el-select v-model="searchForm.redeemMemberField" aria-label="兑换会员查询方式">
-            <el-select v-model="searchForm.redeemMemberField" style="width: 130px">
+              <el-option label="昵称" value="nickName" />
-              <el-option label="兑换会员昵称" value="nickName" />
+              <el-option label="手机号" value="mobile" />
-              <el-option label="兑换会员手机" value="mobile" />
             </el-select>
             <el-input
               v-model="searchForm.redeemMemberKeyword"
               placeholder="请输入"
               clearable
-              style="width: 140px; margin-left: 4px"
             />
           </el-form-item>
-          <el-form-item label="兑换时间" prop="redeemDateRange" label-width="72px">
+          <el-form-item label="兑换时间" prop="redeemDateRange">
             <el-date-picker
               v-model="redeemDateRange"
               type="daterange"
@@ -55,23 +59,20 @@
               value-format="YYYY-MM-DD"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              style="width: 240px"
             />
           </el-form-item>
-          <el-form-item label-width="0" class="gcc-combo-item">
+          <el-form-item label="激活会员" class="gcc-combo-item">
-            <span class="gcc-combo-label">激活会员</span>
+            <el-select v-model="searchForm.activateMemberField" aria-label="激活会员查询方式">
-            <el-select v-model="searchForm.activateMemberField" style="width: 130px">
+              <el-option label="昵称" value="nickName" />
-              <el-option label="激活会员昵称" value="nickName" />
+              <el-option label="手机号" value="mobile" />
-              <el-option label="激活会员手机" value="mobile" />
             </el-select>
             <el-input
               v-model="searchForm.activateMemberKeyword"
               placeholder="请输入"
               clearable
-              style="width: 140px; margin-left: 4px"
             />
           </el-form-item>
-          <el-form-item label="激活时间" prop="activateDateRange" label-width="72px">
+          <el-form-item label="激活时间" prop="activateDateRange">
             <el-date-picker
               v-model="activateDateRange"
               type="daterange"
@@ -79,10 +80,11 @@
               value-format="YYYY-MM-DD"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              style="width: 240px"
             />
           </el-form-item>
-          <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
+          <el-form-item label-width="0" class="gcc-filter-actions">
+            <el-button type="primary" @click="handleSearch">搜索</el-button>
+          </el-form-item>
         </el-form>
 
         <el-table v-if="!isIssueBatchMode" v-loading="loading" :data="data" style="width: 100%">
@@ -90,12 +92,19 @@
           <el-table-column prop="cardSecret" label="卡密" min-width="120" show-overflow-tooltip />
           <el-table-column label="面额" prop="faceValue" width="90" align="right">
             <template #default="{ row }">
-              <span v-if="row">{{ formatPrice(row.faceValue) }}</span>
+              <template v-if="row">
+                <span v-if="row.cardType === 'PICKUP'">提货权益</span>
+                <priceColorScheme v-else-if="hasValue(row.faceValue)" :value="row.faceValue" :color="$mainColor" />
+                <span v-else>—</span>
+              </template>
             </template>
           </el-table-column>
           <el-table-column label="余额" prop="balance" width="90" align="right">
             <template #default="{ row }">
-              <span v-if="row">{{ formatPrice(row.balance) }}</span>
+              <template v-if="row">
+                <priceColorScheme v-if="row.cardType !== 'PICKUP' && hasValue(row.balance)" :value="row.balance" :color="$mainColor" />
+                <span v-else>—</span>
+              </template>
             </template>
           </el-table-column>
           <el-table-column label="状态" prop="status" width="90" align="center">
@@ -143,14 +152,13 @@
           </el-table-column>
         </el-table>
 
-        <div class="mt_10" style="display: flex; justify-content: flex-end">
+        <div class="gcc-pagination">
           <el-pagination
             v-model:current-page="searchForm.pageNumber"
             v-model:page-size="searchForm.pageSize"
             :page-sizes="[20, 50, 100]"
             :total="total"
             layout="total, sizes, prev, pager, next, jumper"
-            size="small"
             @current-change="changePage"
             @size-change="changePageSize"
           />
@@ -163,8 +171,9 @@
 <script setup>
 import { computed, onMounted, reactive, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { getGiftCardCashCredentialPage } from "@/api/promotion";
+import { exportGiftCardCashCreateBatch, getGiftCardCashCredentialPage } from "@/api/promotion";
-import { unitPrice } from "@/utils/filters";
+import { downloadBlob } from "@/utils/downloadBlob";
+import { Message } from "@/utils/message";
 import { useAppStore } from "@/stores/app";
 
 const route = useRoute();
@@ -177,6 +186,7 @@ const STATUS_LABEL = {
   UNACTIVATED: "未激活",
   BOUND: "已激活",
   ACTIVATED: "已激活",
+  REDEEMED: "已提货",
   VOIDED: "已销卡",
   EXPIRED: "已过期",
 };
@@ -206,10 +216,12 @@ const statusTabList = ref([
   { key: "activated", label: "已激活", status: "BOUND" },
   { key: "cancelled", label: "已销卡", status: "VOIDED" },
   { key: "expired", label: "已过期", status: "EXPIRED" },
+  { key: "redeemed", label: "已提货", status: "REDEEMED" },
 ]);
 const redeemDateRange = ref([]);
 const activateDateRange = ref([]);
 const loading = ref(false);
+const exporting = ref(false);
 const total = ref(0);
 const data = ref([]);
 const searchForm = reactive({
@@ -267,11 +279,9 @@ watch(
   }
 );
 
-function formatPrice(value) {
+/** 判断金额是否存在，保留零金额的有效展示。 */
-  if (value === null || value === undefined || value === "") {
+function hasValue(value) {
-    return "—";
+  return value !== null && value !== undefined && value !== "";
-  }
-  return unitPrice(value, "￥");
 }
 function formatStatus(status) {
   return STATUS_LABEL[status] || status || "—";
@@ -307,6 +317,30 @@ function closePage() {
   localStorage.pageOpenedList = JSON.stringify(appStore.pageOpenedList);
   router.go(-1);
 }
+/** 导出当前制卡批次全部凭证，复用后端 Excel 接口；错误响应不保存为文件。 */
+async function handleExport() {
+  if (exporting.value || !activityId.value || !createBatchId.value || isIssueBatchMode.value) return;
+  const batchId = createBatchId.value;
+  exporting.value = true;
+  try {
+    const blob = await exportGiftCardCashCreateBatch(batchId);
+    if (!(blob instanceof Blob) || !blob.size) {
+      Message.error(blob?.message || "导出失败，请重试");
+      return;
+    }
+    if (blob.type.includes("json")) {
+      const result = JSON.parse(await blob.text());
+      Message.error(result.message || "导出失败，请重试");
+      return;
+    }
+    downloadBlob(blob, `制卡导出_${batchId}.xlsx`);
+    Message.success("已开始下载");
+  } catch {
+    Message.error("导出失败，请重试");
+  } finally {
+    exporting.value = false;
+  }
+}
 function formatMemberText(name, mobile) {
   const n = name != null && name !== "" ? String(name) : "";
   const m = mobile != null && mobile !== "" ? String(mobile) : "";
@@ -474,64 +508,83 @@ function loadList() {
 </script>
 
 <style scoped>
-.gcc-batch-credentials .gcc-records-toolbar {
+.gcc-records-toolbar {
-  margin-bottom: 22px;
-  padding-bottom: 16px;
-  border-bottom: 1px solid #e8eaec;
-}
-.gcc-batch-credentials .gcc-records-back {
-  font-weight: 500;
-}
-.gcc-batch-credentials .gcc-records-meta {
-  line-height: 1.6;
-  color: #515a6e;
-}
-.gcc-batch-credentials .gcc-status-tabs {
   display: flex;
-  flex-wrap: wrap;
+  align-items: flex-start;
-  align-items: center;
+  justify-content: space-between;
-  border-bottom: 1px solid #e8eaec;
+  gap: 20px;
   margin-bottom: 16px;
-  gap: 4px 8px;
 }
-.gcc-batch-credentials .gcc-status-tabs span {
+.gcc-batch-heading {
-  padding: 10px 14px 12px;
+  min-width: 0;
-  cursor: pointer;
-  color: #808695;
-  font-size: 14px;
-  position: relative;
-  user-select: none;
 }
-.gcc-batch-credentials .gcc-status-tabs span:hover {
+.gcc-batch-actions {
-  color: #515a6e;
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
 }
-.gcc-batch-credentials .gcc-status-tabs span.active {
+.gcc-batch-heading h3 {
-  color: #ff6600;
+  margin: 0 0 10px;
-  font-weight: 500;
+  color: #303133;
+  font-size: 16px;
+  font-weight: 600;
+  overflow-wrap: anywhere;
 }
-.gcc-batch-credentials .gcc-status-tabs span.active::after {
+.gcc-records-meta {
-  content: "";
-  position: absolute;
-  left: 10px;
-  right: 10px;
-  bottom: 0;
-  height: 3px;
-  background: #ff6600;
-  border-radius: 2px 2px 0 0;
-}
-.gcc-batch-credentials .gcc-filter-form {
   display: flex;
   flex-wrap: wrap;
-  align-items: flex-end;
+  gap: 8px 24px;
+  color: #909399;
+  font-size: 13px;
+  line-height: 1.6;
+  overflow-wrap: anywhere;
 }
-.gcc-batch-credentials .gcc-combo-item {
+.gcc-status-tabs {
-  margin-right: 12px;
+  margin-bottom: 16px;
 }
-.gcc-batch-credentials .gcc-combo-label {
+.gcc-status-tabs :deep(.el-tabs__header) {
-  display: inline-block;
+  margin-bottom: 0;
-  margin-right: 6px;
+}
-  color: #515a6e;
+.gcc-filter-form {
-  font-size: 14px;
+  display: grid;
-  vertical-align: middle;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  align-items: start;
+  gap: 16px 24px;
+  margin-bottom: 20px;
+}
+.gcc-filter-form :deep(.el-form-item) {
+  margin: 0;
+  min-width: 0;
+}
+.gcc-filter-form :deep(.el-form-item__content) {
+  flex-wrap: nowrap;
+  min-width: 0;
+  gap: 8px;
+}
+.gcc-filter-form :deep(.el-input),
+.gcc-filter-form :deep(.el-date-editor) {
+  width: 100%;
+  min-width: 0;
+}
+.gcc-combo-item :deep(.el-select) {
+  flex: 0 0 88px;
+  width: 88px;
+}
+.gcc-combo-item :deep(.el-input) {
+  flex: 1;
+}
+.gcc-filter-actions :deep(.el-form-item__content) {
+  padding-left: 72px;
+}
+.gcc-pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
+  overflow-x: auto;
+}
+@media (max-width: 600px) {
+  .gcc-filter-form {
+    grid-template-columns: minmax(0, 1fr);
+  }
 }
 </style>

manager/src/views/promotions/gift-card-cash/gift-card-cash-records.vue

@@ -261,6 +261,7 @@
               <el-form-item label="交易类型" prop="transactionType">
                 <el-select v-model="usageSearchForm.transactionType" clearable style="width: 150px">
                   <el-option label="订单抵扣" value="ORDER_DEDUCT" />
+                  <el-option label="提货兑换" value="PICKUP_REDEEM" />
                   <el-option label="订单退款" value="ORDER_REFUND" />
                   <el-option label="订单取消" value="ORDER_CANCEL" />
                 </el-select>
@@ -277,7 +278,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="cardNo" label="卡号" min-width="150" show-overflow-tooltip />
-              <el-table-column label="现金卡信息" min-width="180">
+              <el-table-column label="礼品卡信息" min-width="180">
                 <template #default="{ row }">
                   <template v-if="row">
                     <div>{{ formatUsageGiftCardName(row) }}</div>
@@ -403,6 +404,7 @@ const issueSearchForm = reactive({
 const usageLoading = ref(false);
 const usageTotal = ref(0);
 const usageData = ref([]);
+let usageRequestId = 0;
 const usageSearchForm = reactive({
   pageNumber: 1,
   pageSize: 20,
@@ -446,7 +448,7 @@ function formatExpireTime(v) {
 }
 
 function formatUsageGiftCardName(row) {
-  return row.giftCardName || giftCardName.value || "-";
+  return row.giftCardName || "-";
 }
 
 function formatUsageFaceValue(row) {
@@ -703,12 +705,13 @@ function formatUsageBizType(type) {
     ORDER_REFUND: "订单退款",
     ORDER_CANCEL: "订单取消",
     CARD_ACTIVATE: "卡激活",
+    PICKUP_REDEEM: "提货兑换",
   };
   return map[type] || type || "-";
 }
 
 function getUsageAmountDisplay(row) {
-  const raw =
+  const raw = row.bizType === "PICKUP_REDEEM" || row.transactionType === "PICKUP_REDEEM" ? row.deductAmount :
     row.changeAmount != null && row.changeAmount !== "" ? row.changeAmount : row.deductAmount;
   if (raw === null || raw === undefined || raw === "") {
     return null;
@@ -728,11 +731,16 @@ function getUsageAmountDisplay(row) {
 }
 
 function loadUsageRecordList() {
+  const requestId = ++usageRequestId;
+  usageData.value = [];
+  usageTotal.value = 0;
   if (!activityId.value) {
+    usageLoading.value = false;
     return;
   }
   usageLoading.value = true;
   const params = {
+    activityId: activityId.value,
     pageNumber: usageSearchForm.pageNumber,
     pageSize: usageSearchForm.pageSize,
     sort: usageSearchForm.sort,
@@ -749,6 +757,7 @@ function loadUsageRecordList() {
   );
   getGiftCardCashUsageRecordPage(params)
     .then((res) => {
+      if (requestId !== usageRequestId || params.activityId !== activityId.value) return;
       usageLoading.value = false;
       if (res.success && res.result) {
         const r = res.result;
@@ -757,6 +766,7 @@ function loadUsageRecordList() {
       }
     })
     .catch(() => {
+      if (requestId !== usageRequestId || params.activityId !== activityId.value) return;
       usageLoading.value = false;
     });
 }

manager/src/views/sys/message/sms.vue

@@ -1,701 +0,0 @@
-<template>
-  <div class="search">
-    <el-card>
-      <el-tabs v-model="activeTab" class="sms-tabs" @tab-change="paneChange">
-        <el-tab-pane label="发送任务列表" name="LIST">
-          <div class="operation" style="margin-bottom: 10px">
-            <el-button type="primary" @click="sendBatchSmsModal">发送短信</el-button>
-          </div>
-          <el-table v-loading="loading" border :data="smsData" style="width: 100%">
-            <el-table-column prop="smsName" label="模板名称" width="250" />
-            <el-table-column prop="signName" label="签名" width="150" />
-            <el-table-column prop="context" label="短信内容" min-width="300" show-overflow-tooltip />
-            <el-table-column prop="num" label="预计发送条数" width="140" />
-            <el-table-column label="操作" width="120" align="center" fixed="right">
-              <template #default="{ row }">
-                <a v-if="row" class="link-text" @click="detail(row)">详细</a>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="mt_10" style="display: flex; justify-content: flex-end">
-            <el-pagination
-              v-model:current-page="smsSearchForm.pageNumber"
-              v-model:page-size="smsSearchForm.pageSize"
-              :total="smsTotal"
-              :page-sizes="[20, 50, 100]"
-              layout="total, sizes, prev, pager, next, jumper"
-              size="small"
-              @current-change="smsChangePage"
-              @size-change="smsChangePageSize"
-            />
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="短信模板" name="TEMPLATE">
-          <div class="operation" style="margin-bottom: 10px">
-            <el-button type="primary" @click="addTemplate">添加短信模板</el-button>
-            <el-button type="info" @click="syncTemplate">同步</el-button>
-          </div>
-          <el-table v-loading="loading" border :data="templateData" style="width: 100%">
-            <el-table-column prop="templateCode" label="模板code" min-width="120" />
-            <el-table-column prop="templateName" label="模板名称" min-width="140" />
-            <el-table-column prop="templateContent" label="模板内容" min-width="200" show-overflow-tooltip />
-            <el-table-column label="状态" width="120" align="center">
-              <template #default="{ row }">
-                <span v-if="row">{{ templateStatusText(row.templateStatus) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="200" align="center" fixed="right">
-              <template #default="{ row }">
-                <template v-if="row">
-                  <a
-                    class="link-text"
-                    :class="{ disabled: row.templateStatus != 2 }"
-                    @click="row.templateStatus == 2 && editTemplate(row)"
-                  >
-                    编辑
-                  </a>
-                  <span class="op-split">|</span>
-                  <a
-                    class="link-text"
-                    :class="{ disabled: row.templateStatus == 0 }"
-                    @click="row.templateStatus != 0 && deleteSmsTemplate(row)"
-                  >
-                    删除
-                  </a>
-                </template>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="mt_10" style="display: flex; justify-content: flex-end">
-            <el-pagination
-              v-model:current-page="templateSearchForm.pageNumber"
-              v-model:page-size="templateSearchForm.pageSize"
-              :total="templateTotal"
-              :page-sizes="[20, 50, 100]"
-              layout="total, sizes, prev, pager, next, jumper"
-              size="small"
-              @current-change="templateChangePage"
-              @size-change="templateChangePageSize"
-            />
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="短信签名" name="SIGN">
-          <div class="operation" style="margin-bottom: 10px">
-            <el-button type="primary" @click="addSign">添加短信签名</el-button>
-            <el-button type="info" @click="syncSign">同步</el-button>
-          </div>
-          <el-table v-loading="loading" border :data="signData" style="width: 100%">
-            <el-table-column prop="signName" label="签名名称" min-width="140" />
-            <el-table-column prop="remark" label="申请说明" min-width="160" show-overflow-tooltip />
-            <el-table-column label="状态" width="160" align="center">
-              <template #default="{ row }">
-                <template v-if="row">
-                  <template v-if="row.signStatus == 2">
-                    审核拒绝
-                    <el-popover trigger="hover" :content="row.reason" placement="top-start" width="200">
-                      <template #reference>
-                        <span style="color: #ed3f14; cursor: pointer">【原因】</span>
-                      </template>
-                    </el-popover>
-                  </template>
-                  <span v-else-if="row.signStatus == 0">审核中</span>
-                  <span v-else-if="row.signStatus == 1">审核通过</span>
-                </template>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="200" align="center" fixed="right">
-              <template #default="{ row }">
-                <template v-if="row">
-                  <a
-                    class="link-text"
-                    :class="{ disabled: row.signStatus != 2 }"
-                    @click="row.signStatus == 2 && editSign(row)"
-                  >
-                    编辑
-                  </a>
-                  <span class="op-split">|</span>
-                  <a
-                    class="link-text"
-                    :class="{ disabled: row.signStatus == 0 }"
-                    @click="row.signStatus != 0 && deleteSmsSign(row)"
-                  >
-                    删除
-                  </a>
-                </template>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="mt_10" style="display: flex; justify-content: flex-end">
-            <el-pagination
-              v-model:current-page="signSearchForm.pageNumber"
-              v-model:page-size="signSearchForm.pageSize"
-              :total="signTotal"
-              :page-sizes="[20, 50, 100]"
-              layout="total, sizes, prev, pager, next, jumper"
-              size="small"
-              @current-change="signChangePage"
-              @size-change="signChangePageSize"
-            />
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-
-    <el-dialog
-      v-model="templateModalVisible"
-      :title="templateModalTitle"
-      width="520px"
-      :close-on-click-modal="false"
-      destroy-on-close
-    >
-      <el-form ref="templateFormRef" :model="templateForm" label-width="100px" :rules="templateFormValidate">
-        <el-form-item label="模板名称" prop="templateName">
-          <el-input v-model="templateForm.templateName" maxlength="30" clearable placeholder="请输入模板名称，不超过30字符" />
-        </el-form-item>
-        <el-form-item label="模板内容" prop="templateContent">
-          <el-input
-            v-model="templateForm.templateContent"
-            type="textarea"
-            maxlength="200"
-            :rows="5"
-            show-word-limit
-            placeholder="请输入短信内容"
-          />
-        </el-form-item>
-        <el-form-item label="申请说明" prop="remark">
-          <el-input
-            v-model="templateForm.remark"
-            type="textarea"
-            maxlength="150"
-            :rows="4"
-            show-word-limit
-            placeholder="请描述您的业务使用场景"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="templateModalVisible = false">取消</el-button>
-        <el-button type="primary" :loading="submitLoading" @click="templateSubmit">提交</el-button>
-      </template>
-    </el-dialog>
-
-    <el-dialog
-      v-model="sendSmsModal"
-      :title="sendSmsModalTitle"
-      width="1100px"
-      :close-on-click-modal="false"
-      destroy-on-close
-    >
-      <div class="send-setting">
-        <div class="left-show" v-html="smsContent"></div>
-        <div class="sms">效果预览</div>
-        <div class="send-form">
-          <el-form ref="smsFormRef" :model="smsForm" label-width="100px" :rules="smsFormValidate">
-            <el-form-item label="短信签名" prop="signName">
-              <el-select v-model="smsForm.signName" style="width: 35%" @change="selectSmsSign">
-                <el-option
-                  v-for="item in smsSigns"
-                  :key="item.signName"
-                  :label="item.signName"
-                  :value="item.signName"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="短信模板" prop="messageCode">
-              <el-select v-model="smsForm.messageCode" style="width: 35%" @change="selectSmsTemplate">
-                <el-option
-                  v-for="(item, index) in smsTemplates"
-                  :key="index"
-                  :label="item.templateName"
-                  :value="item.templateCode"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="短信内容" prop="context">
-              <el-input
-                v-model="smsForm.context"
-                type="textarea"
-                maxlength="50"
-                :rows="4"
-                show-word-limit
-                disabled
-              />
-            </el-form-item>
-            <el-form-item label="接收人" prop="smsRange">
-              <p>
-                已选<span style="color: #f56c1d"> {{ memberNum }}</span>人，预计耗费条数<span style="color: #f56c1d">
-                  {{ smsForm.num }}条</span
-                >
-              </p>
-              <el-radio-group v-model="smsForm.smsRange" @change="smsRangeChange">
-                <el-radio value="1">全部会员</el-radio>
-                <el-radio value="2">自定义选择</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item v-if="customSms" label-width="0" class="choose-member-item">
-              <div class="choose-member">
-                <div class="source-member">
-                  <el-input
-                    v-model="memberSearchParam.mobile"
-                    placeholder="请输入手机号码"
-                    clearable
-                    @keyup.enter="memberSearch"
-                    @blur="memberSearch"
-                  >
-                    <template #append>
-                      <el-button @click="memberSearch">搜索</el-button>
-                    </template>
-                  </el-input>
-                  <el-scrollbar height="280px" class="member-scroll" @scroll="onMemberScroll">
-                    <div v-for="(item, index) in members" :key="index" class="scroll-card">
-                      <el-button
-                        class="btns"
-                        :class="{ active: item.____selected }"
-                        style="width: 100%; text-align: left"
-                        @click="moveMember(index, item)"
-                      >
-                        <span v-if="item.mobile" class="mobile">{{ item.mobile }}</span>
-                        <span class="nickname">{{ item.nickName }}</span>
-                      </el-button>
-                    </div>
-                  </el-scrollbar>
-                </div>
-                <div class="traget-member">
-                  <el-tag
-                    v-for="(item, index) in alreadyCheckShow"
-                    :key="index"
-                    closable
-                    class="checkbox-tag"
-                    @close="alreadyCheckClose(item, index)"
-                  >
-                    {{ item.mobile || item.nickName }}
-                  </el-tag>
-                </div>
-              </div>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <template #footer>
-        <el-button @click="sendSmsModal = false">取消</el-button>
-        <el-button type="primary" :loading="submitLoading" @click="sendSms">发送</el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import { ElMessage, ElMessageBox } from "element-plus";
-import * as API_Setting from "@/api/setting.js";
-import * as API_Member from "@/api/member.js";
-
-defineOptions({ name: "sms" });
-
-const router = useRouter();
-
-const activeTab = ref("LIST");
-const loading = ref(false);
-const customSms = ref(false);
-const alreadyCheck = ref([]);
-const alreadyCheckShow = ref([]);
-const memberPage = ref(0);
-const members = ref([]);
-const smsTemplateContent = ref("");
-const memberNum = ref(0);
-const smsContent = ref("<div class='sms'>效果预览</div>");
-const smsTemplates = ref([]);
-const smsSigns = ref([]);
-const sendSmsModal = ref(false);
-const sendSmsModalTitle = ref("短信发送");
-const modalType = ref(0);
-const templateModalVisible = ref(false);
-const templateModalTitle = ref("");
-const templateForm = ref({});
-const submitLoading = ref(false);
-const signSearchForm = reactive({ pageNumber: 1, pageSize: 20 });
-const templateSearchForm = reactive({ pageNumber: 1, pageSize: 20 });
-const memberSearchFrom = reactive({ disabled: "OPEN" });
-const memberSearchParam = reactive({
-  pageNumber: 1,
-  pageSize: 8,
-  disabled: "OPEN",
-});
-const smsSearchForm = reactive({
-  sort: "createTime",
-  order: "desc",
-  pageNumber: 1,
-  pageSize: 20,
-});
-const smsForm = ref({
-  smsName: "",
-  signName: "",
-  context: "",
-  smsRange: "1",
-  num: 0,
-  messageCode: "",
-});
-const smsFormValidate = reactive({
-  signName: [{ required: true, message: "请选择短信签名", trigger: "change" }],
-  messageCode: [{ required: true, message: "请选择短信模板", trigger: "change" }],
-});
-const templateFormValidate = reactive({
-  templateName: [{ required: true, message: "请输入短信模板名称", trigger: "blur" }],
-  templateContent: [{ required: true, message: "请输入短信模板内容", trigger: "blur" }],
-  remark: [{ required: true, message: "请输入短信模板申请说明", trigger: "blur" }],
-});
-const smsData = ref([]);
-const smsTotal = ref(0);
-const templateData = ref([]);
-const templateTotal = ref(0);
-const signData = ref([]);
-const signTotal = ref(0);
-const memberLoadingMore = ref(false);
-
-const smsFormRef = ref(null);
-const templateFormRef = ref(null);
-
-function templateStatusText(status) {
-  const map = { 0: "审核中", 1: "审核通过", 2: "审核失败" };
-  return map[status] ?? map[String(status)] ?? "-";
-}
-function init() {
-  getSms();
-  getMemberNum();
-}
-function getMemberNum() {
-  API_Member.getMemberNum(memberSearchFrom).then((res) => {
-    if (res.success) {
-      memberNum.value = res.result;
-      smsForm.value.num = memberNum.value;
-    }
-  });
-}
-function alreadyCheckClose(val, index) {
-  alreadyCheck.value.splice(index, 1);
-  alreadyCheckShow.value.splice(index, 1);
-  members.value.forEach((item) => {
-    if (item.____selected && item.mobile == val.mobile) {
-      item.____selected = false;
-    }
-  });
-  smsForm.value.num--;
-  memberNum.value--;
-}
-function detail() {}
-function smsRangeChange(v) {
-  memberNum.value = 0;
-  smsForm.value.num = 0;
-  if (v == 1) {
-    alreadyCheck.value = [];
-    alreadyCheckShow.value = [];
-    customSms.value = false;
-    getMemberNum();
-  }
-  if (v == 2) {
-    customSms.value = true;
-    members.value = [];
-    memberSearchParam.pageNumber = 1;
-    getMembers();
-  }
-}
-function memberSearch() {
-  memberSearchParam.pageNumber = 1;
-  members.value = [];
-  getMembers();
-}
-function moveMember(index, item) {
-  if (!item.mobile) {
-    ElMessage.error("当前用户暂无手机号绑定");
-    return false;
-  }
-  item.____selected = true;
-  if (alreadyCheck.value.length == 0) {
-    alreadyCheck.value.push(item.mobile);
-    alreadyCheckShow.value.push(item);
-    smsForm.value.num++;
-    memberNum.value++;
-  } else {
-    const result = alreadyCheck.value.indexOf(item.mobile);
-    if (result < 0) {
-      smsForm.value.num++;
-      memberNum.value++;
-      alreadyCheck.value.push(item.mobile);
-      alreadyCheckShow.value.push(item);
-    }
-  }
-}
-function onMemberScroll({ scrollTop }) {
-  const wrap = document.querySelector(".member-scroll .el-scrollbar__wrap");
-  if (!wrap || memberLoadingMore.value) return;
-  const nearBottom = scrollTop + wrap.clientHeight >= wrap.scrollHeight - 20;
-  if (nearBottom && memberPage.value != memberSearchParam.pageNumber) {
-    memberLoadingMore.value = true;
-    memberSearchParam.pageNumber++;
-    getMembers(true);
-  }
-}
-function getMembers(append = false) {
-  API_Member.getMemberListData(memberSearchParam).then((res) => {
-    memberLoadingMore.value = false;
-    if (res.success) {
-      res.result.records.forEach((item) => {
-        item.____selected = false;
-        members.value.push(item);
-      });
-      memberPage.value = res.result.pages;
-    }
-  });
-}
-function sendBatchSmsModal() {
-  templateSearchForm.templateStatus = 1;
-  API_Setting.getSmsTemplatePage(templateSearchForm).then((res) => {
-    if (res.success) {
-      smsTemplates.value = res.result.records;
-    }
-  });
-  signSearchForm.signStatus = 1;
-  API_Setting.getSmsSignPage(signSearchForm).then((res) => {
-    if (res.success) {
-      smsSigns.value = res.result.records;
-    }
-  });
-  smsContent.value = "<div class='sms'>效果预览</div>";
-  alreadyCheck.value = [];
-  alreadyCheckShow.value = [];
-  smsTemplateContent.value = "效果预览";
-  smsForm.value = {
-    smsName: "",
-    signName: "",
-    context: "",
-    smsRange: "1",
-    num: 0,
-    messageCode: "",
-  };
-  getMemberNum();
-  sendSmsModal.value = true;
-}
-function paneChange(name) {
-  if (name == "TEMPLATE") {
-    getSmsTemplate();
-  }
-  if (name == "SIGN") {
-    getSmsSign();
-  }
-}
-function selectSmsSign(v) {
-  if (v != undefined) {
-    smsContent.value = "<div class='sms'>【" + v + "】" + " " + smsTemplateContent.value + "</div>";
-  } else {
-    smsContent.value = "<div class='sms'>效果预览" + smsTemplateContent.value + "</div>";
-  }
-}
-function selectSmsTemplate() {
-  smsTemplates.value.forEach((e) => {
-    if (smsForm.value.messageCode == e.templateCode) {
-      smsTemplateContent.value = e.templateContent;
-      smsForm.value.smsName = e.templateName;
-    }
-  });
-  if (smsForm.value.signName) {
-    smsContent.value =
-      "<div class='sms'>【" + smsForm.value.signName + "】" + smsTemplateContent.value + "</div>";
-  } else {
-    smsContent.value = "<div class='sms'>" + smsTemplateContent.value + "</div>";
-  }
-  smsForm.value.context = smsTemplateContent.value;
-}
-function deleteSmsTemplate(v) {
-  ElMessageBox.confirm("您确认要删除此短信模板？", "确认删除", { type: "warning" }).then(() => {
-      API_Setting.deleteSmsTemplatePage({ templateCode: v.templateCode }).then((res) => {
-        if (res.success) {
-          ElMessage.success("删除成功");
-          getSmsTemplate();
-        }
-      });
-  }).catch(() => {});
-}
-function sendSms() {
-  smsFormRef.value.validate((valid) => {
-    if (!valid) return;
-    smsForm.value.mobile = alreadyCheck.value;
-    API_Setting.sendSms(smsForm.value).then((res) => {
-      if (res.success) {
-        ElMessage.success("发送成功");
-        getSms();
-        sendSmsModal.value = false;
-      }
-    });
-  });
-}
-function addSign() {
-  router.push({ name: "add-sms-sign" });
-}
-function addTemplate() {
-  templateModalVisible.value = true;
-  templateModalTitle.value = "添加短信模板";
-  templateForm.value = {};
-  modalType.value = 0;
-}
-function editTemplate(v) {
-  templateModalVisible.value = true;
-  templateModalTitle.value = "修改短信模板";
-  templateForm.value = { ...v };
-  modalType.value = 1;
-}
-function syncSign() {
-  loading.value = true;
-  API_Setting.syncSign().then((res) => {
-    loading.value = false;
-    if (res.success) {
-      ElMessage.success("同步成功");
-      getSmsSign();
-    }
-  });
-}
-function templateSubmit() {
-  templateFormRef.value.validate((valid) => {
-    if (!valid) return;
-    submitLoading.value = true;
-    const req =
-      modalType.value == 0
-        ? API_Setting.addSmsTemplatePage(templateForm.value)
-        : API_Setting.editSmsTemplatePage(templateForm.value);
-    req
-      .then((res) => {
-        submitLoading.value = false;
-        if (res.success) {
-          ElMessage.success(modalType.value == 0 ? "添加成功" : "修改成功");
-          templateModalVisible.value = false;
-          getSmsTemplate();
-        }
-      })
-      .catch(() => {
-        submitLoading.value = false;
-      });
-  });
-}
-function deleteSmsSign(v) {
-  ElMessageBox.confirm("您确认要删除此短信签名？", "确认删除", { type: "warning" }).then(() => {
-      API_Setting.deleteSign(v.id).then((res) => {
-        if (res.success) {
-          ElMessage.success("删除成功");
-          getSmsSign();
-        }
-      });
-  }).catch(() => {});
-}
-function syncTemplate() {
-  loading.value = true;
-  API_Setting.syncTemplate().then((res) => {
-    loading.value = false;
-    if (res.success) {
-      ElMessage.success("同步成功");
-      getSmsTemplate();
-    }
-  });
-}
-function smsChangePage(v) {
-  smsSearchForm.pageNumber = v;
-  getSms();
-}
-function smsChangePageSize(v) {
-  smsSearchForm.pageNumber = 1;
-  smsSearchForm.pageSize = v;
-  getSms();
-}
-function templateChangePage(v) {
-  templateSearchForm.pageNumber = v;
-  getSmsTemplate();
-}
-function templateChangePageSize(v) {
-  templateSearchForm.pageNumber = 1;
-  templateSearchForm.pageSize = v;
-  getSmsTemplate();
-}
-function getSmsTemplate() {
-  loading.value = true;
-  API_Setting.getSmsTemplatePage(templateSearchForm)
-    .then((res) => {
-      if (res.success) {
-        templateData.value = res.result.records;
-        templateTotal.value = res.result.total;
-      }
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-}
-function getSms() {
-  loading.value = true;
-  API_Setting.getSmsPage(smsSearchForm)
-    .then((res) => {
-      if (res.success) {
-        smsData.value = res.result.records;
-        smsTotal.value = res.result.total;
-      }
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-}
-function signChangePage(v) {
-  signSearchForm.pageNumber = v;
-  getSmsSign();
-}
-function signChangePageSize(v) {
-  signSearchForm.pageNumber = 1;
-  signSearchForm.pageSize = v;
-  getSmsSign();
-}
-function editSign(v) {
-  router.push({ name: "add-sms-sign", query: { id: v.id } });
-}
-function getSmsSign() {
-  loading.value = true;
-  API_Setting.getSmsSignPage(signSearchForm)
-    .then((res) => {
-      if (res.success) {
-        signData.value = res.result.records;
-        signTotal.value = res.result.total;
-      }
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-}
-
-onMounted(() => {
-  init();
-});
-</script>
-
-<style lang="scss">
-@import "sms.scss";
-
-.link-text {
-  color: #409eff;
-  cursor: pointer;
-  text-decoration: none;
-  &.disabled {
-    color: #c5c8ce;
-    cursor: not-allowed;
-  }
-}
-.op-split {
-  margin: 0 8px;
-  color: #dcdee2;
-}
-.mt_10 {
-  margin-top: 10px;
-}
-.sms-tabs {
-  min-height: 500px;
-}
-.checkbox-tag {
-  margin: 4px;
-}
-</style>

manager/src/views/sys/message/smsSign.vue

@@ -1,181 +0,0 @@
-<template>
-  <el-card>
-    <div style="margin-top: 0">
-      <div class="sign-name">{{ id ? "修改签名" : "新增签名" }}</div>
-      <el-form ref="formRef" :model="form" label-width="100px" :rules="formValidate">
-        <el-form-item label="签名" prop="signName">
-          <el-input
-            v-model="form.signName"
-            maxlength="12"
-            clearable
-            style="width: 28%"
-            placeholder="仅限2-12个字符，建议使用App应用名称或是网站名/公司名"
-          />
-        </el-form-item>
-        <el-form-item label="签名来源" prop="signSource">
-          <el-select v-model="form.signSource" placeholder="请选择签名来源" style="width: 28%">
-            <el-option label="企事业单位的全称或简称" :value="0" />
-            <el-option label="工信部备案网站的全称或简称" :value="1" />
-            <el-option label="App应用的全称或简称" :value="2" />
-            <el-option label="公众号或小程序的全称或简称" :value="3" />
-            <el-option label="电商平台店铺名的全称或简称" :value="4" />
-            <el-option label="商标名的全称或简称" :value="5" />
-          </el-select>
-        </el-form-item>
-        <div class="div-remark div-remark-first">
-          签名来源选择工信部备案网站的全称或简称时，请在说明中添加网站域名，加快审核速度；
-        </div>
-        <div class="div-remark div-remark-bottom">
-          如果选择APP应用的全称或简称或公众号或小程序的全称或简称，则网站、APP、小程序或公众号必须已上线；
-        </div>
-        <el-form-item label="证明文件">
-          <div style="float: left">
-            <upload-pic-thumb v-model="form.businessLicense" :multiple="false" :max-size="2048" />
-          </div>
-          <div style="float: left; margin-left: 20px">
-            <upload-pic-thumb v-model="form.license" :max-size="2048" :multiple="false" />
-          </div>
-        </el-form-item>
-        <div class="div-remark div-remark-first">
-          第一张为营业执照，第二张为授权委托书，请上传签名归属方的企事业单位的企业营业执照、组织机构代码证、税务登记证三证合一的证件及授权委托书
-        </div>
-        <div class="div-remark div-remark-bottom">支持jpg、png、gif、jpeg格式的图片，每张图片不大于2MB</div>
-        <el-form-item label="申请说明" prop="remark">
-          <el-input
-            v-model="form.remark"
-            clearable
-            type="textarea"
-            style="width: 50%"
-            maxlength="100"
-            :autosize="{ maxRows: 4, minRows: 4 }"
-            show-word-limit
-            placeholder="请描述您的业务使用场景，不超过100字符；如：验证码、双十一大促营销"
-          />
-        </el-form-item>
-      </el-form>
-      <div class="footer">
-        <el-button type="primary" :loading="submitLoading" @click="addSignSubmit">提交</el-button>
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
-import * as API_Setting from "@/api/setting.js";
-import uploadPicThumb from "@/components/lili/upload-pic-thumb";
-
-defineOptions({ name: "smsSign" });
-
-const route = useRoute();
-const router = useRouter();
-
-const id = ref(0);
-const form = ref({
-  signName: "",
-  businessLicense: "",
-  license: "",
-  signSource: "",
-  remark: "",
-});
-const loading = ref(false);
-const formValidate = reactive({
-  signName: [{ required: true, message: "签名名称不能为空", trigger: "blur" }],
-  remark: [{ required: true, message: "申请说明不能为空", trigger: "blur" }],
-  businessLicense: [{ required: true, message: " ", trigger: "blur" }],
-});
-const submitLoading = ref(false);
-
-const formRef = ref(null);
-
-function init() {
-  id.value = route.query.id;
-  if (id.value != undefined) {
-    getSmsSignDetail();
-  }
-}
-
-function addSignSubmit() {
-  if (form.value.businessLicense == "" || form.value.license == "") {
-    ElMessage.error("请完善证件信息");
-    return;
-  }
-  if (form.value.signSource === "" || form.value.signSource === null || form.value.signSource === undefined) {
-    ElMessage.error("请选择签名来源");
-    return;
-  }
-  formRef.value.validate((valid) => {
-    if (valid) {
-      loading.value = true;
-      if (id.value == undefined) {
-        API_Setting.addSmsSign(form.value)
-          .then((res) => {
-            loading.value = false;
-            if (res.success) {
-              ElMessage.success("添加成功");
-              router.back();
-            }
-          })
-          .catch(() => {
-            loading.value = false;
-          });
-      } else {
-        API_Setting.editSmsSign(form.value)
-          .then((res) => {
-            loading.value = false;
-            if (res.success) {
-              ElMessage.success("修改成功");
-              router.back();
-            }
-          })
-          .catch(() => {
-            loading.value = false;
-          });
-      }
-    }
-  });
-}
-
-function getSmsSignDetail() {
-  API_Setting.smsSignDetail(id.value).then((res) => {
-    loading.value = false;
-    if (res.success) {
-      form.value = res.result;
-    }
-  });
-}
-
-onMounted(() => {
-  init();
-});
-</script>
-
-<style lang="scss" scoped>
-.sign-name {
-  margin-top: 5px;
-  margin-left: 20px;
-  font-size: 16px;
-  margin-bottom: 30px;
-  color: #333;
-}
-
-.div-remark {
-  margin-left: 100px;
-  margin-bottom: 2px;
-  color: #999;
-}
-
-.div-remark-first {
-  margin-top: -17px;
-}
-
-.div-remark-bottom {
-  margin-bottom: 8px;
-}
-
-.footer {
-  margin-left: 100px;
-}
-</style>

manager/src/views/sys/oss-manage/ossManage.vue

@@ -986,7 +986,9 @@ function handleSelectConfirm() {
     return;
   }
   const last = selectedOss.value[selectedOss.value.length - 1];
-  emit("callback", { url: last.split(",")[1] });
+  const separator = last.indexOf(",");
+  const id = last.slice(0, separator);
+  emit("callback", { url: last.slice(separator + 1), file: data.value.find(item => String(item.id) === id) });
 }
 
 function handleSelectCancel() {

manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="layout">
     <el-form ref="formValidateRef" label-width="150px" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <el-form-item label="微信订单自动上报" prop="wechatOrderAutoUploadEnabled">
+        <el-switch v-model="formValidate.wechatOrderAutoUploadEnabled" inline-prompt active-text="开启" inactive-text="关闭" />
+        <span class="desc wechat-order-desc">{{ formValidate.wechatOrderAutoUploadEnabled ? "已开启：符合条件的小程序订单自动上报发货信息并发送收货通知。" : "已关闭：停止微信发货上报和收货通知，商城正常发货不受影响。" }}</span>
+        <span class="desc wechat-order-desc">关闭此开关不会关闭微信平台侧的订单管理要求；如需上报，请通过微信后台处理。修改后点击保存生效。</span>
+      </el-form-item>
       <el-form-item label="订单自动取消" prop="autoCancel">
         <el-input type="number" v-model="formValidate.autoCancel">
           <template #append>分</template>
@@ -58,6 +63,7 @@ const formValidate = ref({
   autoReceive: "",
   closeAfterSale: "",
   closeComplaint: "",
+  wechatOrderAutoUploadEnabled: true,
 });
 const result = ref("");
 
@@ -83,10 +89,16 @@ function setupSetting() {
 function init() {
   result.value = JSON.parse(props.res);
   Object.keys(result.value).map((item) => {
+    if (item === "wechatOrderAutoUploadEnabled") return;
     result.value[item] += "";
   });
-  formValidate.value = { ...result.value };
+  formValidate.value = {
+    ...formValidate.value,
+    ...result.value,
+    wechatOrderAutoUploadEnabled: result.value.wechatOrderAutoUploadEnabled !== false && result.value.wechatOrderAutoUploadEnabled !== "false",
+  };
   Object.keys(formValidate.value).forEach((item) => {
+    if (item === "wechatOrderAutoUploadEnabled") return;
     ruleValidate[item] = [
       {
         required: true,
@@ -130,4 +142,10 @@ init();
   font-size: 12px;
   color: #999;
 }
+
+.wechat-order-desc {
+  display: block;
+  width: 100%;
+  line-height: 20px;
+}
 </style>

manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue

@@ -6,7 +6,7 @@
       </el-form-item>
 
       <el-form-item label="最低提现金额" prop="minPrice">
-        ￥<el-input class="label-appkey" v-model="formValidate.minPrice" />
+        ￥<el-input-number class="label-appkey" v-model="formValidate.minPrice" :min="0" :precision="2" :controls="false" />
       </el-form-item>
 
       <el-form-item label="提现方式" prop="type">
@@ -57,12 +57,21 @@ const props = defineProps(["res", "type"]);
 // handleSubmit(that, name) 通过 that.$refs[name] 取表单实例
 const { proxy } = getCurrentInstance();
 
-const result = ref("");
+const ruleValidate = reactive({
-// 只做属性合并的成组对象
+  minPrice: [
-const ruleValidate = reactive({});
+    { required: true, message: "请填写最低提现金额", trigger: "blur" },
+    { type: "number", min: 0, message: "最低提现金额必须是非负数字", trigger: "change" },
+  ],
+  type: [{ required: true, message: "请选择提现方式", trigger: "change" }],
+  wechatAppId: [{
+    validator: (rule, value, callback) => {
+      if (formValidate.value.type === "WECHAT" && !value?.trim()) callback(new Error("请填写微信提现应用ID"));
+      else callback();
+    },
+    trigger: "blur",
+  }],
+});
 const formValidate = ref({});
-// 历史遗留：声明后未在模板使用，原样保留
-const switchTitle = ref("提现审核是否开启");
 
 // 模板 ref 与 data 同名会互相覆盖，改名 formValidateRef 并同步改 script
 const formValidateRef = ref(null);
@@ -83,51 +92,23 @@ function setupSetting() {
     }
   });
 }
+/** 保留字段真实类型，并兼容旧配置中的字符串数字、布尔值和字符串 null。 */
 function init() {
-  result.value = JSON.parse(props.res || "{}");
+  const data = JSON.parse(props.res || "{}");
-  Object.keys(result.value).map((item) => {
+  const values = Object.fromEntries(Object.entries(data).map(([key, value]) => {
-    result.value[item] += "";
+    const text = typeof value === "string" ? value.trim() : value;
-  });
+    return [key, text === "" || text === "null" ? null : text];
-  formValidate.value = { ...result.value };
+  }));
-  if (!formValidate.value.withdrawRule) {
+  formValidate.value = {
-    formValidate.value.withdrawRule = DEFAULT_WITHDRAW_RULE;
+    ...values,
-  }
+    minPrice: values.minPrice == null ? undefined : Number(values.minPrice),
-  Object.keys(formValidate.value).forEach((item) => {
+    fee: values.fee == null ? null : Number(values.fee),
-    if (item === "minPrice") {
+    apply: values.apply === true || values.apply === "true",
-      ruleValidate[item] = [
+    type: values.type || "WECHAT",
-        {
+    wechatAppId: values.wechatAppId || "",
-          required: true,
+    wechatAppIdSource: values.wechatAppIdSource || null,
-          message: "请填写必填项",
+    withdrawRule: values.withdrawRule || DEFAULT_WITHDRAW_RULE,
-          trigger: "blur",
+  };
-        },
-        {
-          validator: (rule, value, callback) => {
-            if (Number(value) < 0) {
-              callback(new Error("不能输入负数！"));
-            } else {
-              callback();
-            }
-          },
-          trigger: "change",
-        },
-      ];
-    } else if (item === "withdrawRule") {
-      ruleValidate[item] = [
-        {
-          required: false,
-          trigger: "blur",
-        },
-      ];
-    } else {
-      ruleValidate[item] = [
-        {
-          required: true,
-          message: "请填写必填项",
-          trigger: "blur",
-        },
-      ];
-    }
-  });
 }
 
 init();

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -2539,7 +2539,6 @@ function save() {
       }
 
       baseInfoForm.value.salesModel = "RETAIL";
-      baseInfoForm.value.wholesaleList = [];
 
       // 判断是否是复制商品（复制商品时不复用原有 goodsId，重新生成）
       if (!route.query.copyId) {
@@ -2550,7 +2549,6 @@ function save() {
       syncIntroFromEditors();
       let submit = JSON.parse(JSON.stringify(baseInfoForm.value));
       submit.salesModel = "RETAIL";
-      submit.wholesaleList = [];
 
       // 5. 商品主图相册校验
       if (
@@ -3357,51 +3355,6 @@ onBeforeUnmount(() => {
   margin-left: 10px;
 }
 
-.wholesale-rule-form-item {
-  width: 100% !important;
-  min-width: 900px;
-}
-
-.wholesale-preview-table {
-  width: 480px;
-}
-
-.wholesale-preview-table :deep(.el-table__cell .cell) {
-  overflow: visible;
-  white-space: nowrap;
-}
-
-.wholesale-rule-form-item :deep(.el-form-item__content) {
-  width: 100%;
-}
-
-.wholesale-num-input {
-  width: 190px;
-}
-
-.wholesale-num-input :deep(.el-input__wrapper) {
-  min-width: 140px;
-}
-
-.wholesale-price-cell {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.wholesale-price-input {
-  width: 190px;
-}
-
-.wholesale-price-del {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-left: 100px;
-  transform: translateY(-50%);
-}
-
 /* 单/多规格切换与单规格表格样式 */
 .spec-mode-switch-bar {
   display: flex;

seller/src/views/promotion/coupon/coupon-receive.vue

@@ -67,7 +67,7 @@
         <el-table-column label="面额/折扣" width="100">
           <template #default="{ row }">
             <priceColorScheme
-              v-if="row && row.price"
+              v-if="row && row.couponType === 'PRICE'"
               :value="row.price"
               :color="$mainColor"
             />

seller/src/views/promotion/coupon/coupon.vue

@@ -17,10 +17,10 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="获取方式" prop="getType">
+        <el-form-item label="优惠券类型" prop="couponType">
-          <el-select v-model="searchForm.getType" placeholder="请选择" clearable style="width: 240px">
+          <el-select v-model="searchForm.couponType" placeholder="请选择" clearable style="width: 240px">
-            <el-option label="免费获取" value="FREE" />
+            <el-option label="满减优惠券" value="PRICE" />
-            <el-option label="活动获取" value="ACTIVITY" />
+            <el-option label="满折优惠券" value="DISCOUNT" />
           </el-select>
         </el-form-item>
         <el-form-item label="活动状态" prop="promotionStatus">
@@ -75,7 +75,7 @@
         <el-table-column label="面额/折扣" width="150">
           <template #default="{ row }">
             <span v-if="row">
-              <span v-if="row.price" :style="{ color: $mainColor }">
+              <span v-if="row.couponType === 'PRICE'" :style="{ color: $mainColor }">
                 {{ $filters.unitPrice(row.price, "￥") }}</span>
               <span v-else>{{ row.couponDiscount }}折</span>
             </span>
@@ -94,21 +94,17 @@
         </el-table-column>
         <el-table-column label="获取方式" width="120">
           <template #default="{ row }">
-            <el-tag v-if="row" :type="getTypeTagType(row.getType)">{{ getTypeText(row.getType) }}</el-tag>
+            <span v-if="row">{{ getTypeText(row.getType) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="优惠券类型" width="120">
           <template #default="{ row }">
-            <el-tag v-if="row" :type="couponTypeTagType(row.couponType)">
+            <span v-if="row">{{ couponTypeText(row) }}</span>
-              {{ couponTypeText(row.couponType) }}
-            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="品类描述" width="120">
           <template #default="{ row }">
-            <el-tag v-if="row" :type="scopeTypeTagType(row.scopeType)">
+            <span v-if="row">{{ scopeTypeText(row.scopeType) }}</span>
-              {{ scopeTypeText(row.scopeType) }}
-            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="活动时间" width="200">
@@ -124,9 +120,7 @@
           fixed="right"
         >
           <template #default="{ row }">
-            <el-tag v-if="row" :type="promotionStatusTagType(row.promotionStatus)">
+            <span v-if="row">{{ promotionStatusText(row.promotionStatus) }}</span>
-              {{ promotionStatusText(row.promotionStatus) }}
-            </el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -269,15 +263,6 @@ function promotionStatusText(status) {
   return map[status] || "未知";
 }
 
-function promotionStatusTagType(status) {
-  const map = {
-    NEW: "info",
-    START: "success",
-    END: "danger",
-    CLOSE: "danger",
-  };
-  return map[status] || "danger";
-}
 
 function scopeTypeText(type) {
   const map = {
@@ -289,15 +274,6 @@ function scopeTypeText(type) {
   return map[type] || "未知";
 }
 
-function scopeTypeTagType(type) {
-  const map = {
-    ALL: "info",
-    PORTION_GOODS_CATEGORY: "warning",
-    PORTION_SHOP_CATEGORY: "warning",
-    PORTION_GOODS: "primary",
-  };
-  return map[type] || "danger";
-}
 
 function getTypeText(type) {
   const map = {
@@ -309,31 +285,13 @@ function getTypeText(type) {
   return map[type] || "未知";
 }
 
-function getTypeTagType(type) {
+
-  const map = {
+function couponTypeText(row) {
-    FREE: "danger",
+  if (row.couponType === "DISCOUNT") return "满折优惠券";
-    ACTIVITY: "warning",
+  if (row.couponType === "PRICE") return Number(row.consumeThreshold) === 0 ? "立减优惠券" : "满减优惠券";
-    INSIDE: "success",
+  return "未知";
-    IGAME: "success",
-  };
-  return map[type] || "info";
 }
 
-function couponTypeText(type) {
-  const map = {
-    DISCOUNT: "打折",
-    PRICE: "减免现金",
-  };
-  return map[type] || "未知";
-}
-
-function couponTypeTagType(type) {
-  const map = {
-    DISCOUNT: "primary",
-    PRICE: "info",
-  };
-  return map[type] || "info";
-}
 
 function isSameSelection(next, current) {
   const a = next || [];

seller/src/views/shop/pc/config.js

@@ -283,7 +283,7 @@ const ALL_COMPONENT_DEFINITIONS = [
         { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' },
         { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' },
         { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' },
-        { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
+        { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
       ]
     },
     defaultComponentStyle: {

seller/src/views/shop/pc/template/TplBrandWall.vue

@@ -49,7 +49,7 @@ const brandList = computed(() => {
     { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' },
     { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' },
     { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' },
-    { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
+    { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' }
   ];
 });