From 58f00a68e4bfbfb213829008ab804cdb700f710e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E7=90=B3=E7=BA=A2?= <1921957171@qq.com> Date: Fri, 13 Sep 2024 11:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E5=AE=9A=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 6 +++--- src/views/mall/promotion/coupon/formatter.ts | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.env.local b/.env.local index 595eec03c..15733a213 100644 --- a/.env.local +++ b/.env.local @@ -5,13 +5,13 @@ VITE_DEV=true # 请求路径VITE_BASE_URL='http://localhost:48080' # 请求路径 -VITE_BASE_URL='http://100.80.97.101:48080' +VITE_BASE_URL='http://192.168.10.207:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 VITE_UPLOAD_TYPE=server # 上传路径VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' # 上传路径 -VITE_UPLOAD_URL='http://100.80.97.101:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.10.207:48080/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api @@ -29,7 +29,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='http://100.98.30.68:48080' +VITE_MALL_H5_DOMAIN='http://192.168.10.207:48080' # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=false diff --git a/src/views/mall/promotion/coupon/formatter.ts b/src/views/mall/promotion/coupon/formatter.ts index f00138a67..b6bf50a59 100644 --- a/src/views/mall/promotion/coupon/formatter.ts +++ b/src/views/mall/promotion/coupon/formatter.ts @@ -16,10 +16,15 @@ export const discountFormat = (row: CouponTemplateVO) => { // 格式化【领取上限】 export const takeLimitCountFormat = (row: CouponTemplateVO) => { - if (row.takeLimitCount === -1) { - return '无领取限制' + if(row.takeLimitCount){ + if (row.takeLimitCount === -1) { + return '无领取限制' + } + return `${row.takeLimitCount} 张/人` + }else{ + return ' ' } - return `${row.takeLimitCount} 张/人` + } // 格式化【有效期限】