Browse Source

会员端翻译

root 3 years ago
parent
commit
e63c1a3ce7

+ 2 - 2
backendEle/src/views/dashboard/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div v-loading="loading">
-    <h1>欢迎您,{{adminName}}</h1>
+    <h1><!-- 欢迎您 -->Welcome,{{adminName}}</h1>
     <div class="white-box" style="margin-bottom: 15px;" v-show="false">
-      <h1>欢迎您,{{adminName}}</h1>
+      <h1><!-- 欢迎您 -->Welcome,{{adminName}}</h1>
       <el-button type="primary" @click="tool.go('/user/index')" v-show="permission.hasPermission(`user/index`)">会员管理
       </el-button>
       <el-button type="success" @click="tool.go('/bonus/period')" v-show="permission.hasPermission(`bonus/period`)">

+ 7 - 7
backendEle/src/views/layout/layout.vue

@@ -3,7 +3,7 @@
     <el-aside :class="menuClass" width="">
       <el-menu :default-active="menuActiveIndex" :router="true" :collapse="isCollapse" :unique-opened="true">
         <div class="site-title">
-          <h1>结算系统后台</h1>
+          <h1>Settlement system background<!-- 结算系统后台 --></h1>
         </div>
         <div class="user-profile">
           <img src="../../static/img/avatar/1.png" alt="" class="profile-avatar img-circle">
@@ -12,8 +12,8 @@
         {{adminName}} <i class="el-icon-caret-bottom el-icon--right"></i>
       </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item icon="el-icon-sort" @click.native="onChangePassword">重置密码</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-switch-button" @click.native="onLogout">退出登录</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-sort" @click.native="onChangePassword">Reset password<!-- 重置密码 --></el-dropdown-item>
+              <el-dropdown-item icon="el-icon-switch-button" @click.native="onLogout">Log out<!-- 退出登录 --></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -58,8 +58,8 @@
           </li>
         </ul>
         <div style="text-align: right;font-size: 14px;">
-          当前系统时间:{{nowDateTime}}&nbsp;&nbsp;&nbsp;&nbsp;
-          当期期数:<b class="text-danger">{{periodNum}}</b>
+          Current System Time<!-- 当前系统时间 -->:{{nowDateTime}}&nbsp;&nbsp;&nbsp;&nbsp;
+          Current Period<!-- 当期期数 -->:<b class="text-danger">{{periodNum}}</b>
           <el-breadcrumb separator="/">
             <el-breadcrumb-item v-for="(item, index) in breadcrumb" :to="{ path: item.path }" :key="index">
               {{item.title}}
@@ -77,12 +77,12 @@
     </el-container>
     <div style="position: fixed;right:4px;bottom: 10px;z-index: 999">
       <p class="mar-btm" v-if="showBackToUp">
-        <el-tooltip class="item" effect="dark" content="回到顶部" placement="top-start">
+        <el-tooltip class="item" effect="dark" content="Top" placement="top-start"><!-- 回到顶部 -->
           <el-button type="primary" @click="backTop" circle plain><i class="fa fa-arrow-up"></i></el-button>
         </el-tooltip>
       </p>
       <p>
-        <el-tooltip class="item" effect="dark" content="返回上一页" placement="top-start">
+        <el-tooltip class="item" effect="dark" content="previous page" placement="top-start"><!-- 返回上一页 -->
           <el-button type="primary" @click="$router.go(-1)" circle plain><i class="fa fa-arrow-left"></i></el-button>
         </el-tooltip>
       </p>

+ 4 - 3
common/helpers/bonus/BonusCalc.php

