xxxx

public/locales/en-US.json

@@ -31,6 +31,7 @@
         "choice": "Please choice",
         "choice1": "Please enter kewords",
         "choice2": "Choice",
+        "choice3": "Please select a region",
         "yes": "Yes",
         "no": "No",
         "submitfailure": "Submit Failure:",

public/locales/th-TH.json

@@ -32,6 +32,7 @@
         "choice": "กรุณาเลือก",
         "choice1": "กรุณากรอกคำค้นหา",
         "choice2": "เลือก",
+        "choice3": "โปรดเลือกพื้น ที่",
         "yes": "ใช่",
         "no": "ไม่",
         "submitfailure": "การส่งล้มเหลว:",

public/locales/zh-CN.json

@@ -32,6 +32,7 @@
         "choice": "请选择",
         "choice1": "请输入关键字",
         "choice2": "选择",
+        "choice3": "请选择地区",
         "yes": "是",
         "no": "否",
         "submitfailure": "提交失败:",

public/locales/zh-TW.json

@@ -32,6 +32,7 @@
         "choice": "請選擇",
         "choice1": "請輸入關鍵字",
         "choice2": "選擇",
+        "choice3": "請選擇地區",
         "yes": "是",
         "no": "否",
         "submitfailure": "提交失敗:",

src/packages/mobile/components/base/calendar/index.vue

@@ -3,10 +3,10 @@
         <div class="app-calendar__label" @click="showCalendar = true">
             <span>{{ title }}</span>
             <span v-if="selectedDate.length">{{ selectedDate.join(type === 'multiple' ? ', ' : ' - ') }}</span>
-            <span v-else>全部</span>
+            <span v-else>{{ $t('common.all') }}</span>
         </div>
         <slot></slot>
-        <Calendar teleport="body" :type="type" :default-date="defaultValue" :min-date="minDate" :max-date="maxDate"
+        <Calendar :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" teleport="body" :type="type" :default-date="defaultValue" :min-date="minDate" :max-date="maxDate"
             :max-range="7" v-model:show="showCalendar" color="#ee0a24" @confirm="onConfirm" allow-same-day />
     </div>
 </template>

src/packages/mobile/components/base/region/index.vue

@@ -4,7 +4,7 @@
             <input class="app-region__input" v-model="inputValue" :placeholder="placeholder" readonly />
         </slot>
         <Popup v-model:show="show" position="bottom" teleport="body" round>
-            <Cascader :title="title" v-model="selectedValue" :options="options" @close="show = false" @change="onChange"
+            <Cascader :title="title" v-model="selectedValue" :placeholder="i18n.global.t('common.choice')" :options="options" @close="show = false" @change="onChange"
                 @finish="onFinish" />
         </Popup>
     </div>
@@ -15,6 +15,7 @@ import { shallowRef, computed, watch } from 'vue'
 import { Popup, Cascader, CascaderOption } from 'vant'
 import { useRequest } from '@/hooks/request'
 import { getDivisions } from '@/services/api/common'
+import { i18n } from "@/stores";
 
 const props = defineProps({
     modelValue: {
@@ -26,7 +27,7 @@ const props = defineProps({
     },
     title: {
         type: String,
-        default: '请选择地区'
+        default: i18n.global.t('common.choice3')
     },
     readonly: {
         type: Boolean,
@@ -34,7 +35,7 @@ const props = defineProps({
     },
     placeholder: {
         type: String,
-        default: '请选择'
+        default: i18n.global.t('common.choice')
     },
 })
 
@@ -87,7 +88,7 @@ const arrayToTree = (list: Model.Region[]) => {
         })
         return result
     }
-    return getChildren('0086')
+    return getChildren('')
 }
 
 useRequest(getDivisions, {

src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -109,9 +109,9 @@ const doWithDrawWarning = () => {
                 formSubmit()
             } else {
                 dialog({
-                    title: t('commone.tips'),
+                    title: t('common.tips'),
                     message: t('banksign.wallet.withdraw.goldisnotwithinthetimeframe'),
-                    confirmButtonText: t('commone.ikonw')
+                    confirmButtonText: t('common.ikonw')
                 })
             }
         }).catch(() => {

src/packages/mobile/views/order/performance/components/history/Index.vue

@@ -4,7 +4,7 @@
             <template #header>
                 <app-navbar :title="$t(buyorsell === 0 ? 'performance.buyhisperformanceinfo' : 'performance.sellhisperformanceinfo')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/report/components/index.vue

@@ -33,7 +33,7 @@
                 <Cell :title="$t('report.tradedetail')" is-link @click="openComponent('trade')" />
             </CellGroup>
             <Popup position="bottom" v-model:show="showPicker" round @click-overlay="dropdownItemRef.toggle()">
-                <DatePicker v-model="currentDate" :max-date="new Date()" :columns-type="columnsType"
+                <DatePicker v-model="currentDate" :cancel-button-text="t('operation.cancel')" :confirm-button-text="t('operation.confirm')" :max-date="new Date()" :columns-type="columnsType"
                     @confirm="onPickerConfirm" @cancel="onPickerCancel" />
             </Popup>
         </div>

src/utils/vant/index.ts

@@ -1,6 +1,7 @@
 import { showNotify, NotifyType, showLoadingToast, showToast, showDialog, DialogOptions, ToastType } from 'vant'
 import { timerInterceptor } from '@/utils/timer'
 import plus from '@/utils/h5plus'
+import { i18n } from '@/stores'
 
 /**
  * 消息通知
@@ -61,6 +62,8 @@ export function dialog(options: string | DialogOptions) {
     if (typeof options === 'string') {
         return showDialog({
             message: options,
+            cancelButtonText: i18n.global.t('operation.cancel'),
+            confirmButtonText: i18n.global.t('operation.confirm')
         })
     }
     return showDialog(options)