kevin_zhangl пре 3 година
родитељ
комит
72e5e1a501

+ 1 - 1
common/models/Transfer.php

@@ -36,7 +36,7 @@ class Transfer extends \common\components\ActiveRecord
 
     const WALLET_NAME = [
         'bonus'=>'Bonus',
-        'cash'=>'Balance',
+        'cash'=>'Ecoin',
     ];
 
     /**

+ 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'=>'Transfer list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'], // 我要转账
+            ['name'=>'Apply for Transfer', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'], // 我要转账
         ]
     ],
 //    'finance'=>[

+ 2 - 2
frontendEle/src/views/atlas/network.vue

@@ -84,7 +84,7 @@
         methods: {
             getData() {
                 this.$message({
-                    message: '正在获取数据,请稍后',
+                    message: 'Retrieving data, please wait.', // 正在获取数据,请稍后
                 })
                 //this.periodNum = baseInfo.nowPeriodNum()
                 //this.filterForm.periodNum = baseInfo.nowPeriodNum()
@@ -93,7 +93,7 @@
             getMainData (userName = null, getList = false) {
                 this.$message.closeAll()
                 this.$message({
-                    message: '正在获取数据,请稍后',
+                    message: 'Retrieving data, please wait.', // 正在获取数据,请稍后
                 })
                 let thisObj = this
                 let requestData = {

+ 1 - 1
frontendEle/src/views/finance/recharge.vue

@@ -187,7 +187,7 @@
             handleSuccess(response, file) {
                 this.getData()
                 this.$message({
-                    message: '上传凭证完成!',
+                    message: 'Successful!',
                     type: 'success'
                 })
                 //this.form.image = imageUrl;

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

@@ -13,10 +13,10 @@
         <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="Current transfer ratio" v-if="false"> <!-- 当前转账比例 -->
           <el-tag type="info">{{transferProp}}%</el-tag>
         </el-form-item>
-        <el-form-item label="最大转账金额" v-if="false"> <!-- 最大转账金额 -->
+        <el-form-item label="Maximum transfer amount" v-if="false"> <!-- 最大转账金额 -->
           <el-tag type="info">{{maxAmount}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
         <el-form-item label="Member code"> <!-- 转入会员编号 -->
@@ -32,11 +32,11 @@
           <el-input v-model="form.amount" type="number" :min="minAmount" :max="maxAmount" @change="chkReal"></el-input>
           <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="Service charge" 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="Actual amount transferred into" v-show="fee!=='0'"> <!-- 实际到账金额 -->
+          <el-tag type="warning">{{realAmount}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
         <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
@@ -62,7 +62,7 @@ export default {
   },
   data () {
     return {
-      allWallet:{'bonus':'会员账户','cash':'现金钱包'},
+      allWallet:{'bonus':'Bonus','cash':'Ecoin'},// 会员奖金 现金钱包
       form: {
         type:1,
         toUserName: '',
@@ -124,7 +124,7 @@ export default {
     },
     getBalance() {
       this.$message({
-        message: '正获取您的奖金...',
+        message: 'Collecting your bonus...', // 正获取您的奖金
         type: 'info'
       })
       network.getData('finance/available-balance').then(response => {

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

@@ -12,12 +12,12 @@
             {{tool.formatPrice(scope.row.ORI_AMOUNT)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="手续费" prop="FEE" v-if="showFee"> <!-- 手续费 -->
+        <el-table-column label="Service charge" 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="Actual amount transferred into" prop="AMOUNT" v-if="showFee"> <!-- 实际入账金额 -->
           <template slot-scope="scope">
             {{tool.formatPrice(scope.row.AMOUNT)}}<br>
           </template>