@@ -3156,6 +3156,7 @@ class BonusCalc extends BaseObject {
         //判断是否达到了本月扣除复消的上限
         $cacheData = CalcCache::monthLastPeriodReconsumePoints($userId, $this->_periodNum, $this->_calcYearMonth);
         $bonusCache = CalcCache::bonus($userId, $this->_periodNum);
+
         $reConsumePointsTotal = $bonusCache['RECONSUME_POINTS'] + $cacheData['RECONSUME_POINTS_SUM'];
         $reConsumePointsCap = $this->_sysConfig['reConsumePointsMonthCap']['VALUE'];
         unset($cacheData, $bonusCache);
@@ -3171,9 +3172,9 @@ class BonusCalc extends BaseObject {
         $manageTax = $bonus * $this->_sysConfig['manageTaxPercent']['VALUE'] / 100;
         $surplus = $bonus - $reConsumePoints - $manageTax;
         return [
-            'reConsumePoints' => Tool::formatPrice($reConsumePoints),
-            'manageTax' => Tool::formatPrice($manageTax),
-            'surplus' => Tool::formatPrice($surplus),
+            'reConsumePoints' => Tool::formatPrice($reConsumePoints),//复效积分
+            'manageTax' => Tool::formatPrice($manageTax),//管理费
+            'surplus' => Tool::formatPrice($surplus),//真实奖金
         ];
     }
 

+ 6 - 6
frontendApi/config/menu.php

@@ -74,7 +74,7 @@ return [
         'child'=>[
             ['name'=>'My account', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1,],//我的账户
 //            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new', 'routePath'=>'bonus/new', 'show'=>1,'allow'=>'newBonusSwitch'],
-            ['name'=>'往期奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch'],//往期奖金
+            ['name'=>'Previous bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch'],//往期奖金
             //['name'=>'实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
            // ['name'=>'房产积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'fc-point', 'routePath'=>'bonus/fc-point', 'show'=>1,],
 //            ['name'=>'报单中心补助明细查询', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bt', 'routePath'=>'bonus/flow-bt', 'show'=>1,],
@@ -82,7 +82,7 @@ return [
         ]
     ],
     'finance'=>[
-        'name'=>'财务管理',
+        'name'=>'financial management',//财务管理
         'class' => '',
         'icon'=>'el-icon-bank-card',
         'controller'=>'finance',
@@ -93,9 +93,9 @@ return [
 //            ['name'=>'会员复销池余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'reconsume-pool-flow', 'routePath'=>'finance/reconsume-pool-flow', 'show'=>1,],
             ['name'=>'转账记录', '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'=>'提现明细', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],
+            ['name'=>'Withdrawal details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],//提现明细
             ['name'=>'申请提现', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0,],
-            ['name'=>'充值明细', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],
+            ['name'=>'Recharge details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],//充值明细
             ['name'=>'申请充值', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>0,],
         ]
     ],
@@ -125,7 +125,7 @@ return [
 //        ]
 //    ],
     'config'=>[
-        'name'=>'设置',
+        'name'=>'Setting',//设置
         'class' => '',
         'icon'=>'el-icon-setting',
         'controller'=>'config',
@@ -134,7 +134,7 @@ return [
         'show'=>1,
         'child'=>[
 //            ['name'=>'个人设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1,],
-            ['name'=>'收货地址管理', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],
+            ['name'=>'Receiving address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
         ]
     ],
 ];

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

@@ -18,7 +18,7 @@
         value-format="yyyyMM"
         type="month"
         :editable="false"
-        placeholder="选择结算月">
+        placeholder="Date"><!-- 选择结算月 -->
       </el-date-picker>
     </div>
     <div v-show="periodNumDisplay" :class="`filter-item filter-period-num ${periodNumClass}`">
@@ -30,7 +30,7 @@
     <div v-show="userNameDisplay" :class="`filter-item filter-user-name ${userNameClass}`">
       <el-input v-model="filterModel.userName" placeholder="请输入会员编号"></el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button><!-- 筛选 -->
   </div>
 </template>
 

+ 28 - 28
frontendEle/src/router/index.js

@@ -274,10 +274,10 @@ export const constantRouterMap = [
         component: _import('bonus/other'),
         name: 'bonus_other',
         meta: {
-          title: '往期奖金',
+          title: 'Previous bonus',//往期奖金
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/index'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/index'},//奖金管理
           ],
         },
       },
@@ -392,10 +392,10 @@ export const constantRouterMap = [
         component: _import('finance/withdraw'),
         name: 'finance_withdraw',
         meta: {
-          title: '提现明细',
+          title: 'Withdrawal details',//提现明细
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/index'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'financial management', path: '/finance/index'},//财务管理
           ],
         },
       },
@@ -404,12 +404,12 @@ export const constantRouterMap = [
         component: _import('finance/withdraw-add'),
         name: 'finance_withdraw-add',
         meta: {
-          title: '我要提现',
+          title: 'Withdraw',//我要提现
           highLight: '/finance/withdraw',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/index'},
-            {title: '提现明细', path: '/finance/withdraw'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'financial management', path: '/finance/index'},//财务管理
+            {title: 'Withdrawal details', path: '/finance/withdraw'},//提现明细
           ],
         },
       },
@@ -456,10 +456,10 @@ export const constantRouterMap = [
             component: _import('finance/recharge'),
             name: 'finance_recharge',
             meta: {
-                title: '充值明细',
+                title: 'Recharge details',//充值明细
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '财务管理', path: '/finance/index'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'financial management', path: '/finance/index'},//财务管理
                 ],
             },
         },
