Bläddra i källkod

feat: i18修改

liangan 1 dag sedan
förälder
incheckning
9f1f377c7c
5 ändrade filer med 17 tillägg och 24 borttagningar
  1. 2 1
      .vscode/settings.json
  2. 5 5
      env/.env
  3. 6 6
      src/pages/mine/myProfile.vue
  4. 4 4
      src/pages/mine/setting.vue
  5. 0 8
      src/plugins/i18n-helpers.ts

+ 2 - 1
.vscode/settings.json

@@ -92,5 +92,6 @@
   ],
   "i18n-ally.localesPaths": [
     "src/locale"
-  ]
+  ],
+  "i18n-ally.keystyle": "nested"
 }

+ 5 - 5
env/.env

@@ -10,7 +10,7 @@ VITE_APP_PUBLIC_BASE=/
 # 登录页面
 VITE_LOGIN_URL = '/pages/login/login'
 # 第一个请求地址
-VITE_SERVER_BASEURL = 'http://192.168.0.109:8110'
+VITE_SERVER_BASEURL = 'http://124.222.152.234:8101'
 # VITE_SERVER_BASEURL = 'http://124.222.152.234:8101'
 VITE_SERVER_BASEURL_PREFIX = '/mall'
 # 是否替换第一个前缀
@@ -19,7 +19,7 @@ VITE_SERVER_BASEURL_PREFIX_REPLACE = false
 VITE_SERVER_BASEURL_PREFIX_REPLACE_VALUE = ''
 
 # 第二个请求地址
-VITE_API_SECONDARY_URL = 'http://192.168.0.109:8110'
+VITE_API_SECONDARY_URL = 'http://124.222.152.234:8101'
 VITE_API_SECONDARY_URL_PREFIX = '/cif'
 # 是否替换第二个前缀
 VITE_API_SECONDARY_URL_PREFIX_REPLACE = false
@@ -27,14 +27,14 @@ VITE_API_SECONDARY_URL_PREFIX_REPLACE = false
 VITE_API_SECONDARY_URL_PREFIX_REPLACE_VALUE = ''
 
 # 第三个请求地址
-VITE_API_THIRD_URL = 'http://192.168.0.109:8110'
+VITE_API_THIRD_URL = 'http://124.222.152.234:8101'
 VITE_API_THIRD_URL_PREFIX = '/operating'
 # 是否替换第三个前缀
 VITE_API_THIRD_URL_PREFIX_REPLACE = false
 # 替换后的前缀值
 VITE_API_THIRD_URL_PREFIX_REPLACE_VALUE = ''
 
-VITE_UPLOAD_BASEURL = 'http://192.168.0.109:8110/operating/file/upload'
+VITE_UPLOAD_BASEURL = 'http://124.222.152.234:8101/operating/file/upload'
 
 # 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址,参考代码如下。
 # 下面的变量如果没有设置,会默认使用 VITE_SERVER_BASEURL or VITE_UPLOAD_BASEURL
@@ -47,5 +47,5 @@ VITE_UPLOAD_BASEURL__WEIXIN_TRIAL = 'https://ukw0y1.laf.run/upload'
 VITE_UPLOAD_BASEURL__WEIXIN_RELEASE = 'https://ukw0y1.laf.run/upload'
 
 # h5是否需要配置代理
-VITE_APP_PROXY=true
+VITE_APP_PROXY=false
 VITE_APP_PROXY_PREFIX = '/api'

+ 6 - 6
src/pages/mine/myProfile.vue

@@ -115,14 +115,14 @@ async function updateAvatar() {
             <wd-icon name="arrow-right" custom-class="ml-10rpx" size="36rpx" />
           </view>
         </wd-cell>
-        <wd-cell :title="t('myProfile.userId')" :value="userInfo.userId" />
-        <wd-cell :title="t('myProfile.userName')" :value="userInfo.name" />
-        <wd-cell :title="t('myProfile.mobileNumber')" :value="userInfo.phoneNo" />
+        <wd-cell :title="$t('myProfile.userId')" :value="userInfo.userId" />
+        <wd-cell :title="$t('myProfile.userName')" :value="userInfo.name" />
+        <wd-cell :title="$t('myProfile.mobileNumber')" :value="userInfo.phoneNo" />
       </wd-cell-group>
       <wd-cell-group custom-class="mb-20rpx" border>
-        <wd-cell :title="t('myProfile.bankName')" :value="userInfo.bank" />
-        <wd-cell :title="t('myProfile.bankAccountName')" :value="userInfo.bankAccountName" />
-        <wd-cell :title="t('myProfile.bankAccountNo')" :value="userInfo.bankAccount" />
+        <wd-cell :title="$t('myProfile.bankName')" :value="userInfo.bank" />
+        <wd-cell :title="$t('myProfile.bankAccountName')" :value="userInfo.bankAccountName" />
+        <wd-cell :title="$t('myProfile.bankAccountNo')" :value="userInfo.bankAccount" />
       </wd-cell-group>
     </view>
   </z-paging>

+ 4 - 4
src/pages/mine/setting.vue

@@ -35,12 +35,12 @@ function logout() {
 <template>
   <view class="py-20rpx">
     <wd-cell-group custom-class="mb-20rpx" border>
-      <wd-cell :title="t('setting.changePassword')" custom-title-class="text-32rpx" is-link @click="toPage('/pages/forgotPassword/forgotPassword')" />
+      <wd-cell :title="$t('setting.changePassword')" custom-title-class="text-32rpx" is-link @click="toPage('/pages/forgotPassword/forgotPassword')" />
       <wd-picker v-model="language" :columns="columns" use-default-slot @confirm="changeLanguage">
-        <wd-cell :title="t('setting.language')" custom-title-class="text-32rpx" custom-value-class="text-#838383! text-32rpx!" :value="columns.find(item => item.value === language)?.label" is-link />
+        <wd-cell :title="$t('setting.language')" custom-title-class="text-32rpx" custom-value-class="text-#838383! text-32rpx!" :value="columns.find(item => item.value === language)?.label" is-link />
       </wd-picker>
-      <wd-cell :title="t('setting.policies')" custom-title-class="text-32rpx" is-link />
-      <wd-cell :title="t('setting.help')" custom-title-class="text-32rpx" is-link />
+      <wd-cell :title="$t('setting.policies')" custom-title-class="text-32rpx" is-link />
+      <wd-cell :title="$t('setting.help')" custom-title-class="text-32rpx" is-link />
       <wd-cell :title="$t('setting.feedback')" custom-title-class="text-32rpx" is-link />
     </wd-cell-group>
 

+ 0 - 8
src/plugins/i18n-helpers.ts

@@ -1,14 +1,6 @@
 import type { App } from 'vue'
 import { formatTextWithBreaks, tWithBreaks } from '@/locale/index'
 
-// 声明全局属性类型
-declare module '@vue/runtime-core' {
-  interface ComponentCustomProperties {
-    $tWithBreaks: typeof tWithBreaks
-    $formatTextWithBreaks: typeof formatTextWithBreaks
-  }
-}
-
 export default {
   install(app: App) {
     // 注册全局方法