Handy_Cao 1 год назад
Родитель
Сommit
e849bacd46

+ 11 - 11
public/locales/en-US.json

@@ -520,7 +520,7 @@
         "title": "My Position",
         "holddetail": "Hold Detail",
         "goods": {
-            "title": "Order Position",
+            "title": "Order",
             "subtitle": "Position Info",
             "subtitle2": "Delivery Info",
             "subtitle3": "Transfer Info",
@@ -565,7 +565,7 @@
             }
         },
         "spot": {
-            "title": "Spot Position",
+            "title": "Spot",
             "subtitle": "Spot Position Info",
             "subtitle2": "Listing Info",
             "goodsname": "Name/Code",
@@ -605,7 +605,7 @@
             "email": "Email:"
         },
         "presale": {
-            "title": "PreSale Position",
+            "title": "PreSale",
             "title1": "PreSale Position Detail",
             "subtitle": "PreSale Position Info",
             "goodsname": "Name/Code",
@@ -623,7 +623,7 @@
             "tips": "Is the transfer deposit made up?"
         },
         "transfer": {
-            "title": "Transfer Position",
+            "title": "Transfer",
             "title1": "Transfer Position Detail",
             "subtitle": "Transfer Position Information",
             "goodsname": "Name/Code",
@@ -652,7 +652,7 @@
             "tips4": "Please input quantity"
         },
         "swap": {
-            "title": "Swap Position",
+            "title": "Swap",
             "averageprice": "AveragePrice",
             "curpositionqty": "CurPositionQty",
             "curholderamount": "CurHolderAmount",
@@ -665,7 +665,7 @@
             "tips12": "Request is successful"
         },
         "pricing": {
-            "title": "Pricing Position",
+            "title": "Pricing",
             "curpositionqty": "CurPositionQty",
             "averageprice": "AveragePrice",
             "frozenqty": "FrozenQty",
@@ -677,7 +677,7 @@
     "delivery": {
         "title": "Delivery Pick Up",
         "online": {
-            "title": "Online Order",
+            "title": "Online",
             "title2": "History Online Order",
             "subtitle": "Online Order Information",
             "wrtypename": "WrTypeName",
@@ -695,7 +695,7 @@
             "deliveryid": "DeliveryId"
         },
         "offline": {
-            "title": "Offline Order",
+            "title": "Offline",
             "subtitle": "Offline Order Information",
             "goodsname": "Name/Code",
             "buyorselldisplay": "Direction",
@@ -710,7 +710,7 @@
             "deliveryorderid": "OrderId"
         },
         "spot": {
-            "title": "Spot Order",
+            "title": "Spot",
             "subtitle": "Pick Up Information",
             "goodsname": "Name/Code",
             "warehousename": "WarehouseName",
@@ -805,8 +805,8 @@
         "title2": "History Buy Performance",
         "title3": "History Sell Performance",
         "subtitle": "Execut Information",
-        "buy": "Buy Performance",
-        "sell": "Sell Performance",
+        "buy": "Buy",
+        "sell": "Sell",
         "performancetype": "Type",
         "wrstandardname": "WrstandardName",
         "warehousename": "Warehouse",

+ 6 - 3
src/packages/mobile/views/order/delivery/Index.vue

@@ -24,23 +24,26 @@
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent, computed } from 'vue'
 import { Tab, Tabs } from 'vant'
+import { i18n } from '@/stores'
 import { useComponent } from '@/hooks/component'
 
+const { global: { t } } = i18n
+
 const components = [
     {
         name: 'goodsorder',
-        title: '点选交收单',
+        title: t('delivery.online.title'),
         component: defineAsyncComponent(() => import('./components/online/list/Index.vue')),
         history: defineAsyncComponent(() => import('./components/online/history/Index.vue')),
     },
     {
         name: 'goodstrade',
-        title: '线下交收单',
+        title: t('delivery.offline.title'),
         component: defineAsyncComponent(() => import('./components/offline/list/Index.vue'))
     },
     {
         name: 'listingorder',
-        title: '现货提货单',
+        title: t('delivery.spot.title'),
         component: defineAsyncComponent(() => import('./components/spot/list/Index.vue')),
     }
 ]

+ 1 - 1
src/packages/mobile/views/order/position/components/goods/delivery50/index.vue

@@ -35,7 +35,7 @@
                         :value="((formData.DeliveryLot ?? 0) * selectedRow.agreeunit) + selectedRow.goodunit" />
                     <Field name="DeliveryInfo" v-model="formData.DeliveryInfo" type="textarea" autosize clearable
                         :rules="formRules.DeliveryInfo" maxlength="50"
-                        :label="selectedRow.buyorsell === BuyOrSell.Buy ? $t('position.goods.address') : $t('position.goods.deliveryinfo')" :placeholder="$t('common.require')">
+                        :label="selectedRow.buyorsell === BuyOrSell.Buy ? $t('position.goods.address') : $t('position.goods.deliveryinfo')" :placeholder="$t('common.required')">
                         <template #right-icon v-if="selectedRow.buyorsell === BuyOrSell.Buy">
                             <Icon name="add-o" @click="showContact = true" />
                         </template>

+ 1 - 1
src/packages/mobile/views/order/position/components/spot/listing/Index.vue

@@ -22,7 +22,7 @@
                                 :default-value="selectedRow.enableqty" :auto-fixed="false" integer />
                         </template>
                     </Field>
-                    <Field name="FixedPrice" :rules="formRules.FixedPrice" label="$t('position.spot.fixedprice')">
+                    <Field name="FixedPrice" :rules="formRules.FixedPrice" :label="$t('position.spot.fixedprice')">
                         <template #input>
                             <Stepper v-model="formData.FixedPrice" theme="round" :decimal-length="2" :auto-fixed="false"
                                 button-size="22" />

+ 4 - 4
src/packages/mobile/views/order/position/components/spot/pickup/Index.vue

@@ -25,9 +25,9 @@
                                 <app-select v-model="formData.AppointmentModel" :options="getAppointmentModelOutList()" />
                             </template>
                         </Field>
-                        <Field name="ContractName" :label="$t('position.spot.contactname')" v-model="formData.ContactName" :placeholder="$t('common.require')"
+                        <Field name="ContractName" :label="$t('position.spot.contactname')" v-model="formData.ContactName" :placeholder="$t('common.required')"
                             :rules="formRules.ContactName" right-icon="add-o" @click-right-icon="showContact = true" />
-                        <Field name="ContactNum" :label="$t('position.spot.contactnum')" v-model="formData.ContactNum" :placeholder="$t('common.require')"
+                        <Field name="ContactNum" :label="$t('position.spot.contactnum')" v-model="formData.ContactNum" :placeholder="$t('common.required')"
                             :rules="formRules.ContactNum" />
                         <template v-if="formData.AppointmentModel === 1">
                             <Field :rules="formRules.Region" name="Region" :label="$t('position.spot.district')" is-link v-if="!animation">
@@ -37,10 +37,10 @@
                                 </template>
                             </Field>
                             <Field name="Address" type="textarea" :label="$t('position.spot.address')" row="2" v-model="formData.Address"
-                                :placeholder="$t('common.require')" :rules="formRules.Address" />
+                                :placeholder="$t('common.required')" :rules="formRules.Address" />
                         </template>
                         <Field name="AppointmentRemark" type="textarea" :label="$t('position.spot.remark')" rows="2" autosize
-                            v-model="formData.AppointmentRemark" :placeholder="$t('common.require')" :rules="formRules.AppointmentRemark"
+                            v-model="formData.AppointmentRemark" :placeholder="$t('common.required')" :rules="formRules.AppointmentRemark"
                             right-icon="add-o" @click-right-icon="showReceipt = true" />
                     </CellGroup>
                 </Form>