@@ -468,12 +468,12 @@ export const constantRouterMap = [
             component: _import('finance/recharge-add'),
             name: 'finance_recharge-add',
             meta: {
-                title: '我要充值',
+                title: 'Recharge',//我要充值
                 highLight: '/finance/recharge',
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '财务管理', path: '/finance/index'},
-                    {title: '提现明细', path: '/finance/withdraw'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'financial management', path: '/finance/index'},//财务管理
+                    {title: 'Withdrawal details', path: '/finance/withdraw'},
                 ],
             },
         },
@@ -489,10 +489,10 @@ export const constantRouterMap = [
         component: _import('config/receive-address-list'),
         name: 'config_receive-address-list',
         meta: {
-          title: '收货地址管理',
+          title: 'Receiving address',//收货地址管理
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '设置', path: '/config/base'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Setting', path: '/config/base'},//设置
           ],
         },
       },
@@ -501,12 +501,12 @@ export const constantRouterMap = [
         component: _import('config/receive-address-edit'),
         name: 'config_receive-address-add',
         meta: {
-          title: '添加收货地址',
+          title: 'Add shipping address',//添加收货地址
           highLight: '/config/receive-address-list',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '设置', path: '/config/base'},
-            {title: '收货地址管理', path: '/config/receive-address-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Setting', path: '/config/base'},//设置
+            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },
@@ -515,12 +515,12 @@ export const constantRouterMap = [
         component: _import('config/receive-address-edit'),
         name: 'config_receive-address-edit',
         meta: {
-          title: '编辑收货地址',
+          title: 'Edit address',
           highLight: '/config/receive-address-list',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '设置', path: '/config/base'},
-            {title: '收货地址管理', path: '/config/receive-address-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Setting', path: '/config/base'},//设置
+            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },

+ 6 - 6
frontendEle/src/views/config/receive-address-edit.vue

@@ -5,21 +5,21 @@
         <el-form-item>
           <template slot="label">
             <span class="text-danger">*</span>
-            收货人
+            Consignee<!-- 收货人 -->
           </template>
           <el-input v-model="form.consignee"></el-input>
         </el-form-item>
         <el-form-item>
           <template slot="label">
             <span class="text-danger">*</span>
-            手机号
+            Phone number<!-- 手机号 -->
           </template>
           <el-input v-model="form.mobile"></el-input>
         </el-form-item>
         <el-form-item prop="areaSelected">
           <template slot="label">
             <span class="text-danger">*</span>
-            地区
+            region<!-- 地区 -->
           </template>
           <el-cascader
             size="large"
@@ -30,18 +30,18 @@
         <el-form-item>
           <template slot="label">
             <span class="text-danger">*</span>
-            详细地址
+            Detailed address<!-- 详细地址 -->
           </template>
           <el-input v-model="form.address"></el-input>
         </el-form-item>
         <el-form-item>
           <template slot="label">
-            是否默认
+            Default<!-- 是否默认 -->
           </template>
           <el-switch v-model="form.isDefault" ></el-switch>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">提交</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">Confirm<!-- 确认 --></el-button>
         </el-form-item>
       </el-form>
     </div>

+ 16 - 16
frontendEle/src/views/config/receive-address-list.vue

