From b1b20a9a338166f0d34049d4a2706f67bd70bccf Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:35:26 +0800 Subject: [PATCH] 12 --- .../collectCode/mine/components/codeCard/index.vue | 2 +- app/pages/collectCode/mine/index.vue | 11 ++++++++++- i18n/locales/en-US.json | 3 ++- i18n/locales/ja-JP.json | 3 ++- i18n/locales/zh-CN.json | 3 ++- i18n/locales/zh-TW.json | 3 ++- server/tsconfig.json | 3 --- 7 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 server/tsconfig.json diff --git a/app/pages/collectCode/mine/components/codeCard/index.vue b/app/pages/collectCode/mine/components/codeCard/index.vue index dd577d6..b90325f 100644 --- a/app/pages/collectCode/mine/components/codeCard/index.vue +++ b/app/pages/collectCode/mine/components/codeCard/index.vue @@ -6,7 +6,7 @@ import QRCode from 'qrcode' import { showImagePreview } from 'vant'; import { useI18n } from 'vue-i18n'; -const t = useI18n(); +const t = useI18n().t; const statusLabel=[ {label: t('collectCode.qrcode.status.paid'), value:2, color:'#18A058'}, diff --git a/app/pages/collectCode/mine/index.vue b/app/pages/collectCode/mine/index.vue index 40aeea5..eb309c1 100644 --- a/app/pages/collectCode/mine/index.vue +++ b/app/pages/collectCode/mine/index.vue @@ -22,7 +22,7 @@ const localState = ref({ showDetail: false, showHeight: '' }) - +const {t} =useI18n() const { userInfo, } = codeAuthStore() const {getOfflineQrcodeList,itemList, loading: storeLoading,pageRef}= goodStore() const initData = async () => { @@ -49,6 +49,15 @@ const confirm=async ()=>{ message.warning(t('collectCode.message.lotNoRequired')) return false } + function validateNumber(num) { + const numStr = String(num) + return /^250\d{3}$/.test(numStr) + } +if (!validateNumber(createForm.value.lotNo)){ + message.warning(t('collectCode.message.lotNoType')) + return +} + const res=await offlineQrcodeCreate({...createForm.value,price:String(createForm.value.price)}) if (res.status===0){ show.value=false diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json index bdd6126..689ba6f 100644 --- a/i18n/locales/en-US.json +++ b/i18n/locales/en-US.json @@ -429,7 +429,8 @@ "message": { "amountRequired": "Please enter amount", "lotNoRequired": "Please enter Lot No.", - "deleteSuccess": "Delete successful" + "deleteSuccess": "Delete successful", + "lotNoType": "Lot number format error" } }, "validation": { diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json index 34e2559..b552932 100644 --- a/i18n/locales/ja-JP.json +++ b/i18n/locales/ja-JP.json @@ -429,7 +429,8 @@ "message": { "amountRequired": "金額を入力してください", "lotNoRequired": "ロット番号を入力してください", - "deleteSuccess": "削除成功" + "deleteSuccess": "削除成功", + "lotNoType": "ロット番号形式エラー" } }, "validation": { diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json index ad7efb5..adaf9d8 100644 --- a/i18n/locales/zh-CN.json +++ b/i18n/locales/zh-CN.json @@ -431,7 +431,8 @@ "message": { "amountRequired": "请输入金额", "lotNoRequired": "请输入Lot号", - "deleteSuccess": "删除成功" + "deleteSuccess": "删除成功", + "lotNoType": "Lot号格式错误" } }, "validation": { diff --git a/i18n/locales/zh-TW.json b/i18n/locales/zh-TW.json index aca1510..51b5060 100644 --- a/i18n/locales/zh-TW.json +++ b/i18n/locales/zh-TW.json @@ -429,7 +429,8 @@ "message": { "amountRequired": "請輸入金額", "lotNoRequired": "請輸入Lot號", - "deleteSuccess": "刪除成功" + "deleteSuccess": "刪除成功", + "lotNoType": "Lot號格式錯誤" } }, "validation": { diff --git a/server/tsconfig.json b/server/tsconfig.json deleted file mode 100644 index b9ed69c..0000000 --- a/server/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../.nuxt/tsconfig.server.json" -}