liangan 3 долоо хоног өмнө
parent
commit
080e909343

+ 1 - 1
src/locale/en.json

@@ -69,7 +69,7 @@
   "addressBook.delete.confirm": "Confirm Delete",
   "addressBook.delete.message": "Are you sure you want to delete this address?",
   "addressBook.delete.button": "Delete",
-  "addressBook.tag.default": "default",
+  "addressBook.tag.default": "Default",
   "addressBook.button.add": "Add New Address",
   "addressBook.select.binding": "Binding address...",
   "addressBook.select.success": "Address bound successfully!",

+ 6 - 4
src/locale/index.ts

@@ -1,9 +1,12 @@
 import { createI18n } from 'vue-i18n'
 
+import { Locale } from 'wot-design-uni'
+// 引入英文语言包
+import enUS from 'wot-design-uni/locale/lang/en-US'
 import bn from './bn.json'
 import en from './en.json'
-import zhHans from './zh-Hans.json' // 简体中文
-
+import zhHans from './zh-Hans.json'
+// 简体中文
 const messages = {
   en,
   'zh-Hans': zhHans, // key 不能乱写,查看截图 screenshots/i18n.png
@@ -14,7 +17,7 @@ const i18n = createI18n({
   messages,
   allowComposition: true,
 })
-
+Locale.use('en-US', enUS)
 console.log(uni.getLocale())
 console.log(i18n.global.locale)
 
@@ -29,7 +32,6 @@ export function getTemplateByKey(key: string) {
     return ''
   }
   const locale = uni.getLocale()
-  console.log('locale:', locale)
 
   const message = messages[locale] // 拿到某个多语言的所有模板(是一个对象)
   if (Object.keys(message).includes(key)) {

+ 8 - 6
src/pages/mine/addressBook.vue

@@ -130,7 +130,7 @@ function handleAction(action: string, item: any) {
     })
   }
 }
-onShow(() => {
+onShow(async () => {
   paging.value.reload(true)
 })
 // 页面加载时获取参数
@@ -142,20 +142,22 @@ onLoad((options) => {
 <template>
   <z-paging ref="paging" v-model="dataList" use-page-scroll @query="queryList">
     <view class="py-20rpx">
-      <wd-swipe-action v-for="item in dataList" :key="item.id">
+      <wd-swipe-action v-for="item in dataList" :key="item.id" custom-class="mb-20rpx">
         <view class="flex items-center justify-between bg-white px-22rpx py-18rpx" @click="handleAddressClick(item)">
           <view class="flex-1">
-            <view class="mb-20rpx flex items-center justify-between text-24rpx">
+            <view class="mb-20rpx flex items-center justify-between text-24rpx font-bold">
               <view>
                 <text class="mr-20rpx">
                   {{ item.realName }}
                 </text>
                 <text>{{ item.phone }}</text>
               </view>
-              <wd-text v-if="item.isDefault" type="primary" :text="t('addressBook.tag.default')" />
+              <wd-tag type="primary" plain>
+                {{ t('addressBook.tag.default') }}
+              </wd-tag>
             </view>
-            <view class="text-22rpx text-#3A444C">
-              {{ [item.province, item.city, item.district, item.street].filter(Boolean).join(', ') }} {{ item.postCode }}
+            <view class="line-clamp-2 text-22rpx text-#3A444C">
+              {{ [item.province, item.city, item.district, item.street, item.detail].filter(Boolean).join(', ') }} {{ item.postCode }}
             </view>
           </view>
           <wd-icon name="arrow-right" custom-class="flex-shrink-0 ml-8rpx" color="#7D7D7D" size="24rpx" />

+ 11 - 9
src/pages/mine/addressBookOperate.vue

@@ -297,6 +297,7 @@ onLoad(async (options: any) => {
               v-model="model.areaCodes"
               :columns="area"
               clearable
+              :title="t('addressBook.operate.form.district.placeholder')"
               :placeholder="t('addressBook.operate.form.district.placeholder')"
               value-key="name"
               label-key="name"
@@ -309,23 +310,24 @@ onLoad(async (options: any) => {
           </wd-cell>
 
           <wd-cell :title="t('addressBook.operate.form.street')" vertical required>
-            <wd-textarea
-              v-model="model.detail"
-              clearable
-              auto-height
-              :placeholder="t('addressBook.operate.form.street.placeholder')"
-            />
+            <view class="pl-24rpx">
+              <wd-textarea
+                v-model="model.detail"
+                clearable
+                auto-height
+                :placeholder="t('addressBook.operate.form.street.placeholder')"
+              />
+            </view>
           </wd-cell>
           <wd-input
             v-model="model.postCode"
             :label="t('addressBook.operate.form.postcode')"
             label-width="240rpx"
-            custom-label-class="text-28rpx"
+            custom-label-class="pl-24rpx text-28rpx"
             clearable
             :placeholder="t('addressBook.operate.form.postcode.placeholder')"
-            required
           />
-          <wd-cell :title="t('addressBook.operate.form.default')">
+          <wd-cell :title="t('addressBook.operate.form.default')" custom-title-class="pl-24rpx">
             <wd-switch v-model="model.isDefault" :active-value="1" :inactive-value="0" size="42rpx" />
           </wd-cell>
         </wd-cell-group>

+ 3 - 1
vite.config.ts

@@ -101,7 +101,6 @@ export default async ({ command, mode }) => {
         },
         logger: false,
       }),
-
       ViteRestart({
         // 通过这个插件,在修改vite.config.js文件则不需要重新运行也生效配置
         restart: ['vite.config.js'],
@@ -133,6 +132,9 @@ export default async ({ command, mode }) => {
       Uni(),
       updatePackageJson(),
     ],
+    optimizeDeps: {
+      exclude: process.env.UNI_PLATFORM === 'h5' && process.env.NODE_ENV === 'development' ? ['wot-design-uni'] : [],
+    },
     define: {
       __UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
       __VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY),