diff --git a/src/dealer/index.config.ts b/src/dealer/index.config.ts index d456dbd..18e1216 100644 --- a/src/dealer/index.config.ts +++ b/src/dealer/index.config.ts @@ -1,3 +1,3 @@ export default definePageConfig({ - navigationBarTitleText: '分销中心' + navigationBarTitleText: '桂乐淘分享中心' }) diff --git a/src/dealer/qrcode/index.config.ts b/src/dealer/qrcode/index.config.ts index b075b21..18e1216 100644 --- a/src/dealer/qrcode/index.config.ts +++ b/src/dealer/qrcode/index.config.ts @@ -1,3 +1,3 @@ export default definePageConfig({ - navigationBarTitleText: '推广二维码' + navigationBarTitleText: '桂乐淘分享中心' }) diff --git a/src/dealer/qrcode/index.tsx b/src/dealer/qrcode/index.tsx index a676808..d32301f 100644 --- a/src/dealer/qrcode/index.tsx +++ b/src/dealer/qrcode/index.tsx @@ -271,9 +271,9 @@ const DealerQrcode: React.FC = () => { }}> - 我的邀请小程序码 + 我的分享码 - 分享小程序码邀请好友,获得丰厚佣金奖励 + 与好友“共享福利 一起省、一起赚” @@ -325,10 +325,10 @@ const DealerQrcode: React.FC = () => { )} - 扫码加入我的团队 + 桂乐淘伙伴计划 - 好友扫描小程序码即可直接进入小程序并建立邀请关系 + 自购省 | 分享赚 | 好友惠 diff --git a/src/pages/user/components/IsDealer.tsx b/src/pages/user/components/IsDealer.tsx index 0a33df8..899d75b 100644 --- a/src/pages/user/components/IsDealer.tsx +++ b/src/pages/user/components/IsDealer.tsx @@ -51,7 +51,7 @@ const IsDealer = () => { {config?.vipText || '门店中心'} + className={'pl-3 text-orange-100 font-medium'}>{config?.vipText || '桂乐淘分享中心'} {/*门店核销*/} } @@ -75,7 +75,7 @@ const IsDealer = () => { title={ - {config?.vipText || '门店中心'} + {config?.vipText || '桂乐淘分享中心'} {config?.vipComments || ''} } diff --git a/src/user/ticket/index.tsx b/src/user/ticket/index.tsx index 8c3ad2b..011c034 100644 --- a/src/user/ticket/index.tsx +++ b/src/user/ticket/index.tsx @@ -256,6 +256,12 @@ const UserTicketList = () => { return d.isValid() ? d.format('YYYY年MM月DD日 HH:mm:ss') : v; }; + const formatDate = (v?: string) => { + if (!v) return '-'; + const d = dayjs(v); + return d.isValid() ? d.format('YYYY年MM月DD日') : v; + }; + const getTicketOrderStatusMeta = (order: GltTicketOrder) => { if (order.status === 1) return { text: '已冻结', type: 'warning' as const }; @@ -471,15 +477,12 @@ const UserTicketList = () => { 票号:{item.userTicketId ?? '-'} - - 下单时间:{formatDateTime(item.createTime)} - - - 配送时间:{formatDateTime(item.sendTime)} - 送水数量:{item.totalNum ?? 0} + + 配送时间:{formatDate(item.sendTime)} + {(() => { const meta = getTicketOrderStatusMeta(item); @@ -492,11 +495,14 @@ const UserTicketList = () => { 收货地址:{item.address || '-'} - {item.storeName ? ( - - 门店:{item.storeName} - - ) : null} + + 下单时间:{formatDateTime(item.createTime)} + + {/*{item.storeName ? (*/} + {/* */} + {/* 门店:{item.storeName}*/} + {/* */} + {/*) : null}*/} {item.sendStartTime ? ( 开始配送:{formatDateTime(item.sendStartTime)} diff --git a/src/user/ticket/use.tsx b/src/user/ticket/use.tsx index 6fa92ae..22ef5ca 100644 --- a/src/user/ticket/use.tsx +++ b/src/user/ticket/use.tsx @@ -509,7 +509,7 @@ const OrderConfirm = () => { return ( {t.templateName || '水票'}} + title={票号 {t.id}} description={t.orderNo ? `来源订单:${t.orderNo}` : ''} extra={可用 {t.availableQty ?? 0}} onClick={() => {