zianxin/biz-mobile-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:英文适配问题

Browse Source
This commit is contained in:
dzc committed 2026-09-02 16:20:56 +08:00
1 parent 396b724d5e
commit ea95b0ac6d
5 files changed
+45 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env
+4 -4
View File
@@ -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
package.json
+2 -2
View File
@@ -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"
}
}
}
pnpm-lock.yaml
Generated
+9 -33
View File
@@ -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)
src/pages/canteen/components/product-total.vue
+8 -2
View File
@@ -61,7 +61,10 @@ const doContainer = () => {
<view v-if="takeOutSetting?.userTakeOutAmt > 0 || totalTakeOutPrice > 0"
class="flex items-center second-text-20 gap-5rpx">
<view class="font-size-22rpx">
{{ t('mobile.canteen.extraDeliveryFee', { fee: hooks.useMoney(takeOutSetting?.userTakeOutAmt ?? 0) }) }}
{{ t('mobile.canteen.extraDeliveryFee', {
fee: hooks.useMoney(takeOutSetting?.userTakeOutAmt ??
0)
}) }}
</view>
<view class="line-through decoration-#999 decoration-1px font-size-20rpx">
¥{{ hooks.useMoney(totalTakeOutPrice) }}
@@ -75,7 +78,10 @@ const doContainer = () => {
{{ t('mobile.canteen.requiredNotSelected') }}
</view>
<view v-else-if="!isSatisfyStartPrice" class="second-text-24">
{{ t('mobile.canteen.shortOfMinDelivery', { amount: hooks.useMoney((takeOutSetting?.minDeliveryAmt ?? 0) - totPrice) }) }}
{{ t('mobile.canteen.shortOfMinDelivery', {
amount: hooks.useMoney((takeOutSetting?.minDeliveryAmt ?? 0)
- totPrice)
}) }}
</view>
<view v-else class="buy-btn__title" @tap.stop="doPay">{{ t('mobile.canteen.checkout') }}</view>
</view>
src/sheep/components/order/order-car.vue
+22 -10
View File
@@ -172,7 +172,8 @@ const apptWeekdayText = computed(() => {
<view v-if="props.visibleUser" class="flex items-start justify-between gap-16rpx">
<view class="min-w-0 flex-1">
<view class="flex items-center min-w-0">
<text class="sub-text-26 truncate">{{ props.cardetail.username || t('mobile.order.unknownUser') }}</text>
<text class="sub-text-26 truncate">{{ props.cardetail.username || t('mobile.order.unknownUser')
}}</text>
<text class="mx-10rpx text-18rpx text-[#d0d5dd]">|</text>
<text class="second-text-24 truncate">{{ props.cardetail.userMobile || "-" }}</text>
</view>
@@ -185,7 +186,8 @@ const apptWeekdayText = computed(() => {
</view>
</view>
<view class="flex-shrink-0">
<tm-tag v-if="props.cardetail.orderStatus == 1" color="info" size="xs">{{ t('mobile.order.pendingPay') }}</tm-tag>
<tm-tag v-if="props.cardetail.orderStatus == 1" color="info" size="xs">{{ t('mobile.order.pendingPay')
}}</tm-tag>
<view class="w-100rpx flex-row-center">
<order-status-tag :cardetail="props.cardetail" />
</view>
@@ -200,7 +202,7 @@ const apptWeekdayText = computed(() => {
<view class="flex-1 ml-20rpx">
<view class="flex-row items-center justify-between">
<view class="sub-text-26">{{ props.cardetail.merchantName }}</view>
<view class="w-100rpx flex-row-center">
<view class="w-140rpx flex-row-center">
<order-status-tag :cardetail="props.cardetail" />
</view>
</view>
@@ -212,7 +214,7 @@ const apptWeekdayText = computed(() => {
</text>
<text v-else class="ml-10rpx color-blue">{{ t('mobile.order.ordering') }}</text>
</view>
<view class="w-100rpx flex-row-center" v-if="props.cardetail.refundStatus">
<view class="w-120rpx flex-row-center" v-if="props.cardetail.refundStatus">
{{ hooks.useEnum("hardwareRefundStatusEnum", props.cardetail.refundStatus) }}
</view>
</view>
@@ -224,7 +226,8 @@ const apptWeekdayText = computed(() => {
<view v-if="props.cardetail.isProxyOrder"
class="flex items-center justify-between rounded-12rpx bg-#eef8ff px-20rpx py-12rpx text-22rpx color-#1677ff">
<text>{{ t('mobile.order.proxyOrder.label') }}</text>
<text class="max-w-360rpx show-line font-700">{{ props.cardetail.username || t('mobile.order.proxyOrder.defaultName') }}</text>
<text class="max-w-360rpx show-line font-700">{{ props.cardetail.username ||
t('mobile.order.proxyOrder.defaultName') }}</text>
</view>
<view v-if="props.cardetail?.carList?.length"
@@ -243,7 +246,8 @@ const apptWeekdayText = computed(() => {
<view v-if="hasMultipleGoods(props.cardetail)" class="mt-8rpx text-20rpx text-[#98a2b3]">
{{ t('mobile.order.goodsExpandHint', { count: props.cardetail.carList?.length || 0 }) }}
</view>
<view v-else class="mt-8rpx text-20rpx text-[#98a2b3]">{{ t('mobile.order.goodsOneHint') }}</view>
<view v-else class="mt-8rpx text-20rpx text-[#98a2b3]">{{ t('mobile.order.goodsOneHint') }}
</view>
</view>
</view>
@@ -263,13 +267,17 @@ const apptWeekdayText = computed(() => {
<view class="order-car__summary w-120rpx flex-col-center">
<view class="sub-text-28">¥{{ hooks.useMoney(props.cardetail.payPrice) }}</view>
<view class="second-text-20 font-400! line-height-1em!">{{ t('mobile.order.goodsTotal', { count: props.cardetail.carList?.length || 0 }) }}
<view class="second-text-20 font-400! line-height-1em!">{{ t('mobile.order.goodsTotal', {
count:
props.cardetail.carList?.length || 0
}) }}
</view>
</view>
<view v-if="hasMultipleGoods(props.cardetail)"
class="ml-12rpx flex-col-center text-[#98a2b3] transition-transform duration-200">
<text class="text-20rpx">{{ isGoodsCollapsed(props.cardetail, 0) ? t('mobile.order.expand') : t('mobile.order.collapse') }}</text>
<text class="text-20rpx">{{ isGoodsCollapsed(props.cardetail, 0) ? t('mobile.order.expand') :
t('mobile.order.collapse') }}</text>
<text class="iconfont icon-youjiantou mt-8rpx text-20rpx"
:class="isGoodsCollapsed(props.cardetail, 0) ? 'rotate-90' : '-rotate-90'" />
</view>
@@ -296,7 +304,8 @@ const apptWeekdayText = computed(() => {
<view class="second-text-22 text-[#98a2b3]!">{{ t('mobile.order.apptDining') }}</view>
<view class="mt-10rpx flex items-center min-w-0">
<text class="second-text-22 text-[#98a2b3]! shrink-0">{{ t('mobile.order.diner') }}</text>
<text class="ml-12rpx sub-text-24 truncate">{{ props.cardetail.username || t('mobile.order.unknownUser') }}</text>
<text class="ml-12rpx sub-text-24 truncate">{{ props.cardetail.username ||
t('mobile.order.unknownUser') }}</text>
</view>
<view class="mt-8rpx flex items-center min-w-0 flex-wrap">
<text class="sub-text-24">{{ props.cardetail.apptUseDate || "-" }}</text>
@@ -309,7 +318,10 @@ const apptWeekdayText = computed(() => {
<view
v-if="!isWeeklyCycle(props.cardetail) && props.cardetail.apptStartTime && props.cardetail.apptEndTime"
class="mt-8rpx text-20rpx text-[#667085]">
{{ t('mobile.order.openTime', { start: props.cardetail.apptStartTime, end: props.cardetail.apptEndTime }) }}
{{ t('mobile.order.openTime', {
start: props.cardetail.apptStartTime, end:
props.cardetail.apptEndTime
}) }}
</view>
</view>
<view v-if="props.cardetail.hourType"