1

src/locales/lang/en/common.ts

@@ -8,6 +8,7 @@ export default {
   resetText: 'Reset',
   searchText: 'Search',
   queryText: 'Search',
+  state: 'state',
 
   inputText: 'Please enter',
   chooseText: 'Please choose',

src/locales/lang/en/routes/equity.ts

@@ -1,76 +1,75 @@
 export default {
-  add:'New Authorization',
-  addDowm:'New Download',
-  renew:'Renew',
-  userName:'User Account',
-  count:'User Account',
-  orderSn:'Order Number',
-  payTime:'Payment Time',
-  invoiceTime:'Invoicing application time',
-  money:'Invoiced Amount',
-  id:'ID',
-  dowmCount:'Download Time',
-  timeList:'Authorization Time',
-  expiryTime: 'Expiry Date', 
-  newTime:'Latest Authorization Time',
-  time:'Start Date',
-  countNumber:'Quantity',
-  Type:'Type',
-  giveType:'Methods',
-  nickName:'Nickname',
-  userName1:'Account',
-  email:'Email',
-  userCount:'Authorized Quantity',
-  incrementType:{
-    0:'Membership Subscription',
-    1:'Scene Download',
+  add: 'New Authorization',
+  addDowm: 'New Download',
+  renew: 'Renew',
+  userName: 'User Account',
+  count: 'User Account',
+  orderSn: 'Order Number',
+  payTime: 'Payment Time',
+  invoiceTime: 'Invoicing application time',
+  money: 'Invoiced Amount',
+  id: 'ID',
+  dowmCount: 'Download Time',
+  timeList: 'Authorization Time',
+  expiryTime: 'Expiry Date',
+  newTime: 'Latest Authorization Time',
+  time: 'Start Date',
+  countNumber: ' Quantity',
+  Type: ' Type',
+  giveType: 'Methods',
+  nickName: 'Nickname',
+  userName1: 'Account',
+  email: 'Email',
+  userCount: 'Authorized Quantity',
+  incrementType: {
+    0: 'Membership Subscription',
+    1: 'Scene Download',
   },
-  equityType:{
-    0:'Premium (Yearly)',
-    1:'Premium (Yearly)',
-    2:'Premium (Yearly)',
-    3:'Senior (Monthly)',
+  equityType: {
+    0: 'Premium (Yearly)',
+    1: 'Premium (Yearly)',
+    2: 'Premium (Yearly)',
+    3: 'Senior (Monthly)',
   },
-  zhTips:'Chinese characters are not supported',
-  listTitle:'Sales Statistics List',
-  exportExcel:'Export to Excel',
-  excelTitle:'Are you sure you want to export excel?',
+  zhTips: 'Chinese characters are not supported',
+  listTitle: 'Sales Statistics List',
+  exportExcel: 'Export to Excel',
+  excelTitle: 'Are you sure you want to export excel?',
   CardMajorNum: "Last Month's Premium Membership Sales (Yearly)",
   CardHighNum: "Last Month's Senior Membership Sales (Monthly)",
   CardDownNum: "Last Month's Download Sales",
-  syks:'surplus',
-  addcount:'Quantity',
-  rules:{
-    userName:'Please enter the user account',
-    userName1:'Please enter the correct user account',
-    userName2:'The account does not exist',
-    id:'Please enter the correct benefit ID',
+  syks: 'Available for sale',
+  addcount: ' Quantity',
+  rules: {
+    userName: 'Please enter the user account',
+    userName1: 'Please enter the correct user account',
+    userName2: 'The account does not exist',
+    id: 'Please enter the correct benefit ID',
   },
-  unit:{
-    1:'',
-    2:'/Number of times',
-    '-1':'-Year',
-    '-2':'-Month',
-    '-3':'-Month',
+  unit: {
+    1: '',
+    2: '/Number of times',
+    '-1': '-Year',
+    '-2': '-Month',
+    '-3': '-Month',
   },
-  titleHelpMessage:{
-    1:'Statistical Guidelines：',
-    2:'Membership Subscription: current records of new authorizations by dealers and related ID renewal records, including dealer authorizations and renewals, platform authorizations (renewals), and official website purchases (renewals).',
-    3:'Scene Download: statistical information on the number of downloads of current new authorizations by sales.',
+  titleHelpMessage: {
+    1: 'Statistical Guidelines：',
+    2: 'Membership Subscription: current records of new authorizations by dealers and related ID renewal records, including dealer authorizations and renewals, platform authorizations (renewals), and official website purchases (renewals).',
+    3: 'Scene Download: statistical information on the number of downloads of current new authorizations by sales.',
   },
-  totalTime:'Duration',
-  totalMessge:'Insufficient Remaining Saleable Membership Subscriptions',
-  operationType:'Operation',
-  operationUserName:'User',
-  operationTime:'Operation Time',
-  incrementId:'Membership Subscription ID',
+  totalTime: ' Duration',
+  totalMessge: 'Insufficient Remaining Saleable Membership Subscriptions',
+  operationType: 'Operation',
+  operationUserName: 'User',
+  operationTime: 'Operation Time',
+  incrementId: 'Membership Subscription ID',
   platform: 'Platform',
-  operation:{
-    0:'Authorize',
-    1:'Deauthorize',
-    2:'Bind',
-    3:'Unbind',
+  operation: {
+    0: 'Authorize',
+    1: 'Deauthorize',
+    2: 'Bind',
+    3: 'Unbind',
   },
-  jjxs:'total',
-}
-
+  jjxs: 'Upcoming sale',
+};

src/locales/lang/en/routes/finance.ts

@@ -11,6 +11,7 @@ export default {
   staffList: 'Account List',
   updateBtn: 'Change Password',
   password: 'Change Password',
+  agentName: 'Authorizer',
   equityType: {
     0: 'Premium (Yearly)',
     1: 'Senior (Monthly)',
@@ -22,5 +23,5 @@ export default {
     2: 'Official Website Purchase',
     3: 'Platform Authorization',
   },
-  totalTime:'Total duration of the authorization (year/month)',
+  totalTime: 'Total duration of the authorization (year/month)',
 };

src/views/equity/DownModal.vue

@@ -4,6 +4,7 @@
     @register="register"
     :title="t('routes.equity.addDowm')"
     height="500"
+    width="550px"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"

src/views/equity/InvoiceModal.vue

@@ -5,6 +5,7 @@
     :title="t('routes.equity.add')"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
+    width="550px"
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
@@ -159,7 +160,6 @@
             min: 1,
             onChange: (value) => {
               let { incrementTypeId, totalTime } = getFieldsValue();
-              console.log('totalTime', totalTime);
               updateSchema([
                 {
                   field: 'totalTime',

src/views/retailer/EditModal.vue

@@ -6,6 +6,7 @@
     @visible-change="handleVisibleChange"
     :confirmLoading="loading"
     @cancel="resetFields"
+    width="650px"
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
@@ -30,6 +31,7 @@
   import { isEmojiCharacter } from '/@/utils';
   import { useUserStore } from '/@/store/modules/user';
   import { addIncrementNum } from '/@/api/retailer';
+  import { useLocaleStore } from '/@/store/modules/locale';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -47,6 +49,8 @@
       const userStore = useUserStore();
       const { getUserInfoAction } = userStore
       const isDev = computed(() => userStore.getSystemEnv);
+      const localeStore = useLocaleStore();
+      const isEn = computed(() => localeStore.getLocale === 'en');
       const agent = computed(() => userStore.getAgent);
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
@@ -98,7 +102,7 @@
         },
       ];
       const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
-        labelWidth: 300,
+        labelWidth: isEn.value?450:300,
         schemas,
         showActionButtonGroup: false,
         actionColOptions: {

src/views/retailer/index.vue

@@ -143,6 +143,7 @@
             }
             return h(Switch, {
               checked: record.status == '0',
+              style: 'width: 80px',
               checkedChildren: t('routes.retailer.form.enable'),
               unCheckedChildren: t('routes.retailer.form.stopUsing'),
               loading: false,
@@ -163,7 +164,7 @@
         },
       ];
       const searchForm: Partial<FormProps> = {
-        labelWidth: 100,
+        labelWidth: 150,
         autoSubmitOnEnter: true,
         schemas: [
           {
@@ -174,8 +175,8 @@
               maxLength: 100,
             },
             colProps: {
-              xl: 6,
-              xxl: 6,
+              xl: 10,
+              xxl: 10,
             },
           },
         ],
@@ -201,7 +202,7 @@
         //   return T
         // },
         actionColumn: {
-          width: 150,
+          width: 180,
           title: t('common.operating'),
           dataIndex: 'action',
           slots: { customRender: 'action' },