@@ -2,33 +2,33 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-table class="table-box" ref="multipleTable" :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="收货人" prop="CONSIGNEE" width="150"></el-table-column>
-        <el-table-column label="手机号码" prop="MOBILE" width="150"></el-table-column>
-        <el-table-column label="省/市" prop="PROVINCE_NAME" width="150"></el-table-column>
-        <el-table-column label="市/区" prop="CITY_NAME" width="150"></el-table-column>
-        <el-table-column label="区/县" prop="COUNTY_NAME" width="150"></el-table-column>
-        <el-table-column label="详细地址" prop="ADDRESS" ></el-table-column>
-        <el-table-column label="是否默认" width="100">
+        <el-table-column label="Consignee" prop="CONSIGNEE" width="150"></el-table-column><!-- 收货人 -->
+        <el-table-column label="Phone number" prop="MOBILE" width="150"></el-table-column><!-- 手机号码 -->
+        <el-table-column label="省/市" prop="PROVINCE_NAME" width="150"></el-table-column><!-- 省/市 -->
+        <el-table-column label="市/区" prop="CITY_NAME" width="150"></el-table-column><!-- 市/区 -->
+        <el-table-column label="区/县" prop="COUNTY_NAME" width="150"></el-table-column><!-- 区/县 -->
+        <el-table-column label="Detailed address" prop="ADDRESS" ></el-table-column><!-- 详细地址 -->
+        <el-table-column label="Default" width="100"><!-- 是否默认 -->
           <template slot-scope="scope">
