From ea95b0ac6d22de2b118b249059d1d187130d6059 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 2 Sep 2026 16:20:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=8B=B1=E6=96=87=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 8 ++-- package.json | 4 +- pnpm-lock.yaml | 42 ++++--------------- .../canteen/components/product-total.vue | 10 ++++- src/sheep/components/order/order-car.vue | 32 +++++++++----- 5 files changed, 45 insertions(+), 51 deletions(-) diff --git a/.env b/.env index 3d3dc0b..c14ef26 100644 --- a/.env +++ b/.env @@ -33,15 +33,15 @@ VITE_OAUTH2_SOCIAL_CLIENT='social:social' # 是否开启websocket 消息接受, VITE_WEBSOCKET_ENABLE = true # --------------------------- start 开发环境 start ---------------------------------- -# VITE_APP_DEV_SERVICE = https://www.zianxin.com/api +VITE_APP_DEV_SERVICE = https://www.zianxin.com/api # VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = https://www.zianxin.com/api -VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc +# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc #VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 -# VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api -VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc +VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api +# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999 # VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api # VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc diff --git a/package.json b/package.json index ca6641b..6dc98a6 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "pinia-plugin-persistedstate": "^4.7.1", "radash": "^12.1.1", "vue": "^3.4.21", - "vue-i18n": "^9.1.9", + "vue-i18n": "9.1.9", "z-paging": "^2.8.8" }, "devDependencies": { @@ -90,4 +90,4 @@ "vite": "5.2.8", "vue-tsc": "^1.0.24" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b677ec..002c5c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,8 +93,8 @@ importers: specifier: ^3.4.21 version: 3.5.26(typescript@4.9.5) vue-i18n: - specifier: ^9.1.9 - version: 9.14.5(vue@3.5.26(typescript@4.9.5)) + specifier: 9.1.9 + version: 9.1.9(vue@3.5.26(typescript@4.9.5)) z-paging: specifier: ^2.8.8 version: 2.8.8 @@ -1105,10 +1105,6 @@ packages: resolution: {integrity: sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==} engines: {node: '>= 10'} - '@intlify/core-base@9.14.5': - resolution: {integrity: sha512-5ah5FqZG4pOoHjkvs8mjtv+gPKYU0zCISaYNjBNNqYiaITxW8ZtVih3GS/oTOqN8d9/mDLyrjD46GBApNxmlsA==} - engines: {node: '>= 16'} - '@intlify/devtools-if@9.1.9': resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==} engines: {node: '>= 10'} @@ -1117,10 +1113,6 @@ packages: resolution: {integrity: sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==} engines: {node: '>= 10'} - '@intlify/message-compiler@9.14.5': - resolution: {integrity: sha512-IHzgEu61/YIpQV5Pc3aRWScDcnFKWvQA9kigcINcCBXN8mbW+vk9SK+lDxA6STzKQsVJxUPg9ACC52pKKo3SVQ==} - engines: {node: '>= 16'} - '@intlify/message-resolver@9.1.9': resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==} engines: {node: '>= 10'} @@ -1133,10 +1125,6 @@ packages: resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==} engines: {node: '>= 10'} - '@intlify/shared@9.14.5': - resolution: {integrity: sha512-9gB+E53BYuAEMhbCAxVgG38EZrk59sxBtv3jSizNL2hEWlgjBjAw1AwpLHtNaeda12pe6W20OGEa0TwuMSRbyQ==} - engines: {node: '>= 16'} - '@intlify/vue-devtools@9.1.9': resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==} engines: {node: '>= 10'} @@ -4196,10 +4184,9 @@ packages: terser: optional: true - vue-i18n@9.14.5: - resolution: {integrity: sha512-0jQ9Em3ymWngyiIkj0+c/k7WgaPO+TNzjKSNq9BvBQaKJECqn9cd9fL4tkDhB5G1QBskGl9YxxbDAhgbFtpe2g==} - engines: {node: '>= 16'} - deprecated: v9 and v10 no longer supported. please migrate to v11. about maintenance status, see https://vue-i18n.intlify.dev/guide/maintenance.html + vue-i18n@9.1.9: + resolution: {integrity: sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==} + engines: {node: '>= 10'} peerDependencies: vue: ^3.0.0 @@ -5971,11 +5958,6 @@ snapshots: '@intlify/shared': 9.1.9 '@intlify/vue-devtools': 9.1.9 - '@intlify/core-base@9.14.5': - dependencies: - '@intlify/message-compiler': 9.14.5 - '@intlify/shared': 9.14.5 - '@intlify/devtools-if@9.1.9': dependencies: '@intlify/shared': 9.1.9 @@ -5986,11 +5968,6 @@ snapshots: '@intlify/shared': 9.1.9 source-map: 0.6.1 - '@intlify/message-compiler@9.14.5': - dependencies: - '@intlify/shared': 9.14.5 - source-map-js: 1.2.1 - '@intlify/message-resolver@9.1.9': {} '@intlify/runtime@9.1.9': @@ -6001,8 +5978,6 @@ snapshots: '@intlify/shared@9.1.9': {} - '@intlify/shared@9.14.5': {} - '@intlify/vue-devtools@9.1.9': dependencies: '@intlify/message-resolver': 9.1.9 @@ -9569,10 +9544,11 @@ snapshots: sass: 1.71.1 terser: 5.46.0 - vue-i18n@9.14.5(vue@3.5.26(typescript@4.9.5)): + vue-i18n@9.1.9(vue@3.5.26(typescript@4.9.5)): dependencies: - '@intlify/core-base': 9.14.5 - '@intlify/shared': 9.14.5 + '@intlify/core-base': 9.1.9 + '@intlify/shared': 9.1.9 + '@intlify/vue-devtools': 9.1.9 '@vue/devtools-api': 6.6.4 vue: 3.5.26(typescript@4.9.5) diff --git a/src/pages/canteen/components/product-total.vue b/src/pages/canteen/components/product-total.vue index ab6727c..5f99f9d 100644 --- a/src/pages/canteen/components/product-total.vue +++ b/src/pages/canteen/components/product-total.vue @@ -61,7 +61,10 @@ const doContainer = () => { - {{ t('mobile.canteen.extraDeliveryFee', { fee: hooks.useMoney(takeOutSetting?.userTakeOutAmt ?? 0) }) }} + {{ t('mobile.canteen.extraDeliveryFee', { + fee: hooks.useMoney(takeOutSetting?.userTakeOutAmt ?? + 0) + }) }} ¥{{ hooks.useMoney(totalTakeOutPrice) }} @@ -75,7 +78,10 @@ const doContainer = () => { {{ t('mobile.canteen.requiredNotSelected') }} - {{ t('mobile.canteen.shortOfMinDelivery', { amount: hooks.useMoney((takeOutSetting?.minDeliveryAmt ?? 0) - totPrice) }) }} + {{ t('mobile.canteen.shortOfMinDelivery', { + amount: hooks.useMoney((takeOutSetting?.minDeliveryAmt ?? 0) + - totPrice) + }) }} {{ t('mobile.canteen.checkout') }} diff --git a/src/sheep/components/order/order-car.vue b/src/sheep/components/order/order-car.vue index bea4348..8a6799a 100644 --- a/src/sheep/components/order/order-car.vue +++ b/src/sheep/components/order/order-car.vue @@ -172,7 +172,8 @@ const apptWeekdayText = computed(() => { - {{ props.cardetail.username || t('mobile.order.unknownUser') }} + {{ props.cardetail.username || t('mobile.order.unknownUser') + }} | {{ props.cardetail.userMobile || "-" }} @@ -185,7 +186,8 @@ const apptWeekdayText = computed(() => { - {{ t('mobile.order.pendingPay') }} + {{ t('mobile.order.pendingPay') + }} @@ -200,7 +202,7 @@ const apptWeekdayText = computed(() => { {{ props.cardetail.merchantName }} - + @@ -212,7 +214,7 @@ const apptWeekdayText = computed(() => { {{ t('mobile.order.ordering') }} - + {{ hooks.useEnum("hardwareRefundStatusEnum", props.cardetail.refundStatus) }} @@ -224,7 +226,8 @@ const apptWeekdayText = computed(() => { {{ t('mobile.order.proxyOrder.label') }} - {{ props.cardetail.username || t('mobile.order.proxyOrder.defaultName') }} + {{ props.cardetail.username || + t('mobile.order.proxyOrder.defaultName') }} { {{ t('mobile.order.goodsExpandHint', { count: props.cardetail.carList?.length || 0 }) }} - {{ t('mobile.order.goodsOneHint') }} + {{ t('mobile.order.goodsOneHint') }} + @@ -263,13 +267,17 @@ const apptWeekdayText = computed(() => { ¥{{ hooks.useMoney(props.cardetail.payPrice) }} - {{ t('mobile.order.goodsTotal', { count: props.cardetail.carList?.length || 0 }) }} + {{ t('mobile.order.goodsTotal', { + count: + props.cardetail.carList?.length || 0 + }) }} - {{ isGoodsCollapsed(props.cardetail, 0) ? t('mobile.order.expand') : t('mobile.order.collapse') }} + {{ isGoodsCollapsed(props.cardetail, 0) ? t('mobile.order.expand') : + t('mobile.order.collapse') }} @@ -296,7 +304,8 @@ const apptWeekdayText = computed(() => { {{ t('mobile.order.apptDining') }} {{ t('mobile.order.diner') }} - {{ props.cardetail.username || t('mobile.order.unknownUser') }} + {{ props.cardetail.username || + t('mobile.order.unknownUser') }} {{ props.cardetail.apptUseDate || "-" }} @@ -309,7 +318,10 @@ const apptWeekdayText = computed(() => { - {{ t('mobile.order.openTime', { start: props.cardetail.apptStartTime, end: props.cardetail.apptEndTime }) }} + {{ t('mobile.order.openTime', { + start: props.cardetail.apptStartTime, end: + props.cardetail.apptEndTime + }) }}