Просмотр исходного кода

会员端,转账相关翻译

theo 3 лет назад
Родитель
Сommit
b001ae139e

+ 2 - 2
common/models/Transfer.php

@@ -35,8 +35,8 @@ class Transfer extends \common\components\ActiveRecord
 {
 
     const WALLET_NAME = [
-        'bonus'=>'奖金',
-        'cash'=>'余额',
+        'bonus'=>'Bonus',
+        'cash'=>'Balance',
     ];
 
     /**

+ 1 - 1
frontendApi/config/menu.php

@@ -87,7 +87,7 @@ return [
             ['name'=>'Recharge details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],//充值明细
             ['name'=>'Apply for recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>1,], // 申请充值
             ['name'=>'Transfer record list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch'],
-            ['name'=>'我要转账', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'],
+            ['name'=>'Transfer list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'], // 我要转账
         ]
     ],
 //    'finance'=>[

+ 22 - 22
frontendEle/src/components/FilteTransfer.vue

@@ -6,26 +6,26 @@
         format="yyyy-MM-dd"
         type="daterange"
         :editable="false"
-        range-separator=""
-        start-placeholder="开始日期"
-        end-placeholder="结束日期">
+        range-separator="to"
+        start-placeholder="Start date"
+        end-placeholder="End date"> <!-- 结束日期 -->
       </el-date-picker>
     </div>
 
     <div :class="`filter-item filter-user-name`">
-      <el-select v-model="filterModel.outWallet" placeholder="请选择转出账户">
+      <el-select v-model="filterModel.outWallet" placeholder="Select transfer out of account"> <!-- 请选择转出账户 -->
         <el-option v-for="(item,key) in walletType" :label="item.label" :value="item.type"
                    :key="key"></el-option>
       </el-select>
     </div>
     <div v-show="userNameDisplay" :class="`filter-item filter-user-name ${userNameClass}`">
-      <el-input v-model="filterModel.userName" placeholder="请输入接收会员编号"></el-input>
+      <el-input v-model="filterModel.userName" placeholder="Enter your receiving member code"></el-input> <!-- 请输入接收会员编号 -->
     </div>
     <div v-show="realNameDisplay" :class="`filter-item filter-real-name ${realNameClass}`">
-      <el-input v-model="filterModel.realName" placeholder="请输入接收会员姓名"></el-input>
+      <el-input v-model="filterModel.realName" placeholder="Enter the name of receiving member"></el-input> <!-- 请输入接收会员姓名 -->
     </div>
     <div :class="`filter-item filter-user-name`">
-      <el-select v-model="filterModel.inWallet" placeholder="请选择转入账户">
+      <el-select v-model="filterModel.inWallet" placeholder="Select transfer in account"> <!-- 请选择转入账户 -->
         <el-option v-for="(item,key) in walletType" :label="item.label" :value="item.type"
                    :key="key"></el-option>
       </el-select>
@@ -79,12 +79,12 @@ export default {
       default: '',
     },
     inWalletDefault: {
-        type: String,
-        default: '',
+      type: String,
+      default: '',
     },
     outWalletDefault: {
-        type: String,
-        default: '',
+      type: String,
+      default: '',
     },
     realNameDefault: {
       type: String,
@@ -106,14 +106,14 @@ export default {
         inWallet: '',
       },
       walletType: [
-          {
-              type:"bonus",
-              label:"奖金"
-          },
-          {
-              type:"cash",
-              label:"余额"
-          },
+        {
+          type: 'bonus',
+          label: 'Bonus'
+        },
+        {
+          type: 'cash',
+          label: 'Balance'
+        },
       ],
     }
   },
@@ -122,16 +122,16 @@ export default {
       this.filterModel.dateRange = this.dateRangePickerDefault
     },
     outWalletdefault () {
-        this.filterModel.outWallet = this.outWalletDefault
+      this.filterModel.outWallet = this.outWalletDefault
     },
     userNameDefault () {
-        this.filterModel.userName = this.userNameDefault
+      this.filterModel.userName = this.userNameDefault
     },
     realNameDefault () {
       this.filterModel.realName = this.realNameDefault
     },
     inWalletDefault () {
-        this.filterModel.inWallet = this.inWalletDefault
+      this.filterModel.inWallet = this.inWalletDefault
     },
   },
   methods: {

+ 4 - 4
frontendEle/src/components/Filter.vue

@@ -6,9 +6,9 @@
         format="yyyy-MM-dd"
         type="daterange"
         :editable="false"
-        range-separator=""
-        start-placeholder="开始日期"
-        end-placeholder="结束日期">
+        range-separator="to"
+        start-placeholder="Start date"
+        end-placeholder="End date">
       </el-date-picker>
     </div>
     <div v-show="dateMonthPickerDisplay" :class="`filter-item filter-date-month-picker ${dateMonthPickerClass}`">
@@ -188,4 +188,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

+ 2 - 3
frontendEle/src/router/index.js

@@ -455,7 +455,7 @@ export const constantRouterMap = [
         component: _import('finance/transfer-list'),
         name: 'finance_transfer-list',
         meta: {
-          title: '转账记录',
+          title: 'Tranfer record',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
             {title: 'Financial management', path: '/finance/index'},
@@ -467,12 +467,11 @@ export const constantRouterMap = [
         component: _import('finance/transfer-add'),
         name: 'finance_transfer-add',
         meta: {
-          title: '我要转账',
+          title: 'Transfer list',
           highLight: '/finance/transfer-list',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
             {title: 'Financial management', path: '/finance/index'},
-            {title: 'Transfer list', path: '/finance/transfer-list'},
           ],
         },
       },

+ 23 - 23
frontendEle/src/views/finance/transfer-add.vue

@@ -2,47 +2,47 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="250px" class="form-page">
-        <el-form-item label="转账类型">
-          <el-select v-model="form.type" placeholder="请选择转账类型" @change="handleTypeChange">
-            <el-option v-for="(item,key) in transferConfig" :label="item.outName+''+item.inName" :value="item.typeId" :key="key"></el-option>
+        <el-form-item label="Transfer type"> <!-- 转账类型 -->
+          <el-select v-model="form.type" placeholder="请选择转账类型" @change="handleTypeChange">  <!-- 请选择转账类型 -->
+            <el-option v-for="(item,key) in transferConfig" :label="item.outName+' To '+item.inName" :value="item.typeId" :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="当前可用奖金">
-          <el-tag type="success">{{balance}}元</el-tag>
+        <el-form-item label="Current available bonus"> <!-- 当前可用奖金 -->
+          <el-tag type="success">{{balance}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="当前可用余额">
-          <el-tag type="success">{{cash}}元</el-tag>
+        <el-form-item label="Current available balance"> <!-- 当前可用余额 -->
+          <el-tag type="success">{{cash}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="当前转账比例" v-if="false">
+        <el-form-item label="当前转账比例" v-if="false"> <!-- 当前转账比例 -->
           <el-tag type="info">{{transferProp}}%</el-tag>
         </el-form-item>
-        <el-form-item label="最大转账金额" v-if="false">
-          <el-tag type="info">{{maxAmount}}元</el-tag>
+        <el-form-item label="最大转账金额" v-if="false"> <!-- 最大转账金额 -->
+          <el-tag type="info">{{maxAmount}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="转入会员编号">
+        <el-form-item label="Member code"> <!-- 转入会员编号 -->
           <el-input v-model="form.toUserName" @change="handleChange"></el-input>
         </el-form-item>
-        <el-form-item label="会员姓名" v-show="form.toRealName!==null">
+        <el-form-item label="Member name" v-show="form.toRealName!==null"> <!-- 会员姓名 -->
           <el-input v-model="form.toRealName" :disabled="true"></el-input>
         </el-form-item>
         <!--<el-form-item label="转入会员姓名">-->
           <!--<el-input v-model="form.toRealName"></el-input>-->
         <!--</el-form-item>-->
-        <el-form-item label="转账金额" style="margin-bottom: 0;">
+        <el-form-item label="Transfer amount" style="margin-bottom: 0;"> <!-- 转账金额 -->
           <el-input v-model="form.amount" type="number" :max="maxAmount" @change="chkReal"></el-input>
-          <span style="font-size: 8pt;color: #909399;">每次转账不得少于100</span>
+          <span style="font-size: 8pt;color: #909399;">Each transfer shall not be less than 5000 NGN</span> <!-- 每次转账不得少于100 -->
         </el-form-item>
-        <el-form-item label="手续费" v-show="fee!=='0'">
+        <el-form-item label="手续费" v-show="fee!=='0'"> <!-- 手续费 -->
           <el-tag type="info">{{fee}}%</el-tag>
         </el-form-item>
-        <el-form-item label="实际到账金额" v-show="fee!=='0'">
-          <el-tag type="warning">{{realAmount}}元</el-tag>
+        <el-form-item label="实际到账金额" v-show="fee!=='0'"> <!-- 实际到账金额 -->
+          <el-tag type="warning">{{realAmount}}元</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">提交</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">Submit</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -102,14 +102,14 @@ export default {
     chkReal(){
       this.realAmount = tool.formatPrice(this.form.amount * (100-this.fee) * 0.01)
     },
-    getWalletName(out,inw){
-      return this.allWallet[out]+'转'+this.allWallet[inw]
+    getWalletName(out,inw) {
+      return this.allWallet[out] +' To ' + this.allWallet[inw]
     },
     handleTypeChange(){
-      //奖金转现金
+      // 奖金转现金
       this.fee = this.transferConfig[this.form.type-1].fee
     },
-    chkTransferUserinfo(){
+    chkTransferUserinfo() {
       network.getData(`finance/chk-transfer-user`).then(response => {
         this.loading = false
         this.userInfo = response.userInfo

+ 10 - 10
frontendEle/src/views/finance/transfer-list.vue

@@ -3,31 +3,31 @@
     <div class="white-box">
       <filter-transfer :filter="handleFilter" :dateRangePickerDisplay="true"></filter-transfer>
       <el-table :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="转出账户" prop="OUT_WALLET_NAME"></el-table-column>
-        <el-table-column label="接收会员编号" prop="LAST_IN_USER_NAME"></el-table-column>
-        <el-table-column label="接收会员姓名" prop="LAST_IN_REAL_NAME"></el-table-column>
-        <el-table-column label="转入账户" prop="IN_WALLET_NAME"></el-table-column>
-        <el-table-column label="转账金额" prop="ORI_AMOUNT">
+        <el-table-column label="Transfer accounts" prop="OUT_WALLET_NAME"></el-table-column> <!-- 转出账户 -->
+        <el-table-column label="Receiving Member Code" prop="LAST_IN_USER_NAME"></el-table-column> <!-- 接收会员编号 -->
+        <el-table-column label="Receiving Member Name" prop="LAST_IN_REAL_NAME"></el-table-column> <!-- 接收会员姓名 -->
+        <el-table-column label="Transfer into account" prop="IN_WALLET_NAME"></el-table-column> <!-- 转入账户 -->
+        <el-table-column label="Transfer amount" prop="ORI_AMOUNT"> <!-- 转账金额 -->
           <template slot-scope="scope">
             {{tool.formatPrice(scope.row.ORI_AMOUNT)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="手续费" prop="FEE" v-if="showFee">
+        <el-table-column label="手续费" prop="FEE" v-if="showFee"> <!-- 手续费 -->
           <template slot-scope="scope">
             {{tool.formatPrice(scope.row.FEE)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="实际入账金额" prop="AMOUNT" v-if="showFee">
+        <el-table-column label="实际入账金额" prop="AMOUNT" v-if="showFee"> <!-- 实际入账金额 -->
           <template slot-scope="scope">
             {{tool.formatPrice(scope.row.AMOUNT)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="转账时间">
+        <el-table-column label="Transfer time"> <!-- 转账时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="REMARK"></el-table-column>
+        <el-table-column label="Note" prop="REMARK"></el-table-column> <!-- 备注 -->
       </el-table>
       <div class="white-box-footer">
         <!--<el-button type="primary" size="small" @click="handleAdd">我要转账</el-button>-->
@@ -91,4 +91,4 @@
 
 <style scoped>
 
-</style>
+</style>