-            {{scope.row.IS_DEFAULT === '1' ? '是' : '否'}}
+            {{scope.row.IS_DEFAULT === '1' ? 'YES' : 'NO'}}<!-- 是:否 -->
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleUpdate(scope.row)">编辑</el-dropdown-item>
-                <el-dropdown-item command="edit" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleUpdate(scope.row)">Edit<!-- 编辑 --></el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleDelete(scope.row)">Delete<!-- 删除 --></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="primary" size="small" @click="handleAdd">添加收货地址</el-button>
+        <el-button type="primary" size="small" @click="handleAdd">Add shipping address<!-- 添加收货地址 --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -84,9 +84,9 @@
         this.$router.push({path: `/config/receive-address-edit/${row.ID}`})
       },
       handleDelete (row) {
-        this.$confirm(`确定要删除所选数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to delete the selected data?`, 'Hint', {//`确定要删除所选数据吗?`, '提示'
+          confirmButtonText: 'Confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = [row.ID]

+ 6 - 6
frontendEle/src/views/finance/recharge-add.vue

@@ -2,25 +2,25 @@
     <div v-loading="loading">
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
-                <el-form-item label="充值金额">
+                <el-form-item label="Recharge amount"><!-- 充值金额 -->
                     <el-input v-model="form.applyAmount"></el-input>
                 </el-form-item>
-                <el-form-item label="银行账号">
+                <el-form-item label="Bank account"><!-- 银行账号 -->
                     <el-input v-model="form.bankNo"></el-input>
                 </el-form-item>
-                <el-form-item label="汇款银行">
-                    <el-select v-model="form.openBank" placeholder="请选择开户行">
+                <el-form-item label="Remitting bank"><!-- 汇款银行 -->
+                    <el-select v-model="form.openBank" placeholder="Select bank">
                         <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                    :value="item.BANK_CODE"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="开户支行">
+                <el-form-item label="Account opening sub branch"><!-- 开户支行 -->
                     <el-input v-model="form.bankAddress"></el-input>
                 </el-form-item>
 
                 <el-form-item>
-                    <el-button type="primary" @click="onSubmits" :loading="submitButtonStat">保存</el-button>
+                    <el-button type="primary" @click="onSubmits" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
                 </el-form-item>
             </el-form>
         </div>

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

@@ -4,37 +4,37 @@
             <div class="white-box">
                 <el-table class="withdraw-table" :data="tableData" stripe style="width: 100%;">
 
-                    <el-table-column label="创建时间">
+                    <el-table-column label="Creation time"><!-- 创建时间 -->
                         <template slot-scope="scope">
                             {{tool.formatDate(scope.row.CREATED_AT)}}
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="充值金额" prop="AMOUNT">
+                    <el-table-column label="Recharge amount" prop="AMOUNT"><!-- 充值金额 -->
 
                     </el-table-column>
 
-                    <el-table-column label="充值状态名称">
+                    <el-table-column label="Recharge status name"><!-- 充值状态名称 -->
                         <template slot-scope="scope">
                         <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="汇款银行" prop="OPEN_BANK_NAME">
+                    <el-table-column label="Remitting bank" prop="OPEN_BANK_NAME"><!-- 汇款银行 -->
 
                     </el-table-column>
 
-                    <el-table-column label="我的汇款账号" prop="BANK_NO">
+                    <el-table-column label="My remittance account number" prop="BANK_NO"><!-- 我的汇款账号 -->
 
                     </el-table-column>
 
-                      <el-table-column label="打印凭证" width="200">
+                      <el-table-column label="Print voucher" width="200"><!-- 打印凭证 -->
                             <template slot-scope="scope">
                                 <el-button type="primary" size="small" @click="handleAddInvoiceShow(scope.row)"
-                                           v-if="scope.row.AUDIT_STATUS==='0'" icon="el-icon-upload">上传凭证
+                                           v-if="scope.row.AUDIT_STATUS==='0'" icon="el-icon-upload">Upload voucher<!-- 上传凭证 -->
                                 </el-button>
 
                                 <el-button type="success" size="small" @click="handleInvoiceShow(scope.row)"
-                                           v-if="scope.row.AUDIT_STATUS!=='0'" icon="el-icon-view">查看凭证
+                                           v-if="scope.row.AUDIT_STATUS!=='0'" icon="el-icon-view">View voucher<!-- 查看凭证 -->
                                 </el-button>
                             </template>
                         </el-table-column>
@@ -42,10 +42,10 @@
 
                 </el-table>
                 <div class="white-box-footer">
-                    <el-button type="primary" size="small" @click="handleAdd">我要充值</el-button>
+                    <el-button type="primary" size="small" @click="handleAdd">Recharge<!-- 我要充值 --></el-button>
                     <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
                 </div>
-                <el-dialog title="上传凭证" :visible.sync="dialogAddInvoiceVisible">
+                <el-dialog title="Upload voucher" :visible.sync="dialogAddInvoiceVisible"><!-- 上传凭证 -->
                     <div v-loading="dialogAddInvoiceLoading">
                         <el-alert type="warning" :closable="false">
                             <slot name="title">
@@ -58,12 +58,12 @@
                     </div>
                 </el-dialog>
 
-                <el-dialog title="查看充值凭证" :visible.sync="dialogInvoiceVisible">
+                <el-dialog title="View recharge voucher" :visible.sync="dialogInvoiceVisible"><!-- 查看充值凭证 -->
                     <div v-loading="dialogInvoiceLoading">
                         <a :href="invoiceUrl" target="_blank"><img :src="urlimg" alt="" style="max-width: 100%"></a>
                     </div>
                     <div slot="footer" class="dialog-footer">
-                        <el-button @click="dialogInvoiceVisible = false">确 定</el-button>
+                        <el-button @click="dialogInvoiceVisible = false">Confirm</el-button><!-- 确定 -->
                     </div>
                 </el-dialog>
             </div>
@@ -188,7 +188,7 @@
             handleSuccess(response, file) {
                 this.getData()
                 this.$message({
-                    message: '上传凭证完成!',
+                    message: 'Upload voucher completed!',//上传凭证完成
                     type: 'success'
                 })
                 //this.form.image = imageUrl;

+ 25 - 25
frontendEle/src/views/finance/withdraw-add.vue

@@ -1,9 +1,9 @@
 <template>
   <div v-loading="loading">
     <div class="white-box">
-      <el-form ref="form" :model="form" label-width="100px" style="width:500px;">
-        <el-form-item label="当前可用奖金">
-          <el-tag type="success">{{balance}}</el-tag>
+      <el-form ref="form" :model="form" label-width="200px" style="width:500px;">
+        <el-form-item label="Currently available bonus"><!-- 当前可用奖金 -->
+          <el-tag type="success">{{balance}}$</el-tag>
         </el-form-item>
         <!--<el-form-item label="当前提现比例">-->
           <!--<el-tag type="info">{{withdrawProp}}%</el-tag>-->
@@ -11,46 +11,46 @@
         <!--<el-form-item label="最大提现金额">-->
           <!--<el-tag type="info">{{maxAmount}}元</el-tag>-->
         <!--</el-form-item>-->
-        <el-form-item label="最小提现金额">
-          <el-tag type="info">{{minAmount}}</el-tag>
+        <el-form-item label="Minimum withdrawal amount"><!-- 最小提现金额 -->
+          <el-tag type="info">{{minAmount}}$</el-tag>
         </el-form-item>
-        <el-form-item label="提现手续费">
+        <el-form-item label="Withdrawal charge"><!-- 提现手续费 -->
           <el-tag type="info">{{withdrawFee}}%</el-tag>
         </el-form-item>
-        <el-form-item label="提现金额">
+        <el-form-item label="Cash withdrawal amount"><!-- 提现金额 -->
           <el-input v-model="form.applyAmount" type="number" :min="minAmount" :max="maxAmount"></el-input>
         </el-form-item>
         <el-form-item label="" v-if="isPact==='1'">
-          <el-checkbox v-model="checked"> 我已同意</el-checkbox>
-          <a @click="dialogVisible = true" href="javascript:void(0)">《服务协议》</a>
+          <el-checkbox v-model="checked"> Agreed to</el-checkbox><!-- 同意 -->
+          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a><!-- 服务协议 -->
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" :disabled="!checked">提交</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" :disabled="!checked">Confirm</el-button><!-- 确定 -->
         </el-form-item>
       </el-form>
     </div>
     <el-dialog
-        title="服务协议"
+        title="Service contract"
         :visible.sync="dialogVisible">
       <div v-html="content"></div>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    <el-button @click="dialogVisible = false">Cancel</el-button><!-- 取消 -->
+    <el-button type="primary" @click="dialogVisible = false">Confirm</el-button><!-- 确定 -->
   </span>
     </el-dialog>
-
+   <!-- Important notification 重要提示 -->
     <el-dialog
-      title="重要提示"
+      title="Important notification"
       :visible.sync="idCardDialogVisible">
       <div>
-        <p>因系统升级,首次提现需进行在线签约,签约成功后提现才可到账</p>
-        <p>在线签约步骤:微信扫码\手机验证码\实名认证:上传身份证正反面\合同签署:签字\完成</p>
+        <p><!-- 因系统升级,首次提现需进行在线签约,签约成功后提现才可到账 -->Due to system upgrade, the first withdrawal needs to be signed online, and the withdrawal can only be received after the signing is successful.</p>
+        <p><!-- 在线签约步骤:微信扫码\手机验证码\实名认证:上传身份证正反面\合同签署:签字\完成 -->Online signing steps: Wechat scan code, mobile phone verification code, real name authentication: upload ID card both sides, contract signing: signature completed</p>
         <p><el-image :src="idCardInfoQrCodeUrl"></el-image></p>
-        <p>如有其他疑问:请致电 <span style="color: #f75b36">400 694 1919</span></p>
+        <p><!-- 如有其他疑问:请致电 -->If you have any further questions: please call<span style="color: #f75b36">400 694 1919</span></p>
       </div>
       <span slot="footer" class="dialog-footer">
 <!--        <el-button @click="idCardDialogVisible = false">取 消</el-button>-->
-        <el-button type="primary" @click="idCardDialogVisible = false">关 闭</el-button>
+        <el-button type="primary" @click="idCardDialogVisible = false">Close</el-button><!-- 关 闭 -->
       </span>
     </el-dialog>
   </div>
@@ -120,7 +120,7 @@
       },
       getBalance() {
         this.$message({
-          message: '正获取您的奖金...',
+          message: 'Getting your bonus...',//获取您的奖金
           type: 'info'
         })
         network.getData('finance/available-balance').then(response => {
@@ -144,16 +144,16 @@
           network.getData('finance/wd-mult-point').then(response => {
               this.form.withdrawCode = response.withdrawCode
 
-              this.$prompt('请输入支付密码', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
+              this.$prompt('Please enter your payment password', 'Hint', {//'请输入支付密码', '提示'
+                  confirmButtonText: 'Confirm',//'确定'
+                  cancelButtonText: 'Cancel',//'取消'
                   inputType: 'password',
                   inputPattern: /\S+/,
-                  inputErrorMessage: '请输入支付密码',
+                  inputErrorMessage: 'Please enter your payment password',//请输入支付密码
                   beforeClose:async (action, instance, done)=>{
                       if (action === 'confirm') {
                           instance.confirmButtonLoading = true;
-                          instance.confirmButtonText = '执行中...';
+                          instance.confirmButtonText = 'executing...';//执行中
                           console.log(instance.inputValue);
                           this.form.payPassword = instance.inputValue;
                           await network.postData(path, this.form).then(response => {

+ 18 - 18
frontendEle/src/views/finance/withdraw.vue

@@ -3,45 +3,45 @@
     <div class="white-box">
       <leo-filter :filter="handleFilter" :dateRangePickerDisplay="false" :dateMonthPickerDisplay="true"></leo-filter>
       <el-table class="withdraw-table" ref="multipleTable" :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="会员编号">
+        <el-table-column label="Member Code"><!-- 会员编号 -->
           <template slot-scope="scope">
             {{scope.row.USER_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="会员姓名">
+        <el-table-column label="Member Name"><!-- 会员姓名 -->
           <template slot-scope="scope">
             {{scope.row.REAL_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="提现方式">
+        <el-table-column label="Withdrawal way"><!-- 提现方式 -->
           <template slot-scope="scope">
-            {{scope.row.IS_AUTO_WITHDRAW==='1'?'自动提现':'手动提现'}}
+            {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}}<!-- 自动体现:手动体现 -->
           </template>
         </el-table-column>
-        <el-table-column label="提现金额" prop="AMOUNT"></el-table-column>
-        <el-table-column label="手续费" prop="FEES"></el-table-column>
-        <el-table-column label="实际到账金额" prop="REAL_AMOUNT"></el-table-column>
-        <el-table-column label="提现时间" width="180">
+        <el-table-column label="Cash withdrawal amount" prop="AMOUNT"></el-table-column><!-- 提现金额 -->
+        <el-table-column label="Service charge" prop="FEES"></el-table-column><!-- 手续费 -->
+        <el-table-column label="Actual amount" prop="REAL_AMOUNT"></el-table-column><!-- 实际到账金额 -->
+        <el-table-column label="Withdraw time" width="180"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column label="提现状态" width="120">
+        <el-table-column label="Withdraw state" width="120"><!-- 提现状态 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" width="120">
+        <el-table-column label="Note" width="120"><!-- 备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.REMARK)">{{scope.row.REMARK}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="提现退回备注" width="120">
+        <el-table-column label="Note Returned for withdrawal" width="120"><!-- 提现退回备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.BACK_REMARK)">{{scope.row.BACK_REMARK}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="付款时间" width="180">
+        <el-table-column label="Payment time" width="180"><!-- 付款时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.PAID_AT)}}
           </template>
@@ -74,7 +74,7 @@
             <!--</el-button>-->
           <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="付款失败原因" width="120">
+        <el-table-column label="Reasons for payment failure" width="120"><!-- 付款失败原因 -->
           <template slot-scope="scope">
             {{scope.row.PAID_FAIL_REMARK}}
           </template>
@@ -88,11 +88,11 @@
 <!--        </el-table-column>-->
       </el-table>
       <div class="white-box-footer">
-        <el-button type="primary" size="small" @click="handleAdd">我要提现</el-button>
+        <el-button type="primary" size="small" @click="handleAdd">Withdraw</el-button><!-- 我要提现 -->
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="上传发票" :visible.sync="dialogAddInvoiceVisible">
+    <el-dialog title="Upload invoice" :visible.sync="dialogAddInvoiceVisible"><!-- 上传发票 -->
       <div v-loading="dialogAddInvoiceLoading">
         <el-alert type="warning" :closable="false">
           <slot name="title">
@@ -105,12 +105,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="查看发票" :visible.sync="dialogInvoiceVisible">
+    <el-dialog title="View invoice" :visible.sync="dialogInvoiceVisible"><!-- 查看发票 -->
       <div v-loading="dialogInvoiceLoading">
         <a :href="invoiceUrl" target="_blank"><img :src="invoiceUrl" alt="" style="max-width: 100%"></a>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogInvoiceVisible = false">确 定</el-button>
+        <el-button @click="dialogInvoiceVisible = false">Confirm</el-button><!-- 确定 -->
       </div>
     </el-dialog>
 
@@ -188,7 +188,7 @@
       handleSuccess(response, file) {
         this.getData()
         this.$message({
-          message: '上传发票完成,请尽快邮寄纸质发票!',
+          message: 'Invoice uploading completed.Please post the paper invoice as soon as possible!',//上传发票完成,请尽快邮寄纸质发票!
           type: 'success'
         })
         //this.form.image = imageUrl;