Merge branch 'master' into feature/dd-1684-delorder

backend/views/site/addDecTest.php

@@ -36,6 +36,6 @@ $this->title = 'My Yii Application';
             <label for="LOCATION">位置</label>
             <input type="text" class="form-control" id="LOCATION" name="LOCATION">
         </div>
-        <button type="submit" class="btn btn-default">提交</button>
+        <button type="submit" class="btn btn-default">Submit<!-- 提交 --></button>
     </form>
 </div>

backendApi/config/menu.php

@@ -315,7 +315,7 @@ return [
             ['name'=>'申请调整会员业绩', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'perf-apply', 'routePath'=>'finance/perf-apply', 'show'=>0,],
             ['name'=>'Transfer record list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,],//转账记录列表
             ['name'=>'转账记录列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list-export', 'routePath'=>'finance/transfer-list-export', 'show'=>0,],
-            ['name'=>'提现管理', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],
+            ['name'=>'Withdrawal management', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,], // 提现管理
 //            ['name'=>'提现管理-待传发票', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-0', 'routePath'=>'finance/withdraw-0', 'show'=>0,],
 //            ['name'=>'提现管理-提现待审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-0', 'routePath'=>'finance/withdraw-0', 'show'=>0,],
 //            ['name'=>'提现管理-提现已审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-2', 'routePath'=>'finance/withdraw-2', 'show'=>0,],
@@ -323,7 +323,7 @@ return [
 //            ['name'=>'提现管理-提现已付款', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-6', 'routePath'=>'finance/withdraw-6', 'show'=>0,],
 //            ['name'=>'提现管理-付款失败', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-4', 'routePath'=>'finance/withdraw-4', 'show'=>0,],
 //            ['name'=>'提现管理-提现退回', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-7', 'routePath'=>'finance/withdraw-7', 'show'=>0,],
-            ['name'=>'审核提现信息', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0,],
+            ['name'=>'Review withdrawal info', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0,], // 审核提现信息
             //['name'=>'发票信息添加', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-add', 'routePath'=>'finance/invoice-audit-add', 'show'=>0,],
             //['name'=>'发票信息编辑', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-edit', 'routePath'=>'finance/invoice-audit-edit', 'show'=>0,],
             //['name'=>'标记付款失败批量1导入', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'import-withdraws-to-excel-table', 'routePath'=>'finance/import-withdraws-to-excel-table', 'show'=>0,],
@@ -341,7 +341,7 @@ return [
             ['name'=>'交易类型修改', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'deal-type-edit', 'routePath'=>'finance/deal-type-edit', 'show'=>0,],
             ['name'=>'历史奖金余额', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'history-bonus', 'routePath'=>'finance/history-bonus', 'show'=>1,],
             ['name'=>'历史奖金余额导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'history-bonus-export', 'routePath'=>'finance/history-bonus-export', 'show'=>0,],
-            ['name'=>'充值管理', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],
+            ['name'=>'Recharge management', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,], // 充值管理
             ['name'=>'充值导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-export', 'routePath'=>'finance/recharge-export', 'show'=>0,],
             //['name'=>'充值管理-充值待审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-0', 'routePath'=>'finance/recharge-0', 'show'=>0,],
             //['name'=>'充值管理-充值已审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-1', 'routePath'=>'finance/recharge-1', 'show'=>0,],
@@ -424,7 +424,7 @@ return [
         ]
     ],
     'ad'=>[
-        'name'=>'广告管理',
+        'name'=>'Ad Management',
         'class' => '',
         'icon'=>'el-icon-picture-outline',
         'controller'=>'ad',
@@ -432,11 +432,11 @@ return [
         'routePath'=>'ad',
         'show'=>1,
         'child'=>[
-            ['name'=>'广告位', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'location', 'routePath'=>'ad/location', 'show'=>1,],
-            ['name'=>'广告列表', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'list', 'routePath'=>'ad/list', 'show'=>0,],
-            ['name'=>'添加广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'add', 'routePath'=>'ad/add', 'show'=>0,],
-            ['name'=>'编辑广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/edit', 'show'=>0,],
-            ['name'=>'删除广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-delete', 'routePath'=>'ad/ad-delete', 'show'=>0,],
+            ['name'=>'Ad', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'location', 'routePath'=>'ad/location', 'show'=>1,],
+            ['name'=>'Ad list', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'list', 'routePath'=>'ad/list', 'show'=>0,],
+            ['name'=>'Add', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'add', 'routePath'=>'ad/add', 'show'=>0,],
+            ['name'=>'Edit', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/edit', 'show'=>0,],
+            ['name'=>'Delete', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-delete', 'routePath'=>'ad/ad-delete', 'show'=>0,],
         ]
     ],
     'log'=>[

backendApi/modules/v1/controllers/BonusController.php

@@ -747,7 +747,7 @@ class BonusController extends BaseController {
         $condition .= ' AND C.PERIOD_NUM=:PERIOD_NUM';
         $params[':PERIOD_NUM'] = $periodNum;
         if (!$period->isClosed($periodNum)) {
-            return static::notice('该期不能查看');
+            return static::notice('Cannot view this period'); // 该期不能查看
         }
         $data = CalcBonus::lists($condition, $params, [
             'yearMonth' => $yearMonth,

backendApi/modules/v1/controllers/ConfigController.php

@@ -855,8 +855,11 @@ class ConfigController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionExchangeRate() {
+        $post = Yii::$app->request->post();
+        unset($post['synchronize']);
+
         $form = new ConfigForm();
-        if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
+        if (\Yii::$app->request->isPost && $form->load($post, '')) {
             if ($form->updateExchangeRate()) {
                 Config::updateToCache();
                 return static::notice('更新汇率配置成功');

backendApi/modules/v1/controllers/FinanceController.php

@@ -431,7 +431,7 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的提现流水号为' . $value . '改变提现状态至' . Withdraw::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -456,6 +456,13 @@ class FinanceController extends BaseController {
         if ($selectedIds) {
             $filter['condition'] .= " AND W.ID IN (" . implode(',', $selectedIds) . ")";
         }
+        if (isset($filter['request']['filterStatus'])) {
+            $status = explode(',',$filter['request']['filterStatus']);
+            $status = end($status);
+            if (is_numeric($status)) {
+                $filter['condition'] .= " AND W.AUDIT_STATUS = $status";
+            }
+        }
         $form = new FinanceExportForm();
         $result = $form->run($filter, '提现申请');
         if (!$result) {
@@ -1130,7 +1137,7 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的充值流水号为' . $value . '改变充值状态至' . Recharge::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }

backendApi/modules/v1/controllers/ShopController.php

@@ -197,7 +197,7 @@ class ShopController extends BaseController {
 //                foreach ($result['logs'] as $k => $value) {
 //                     Log::adminHandle('改变商品状态至' . ShopGoods::STATUS_NAME[$result['status']], 1, $k);
 //                }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -280,7 +280,7 @@ class ShopController extends BaseController {
             $formModel->scenario = 'changeStatus';
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->changeStatus()) {
 
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }

backendApi/modules/v1/models/lists/bonus/BalanceList.php

@@ -163,7 +163,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    ],
 //                ],
                 'CASH' => [
-                    'header' => 'Member balance',//会员余额
+                    'header' => 'Member Ecoin',//会员余额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['CASH'],
@@ -430,7 +430,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                'SYSTEM_NAME'=> ['isUserTable'=> false, 'name'=> '体系名称', 'other'=> 'systems'],
                 'BONUS'=> ['isUserTable'=> false, 'name'=> 'Member bonus balance'],//会员奖金余额
 //                'RECONSUME_POINTS'=> ['isUserTable'=> false, 'name'=> '会员复消积分'],
-                'CASH'=> ['isUserTable'=> false, 'name'=> 'Member balance'],//会员余额
+                'CASH'=> ['isUserTable'=> false, 'name'=> 'Member Ecoin'],//会员余额
 //                'CF'=> ['isUserTable'=> false, 'name'=> '车房养老余额'],
 //                'LX'=> ['isUserTable'=> false, 'name'=> '领袖分红余额'],
 //                'STATUS'=> ['isUserTable'=> true, 'name'=> '会员状态', 'other'=> 'status'],

backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -49,7 +49,7 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
             $this->columns = [
                 'ID' => null,
                 'SN' => [
-                    'header' => '提现流水号',
+                    'header' => 'Withdrawal serial number', // 提现流水号
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -60,11 +60,11 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'WITHDRAW_PERIOD_NUM' => [
-                    'header' => '提现期数',
+                    'header' => 'Period', // 提现期数
                     'headerOther' => ['width' => '150'],
                 ],
                 'CREATED_AT' => [
-                    'header' => '提现时间',
+                    'header' => 'Withdrawal time', // 提现时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -74,29 +74,29 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                 ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
-                    'header' => '提现状态',
+                    'header' => 'State', // 提现状态
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code', // 会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'USER_REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name', // 会员姓名
                     'headerOther' => ['width' => '150'],
                 ],
-                'ID_CARD' => [
-                    'header' => '身份证号',
-                    'headerOther' => ['width' => '150'],
-                    'value' => function ($row) {
-                        return $row['ID_CARD'].' /';
-                    },
-                ],
+//                'ID_CARD' => [
+//                    'header' => '身份证号',
+//                    'headerOther' => ['width' => '150'],
+//                    'value' => function ($row) {
+//                        return $row['ID_CARD'].' /';
+//                    },
+//                ],
                 'AMOUNT' => [
-                    'header' => '提现金额',
+                    'header' => 'Withdrawal amount', // 提现金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['AMOUNT']);
                     },
@@ -110,11 +110,11 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'FEES' => [
-                    'header' => '手续费',
+                    'header' => 'Bank charge', // 手续费
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_AMOUNT' => [
-                    'header' => '实际到账金额',
+                    'header' => 'Actual amount', // 实际到账金额
                     'headerOther' => ['width' => '150'],
                 ],
                 'OPEN_BANK' => [
@@ -157,21 +157,21 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'MOBILE' => [
-                    'header' => '手机号',
+                    'header' => 'Phone number', // 手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'UPDATE_ADMIN_NAME' => [
-                    'header' => '操作管理员',
+                    'header' => 'Operations administrator', // 操作管理员
                     'headerOther' => ['width' => '150'],
                 ],
                 'REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],
                 ],
                 'BACK_REMARK' => [
-                    'header' => '退回备注',
+                    'header' => 'Return note', // 退回备注
                     'headerOther' => [
                         'width' => '200',
                     ],

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -104,7 +104,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_PRICE_STANDARD' => [
-                    'header' => 'Standard price($)',//标准价格($)
+                    'header' => 'US price($)',//标准价格($)
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -118,7 +118,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SELL_PRICE' => [
-                    'header' => 'Products Price(₦)',//商品价格
+                    'header' => 'Sales Price(₦)',//商品价格
                     'headerOther' => [
                         'width' => '150',
                     ],

backendApi/modules/v1/models/lists/user/IndexList.php

@@ -211,19 +211,19 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => 'Resettlement area',//安置区域
                     'headerOther' => ['width' => '100'],
                 ],
-                'ID_TYPE' => [
-                    'header' => 'Document type',//证件类型
-                    'value' => function($row) {
-                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
-                    },
-                ],
-                'ID_CARD' => [
-                    'header' => 'Identification Number',//证件号码
-                    'value' => function($row) {
-                        return "\t".$row['ID_CARD'];
-                    },
-                    'headerOther' => ['width' => '180'],
-                ],
+//                'ID_TYPE' => [
+//                    'header' => 'Document type',//证件类型
+//                    'value' => function($row) {
+//                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
+//                    },
+//                ],
+//                'ID_CARD' => [
+//                    'header' => 'Identification Number',//证件号码
+//                    'value' => function($row) {
+//                        return "\t".$row['ID_CARD'];
+//                    },
+//                    'headerOther' => ['width' => '180'],
+//                ],
 //                'SPOUSE_NAME' => [
 //                    'header' => '配偶姓名',
 //                    'headerOther' => ['width' => '100'],

backendEle/src/components/WithdrawTable.vue

@@ -23,7 +23,7 @@
           {{tool.formatDate(scope.row.CREATED_AT)}}
         </template>
       </el-table-column>
-      <el-table-column label="预计付款日期" width="120">
+      <el-table-column label="Estimated date of payment" width="120"> <!-- 预计付款日期 -->
         <template slot-scope="scope">
           {{tool.formatDate(scope.row.PLAN_PAID_AT,false)}}
         </template>
@@ -68,14 +68,14 @@
           {{(scope.row.BASE_INFO.STATUS_NAME)}}
         </template>
       </el-table-column>
-      <el-table-column label="身份证号" width="170">
-        <template slot-scope="scope">
-          {{scope.row.BASE_INFO.ID_CARD}}
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="身份证号" width="170">-->
+<!--        <template slot-scope="scope">-->
+<!--          {{scope.row.BASE_INFO.ID_CARD}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="提现方式">
         <template slot-scope="scope">
-          {{scope.row.IS_AUTO_WITHDRAW==='1'?'自动提现':'手动提现'}}
+          {{scope.row.IS_AUTO_WITHDRAW==='1'?'auto withdrawal':'manual withdrawal'}}
         </template>
       </el-table-column>
       <el-table-column label="提现金额" width="110">
@@ -178,7 +178,7 @@
           {{scope.row.AUDIT_ADMIN_NAME}}
         </template>
       </el-table-column>
-      <el-table-column label="备注" width="150">
+      <el-table-column label="Note" width="150"> <!-- 备注 -->
         <template slot-scope="scope">
           {{scope.row.REMARK}}
         </template>
@@ -222,39 +222,39 @@
                 <!--补录发票信息-->
               <!--</el-dropdown-item>-->
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 2, '确定对当前提现进行审核通过操作？')"
-                                v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)">
-                审核通过
+                                @click.native="handleStatusShow(scope.row, 2, 'Are you sure to approve the current withdrawal?')"
+                                v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行审核通过操作？ -->
+                Approve <!-- 审核通过 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
+                                v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 6, '确定对当前提现进行设为已付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?？')"
+                                v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为已付款操作 -->
                 设为已付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
+                                v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 4, '确定对当前提现进行设为付款失败操作？', '付款失败备注')"
-                                v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?？', '付款失败备注')"
+                                v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为付款失败操作？ -->
                 设为付款失败
               </el-dropdown-item>
               <el-dropdown-item command="status"
                                 @click.native="handleStatusShow(scope.row, 7, '确定对当前提现进行设为提现退回操作？', '提现退回备注')"
                                 v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)">
-                设为提现退回
+                Return <!-- 设为提现退回 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
                                 @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票，请确认是否处理提现退回？', '提现退回备注')"
                                 v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)">
-                设为提现退回
+                Return <!-- 设为提现退回 -->
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -322,36 +322,36 @@
         <el-form-item label="提现金额">
           <el-input v-model="form.amount" :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="预计付款日期">
+        <el-form-item label="Estimated date of payment"> <!-- 预计付款日期 -->
           <el-date-picker
               v-model="form.planPaidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions0"
-          >
+          > <!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="form.createRemark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+        <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
       </div>
     </el-dialog>
-    <el-dialog title="审核提现信息" :visible.sync="dialogAuditFormVisible">
+    <el-dialog title="Review withdrawal info" :visible.sync="dialogAuditFormVisible"> <!-- 审核提现信息 -->
       <el-alert
           :title="auditForm.auditTips"
           type="warning" :closable="false">
       </el-alert>
       <el-form :model="auditForm" label-width="150px" style="width:500px;" v-loading="dialogAuditLoading">
-        <el-form-item label="预计付款日期" v-show="withdrawStatus===2||withdrawStatus===4">
+        <el-form-item label="Estimated date of payment" v-show="withdrawStatus===2||withdrawStatus===4"> <!-- 预计付款日期 -->
           <el-date-picker
               v-model="auditForm.planPaidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions0"
           >
@@ -361,7 +361,7 @@
           <el-date-picker
               v-model="auditForm.paidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions1"
           >
@@ -372,8 +372,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleStatus">提 交</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleStatus">Submit<!-- 提 交 --></el-button>
       </div>
     </el-dialog>
 
@@ -392,7 +392,7 @@
           <el-date-picker
               v-model="invoiceForm.invoiceDate"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
           >
           </el-date-picker>
@@ -434,13 +434,13 @@
           <el-input v-model="invoiceForm.invoiceRemark" type="textarea"
                     :rows="2"></el-input>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="invoiceForm.createRemark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAddInvoiceVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleAddInvoice">提 交</el-button>
+        <el-button @click="dialogAddInvoiceVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleAddInvoice">Submit<!-- 提 交 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -571,9 +571,9 @@
         this.$refs.multipleTable.toggleRowExpansion(row)
       },
       handleExport() {
-        this.$confirm('确定要导出当前表格中的提现数据吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定要导出当前表格中的提现数据吗？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData('finance/withdraw-export', {status: this.withdrawStatus})
@@ -649,9 +649,9 @@
         this.auditForm.auditStatus = status
       },
       handleStatus() {
-        this.$confirm('确定要对所选数据修改状态吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('Are you sure to change the state of the selected data?', 'Hint', { // 确定要对所选数据修改状态吗？
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.postData('finance/withdraw-status', this.auditForm)

backendEle/src/router/index.js

@@ -1651,10 +1651,10 @@ export const constantRouterMap = [
         component: _import('ad/location'),
         name: 'ad_location',
         meta: {
-          title: '广告位',
+          title: 'Ad',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
-            {title: '广告管理', path: '/ad/location'},
+            {title: 'Ad management', path: '/ad/location'},
           ],
         },
       },

backendEle/src/views/ad/edit.vue

@@ -26,7 +26,7 @@
                         @on-success="handleSuccess"></leo-uploader>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>

backendEle/src/views/ad/list.vue

@@ -73,7 +73,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`ad/ad-delete`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
@@ -153,9 +153,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []

backendEle/src/views/ad/location.vue

@@ -2,40 +2,40 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="广告位名称" prop="LOCATION_NAME">
+        <el-table-column label="Ad" prop="LOCATION_NAME"> <!-- 广告位名称 -->
           <template slot-scope="scope">
             <el-tag type="warning" size="small" class="no-border">{{scope.row.LOCATION_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="描述" prop="REMARK"></el-table-column>
-        <el-table-column label="类型">
+        <el-table-column label="Description" prop="REMARK"></el-table-column> <!-- 描述 -->
+        <el-table-column label="Type"> <!-- 类型 -->
           <template slot-scope="scope">
             <template v-if="scope.row.TYPE === '1'">
-              <el-tag type="success">幻灯</el-tag>
+              <el-tag type="success">幻灯</el-tag> <!-- 幻灯 -->
             </template>
             <template v-else-if="scope.row.TYPE === '2'">
-              <el-tag>图片</el-tag>
+              <el-tag>Image</el-tag> <!-- 图片 -->
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="创建人">
+        <el-table-column label="Creator"> <!-- 创建人 -->
           <template slot-scope="scope">
             {{scope.row.CREATE_ADMIN_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间">
+        <el-table-column label="Create time"> <!-- 创建时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Action" width="180"> <!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`ad/list`)">
               <el-button type="primary" size="small" @click.stop="">
                 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="handleShow(scope.row)">查看</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleShow(scope.row)">查看</el-dropdown-item> <!--  -->
               </el-dropdown-menu>
             </el-dropdown>
           </template>

backendEle/src/views/admin/index.vue

@@ -90,7 +90,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuliDel" v-if="permission.hasPermission(`admin/admin-delete`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>
@@ -201,9 +201,9 @@
                 })
             },
             delData (obj, id = null) {
-                obj.$confirm('确定删除选定的数据？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                obj.$confirm('确定删除选定的数据？', 'Notice', {
+                    confirmButtonText: 'confirm', // 确定
+                    cancelButtonText: 'cancel', // 取消
                     type: 'warning'
                 }).then(() => {
                     let selectedIds = []

backendEle/src/views/admin/role-column.vue

@@ -22,7 +22,7 @@
         </el-table-column>
       </el-table>
       <div style="margin-top: 20px">
-        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">提交</el-button>
+        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">Submit<!-- 提交 --></el-button>
       </div>
     </div>
   </div>

backendEle/src/views/admin/role-permission.vue

@@ -22,7 +22,7 @@
         </el-table-column>
       </el-table>
       <div style="margin-top: 20px">
-        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">提交</el-button>
+        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">Submit<!-- 提交 --></el-button>
       </div>
     </div>
   </div>
@@ -127,4 +127,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/admin/role.vue

@@ -52,7 +52,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="permission.hasPermission(`admin/role-delete`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>
@@ -135,9 +135,9 @@
         this.$router.push({path: `/admin/role-add`})
       },
       delHandle(obj,id) {
-        obj.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        obj.$confirm('确定删除选定的数据？', 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           network.getData(`admin/role-delete/${id}`).then(response => {
@@ -151,9 +151,9 @@
       },
       muliDelHandle(command) {
         if (command === 'delete') {
-          this.$confirm('确定删除选定的数据？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('确定删除选定的数据？', 'Notice', {
+            confirmButtonText: 'confirm', // 确定
+            cancelButtonText: 'cancel', // 取消
             type: 'warning'
           }).then(() => {
             let selectedIds = []

backendEle/src/views/article/category-add.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.cateName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -54,4 +54,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/article/category.vue

@@ -31,7 +31,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
@@ -106,9 +106,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []

backendEle/src/views/article/edit.vue

@@ -15,7 +15,7 @@
                   :init="editorOptions"></editor>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -91,4 +91,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/article/index.vue

@@ -31,7 +31,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
@@ -106,9 +106,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []

backendEle/src/views/atlas/emp-user-line.vue

@@ -138,9 +138,9 @@
           })
       },
       handleExport(){
-          this.$confirm(`确定要导出当前数据吗？`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+          this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+              confirmButtonText: 'confirm', // 确定
+              cancelButtonText: 'cancel', // 取消
               type: 'warning'
           }).then(() => {
               return network.getData(`atlas/emp-user-list-export`, this.filterForm)

backendEle/src/views/atlas/emp-user-list.vue

@@ -78,9 +78,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`atlas/emp-user-list-export`, this.filterForm)

backendEle/src/views/atlas/network-line-opt.vue

@@ -196,9 +196,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/network-line-list-export`, this.filterForm)

backendEle/src/views/atlas/network-opt.vue

@@ -233,8 +233,8 @@
       },
       handleExport(){
         this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/network-list-export`, this.filterForm)

backendEle/src/views/atlas/relation-list.vue

@@ -124,9 +124,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)

backendEle/src/views/atlas/relation-opt.vue

@@ -253,8 +253,8 @@
       },
       handleExport(){
         this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)

backendEle/src/views/bonus/cf-lx-apply.vue

@@ -15,7 +15,7 @@
         </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>
@@ -70,4 +70,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/bonus/cf-lx-audit-list.vue

@@ -43,7 +43,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(status===0) && (permission.hasPermission(`bonus/cf-lx-audit`)||permission.hasPermission(`bonus/cf-lx-audit-delete`))">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="pass" v-if="permission.hasPermission(`bonus/cf-lx-audit`)">批量审核</el-dropdown-item>
@@ -151,9 +151,9 @@
         if (status === 'reject') {
           title = '确定要拒绝审核？请输入备注'
         }
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Notice', { // 提示
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
         }).then(({value}) => {
           let selectedIds = []
           if (row === null) {
@@ -184,9 +184,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定删除选定的数据？', 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -230,9 +230,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/cf-lx-audit-export`, this.filterModel)

backendEle/src/views/bonus/flow-cf.vue

@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-cf-export`, this.filterModel)

backendEle/src/views/bonus/flow-lx.vue

@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-lx-export`, this.filterModel)

backendEle/src/views/bonus/flow-rp.vue

@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-rp-export`, this.filterModel)

backendEle/src/views/bonus/new-period-bonus.vue

@@ -123,8 +123,8 @@ export default {
     },
     handleExport(){
       this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-        confirmButtonText: 'confirm',//确定
-        cancelButtonText: 'cancel',//取消
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/new-period-bonus-export`, this.filterModel)

backendEle/src/views/bonus/perf-standard.vue

@@ -87,9 +87,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要导出当前表格中的数据吗？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/perf-standard-export', filterData)

backendEle/src/views/bonus/period-perf.vue

@@ -88,9 +88,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要导出当前表格中的数据吗？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/period-perf-export', filterData)

backendEle/src/views/bonus/period.vue

@@ -177,8 +177,8 @@
     methods: {
       closeHandle(row) {
         this.$confirm('Confirm to manually seal the current period？', 'Hint', {//'确定对当前期进行手动封期操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/close-period/${row.PERIOD_NUM}`)
@@ -193,8 +193,8 @@
       },
       calcHandle(row) {
         this.$confirm('Confirm to perform settlement operation for the current period？', 'Hint', {//'确定对当前期进行结算操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/calc-period/${row.PERIOD_NUM}`)
@@ -209,8 +209,8 @@
       },
       perfHandle(row) {
         this.$confirm('Confirm to generate performance sheet for the current period？', 'Hint', {//'确定对当前期进行生成业绩单操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/perf-period/${row.PERIOD_NUM}`)
@@ -225,8 +225,8 @@
       },
       sentHandle(row) {
         this.$confirm('Are you sure to connect the current period? Performance sheet and settlement cannot be generated after network connection', 'Hint', {//'确定对当前期进行挂网操作？挂网后无法生成业绩单和结算', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/send-period/${row.PERIOD_NUM}`)

backendEle/src/views/bonus/resend-qy-audit-list.vue

@@ -43,7 +43,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(filterStatus==='0') && (permission.hasPermission(`bonus/resend-qy-audit`)||permission.hasPermission(`bonus/resend-qy-audit-delete`))">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="pass" v-if="permission.hasPermission(`bonus/resend-qy-audit`)">批量审核</el-dropdown-item>
@@ -124,9 +124,9 @@ export default {
       if (status === 'reject') {
         title = '确定要拒绝审核？请输入备注'
       }
-      this.$prompt(title, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$prompt(title, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
       }).then(({value}) => {
         let selectedIds = []
         if (row === null) {
@@ -157,9 +157,9 @@ export default {
     },
     handleDel(id = null) {
       let obj = this
-      this.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -202,9 +202,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/resend-qy-audit-list-export`, this.filterModel)

backendEle/src/views/bonus/resend-qy-list.vue

@@ -39,7 +39,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" v-if="(filterStatus==='0') && permission.hasPermission(`bonus/resend-qy`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="del" @click.native="handleResend()">批量补发</el-dropdown-item>
@@ -107,9 +107,9 @@ export default {
         return false
       }
       let obj = this
-      this.$prompt('确定为所选数据申请补发区域津贴？请填写备注', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$prompt('确定为所选数据申请补发区域津贴？请填写备注', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         inputValue: '',
         type: 'warning'
       }).then(({value}) => {
@@ -155,9 +155,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/resend-qy-list-export`, this.filterModel)

backendEle/src/views/bonus/score-month.vue

@@ -89,8 +89,8 @@ export default {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
       this.$confirm('Are you sure you want to export the data in the current table？', 'Hint', {//'确定要导出当前表格中的数据吗？', '提示',
-        confirmButtonText: 'confirm',//确定
-        cancelButtonText:  'cancel',//取消
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText:  'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/score-month-export', filterData)

backendEle/src/views/bonus/trace-bt.vue

@@ -88,9 +88,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-bt-export`, this.filterData)

backendEle/src/views/bonus/trace-down-bd.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-bd-export`, this.filterData)

backendEle/src/views/bonus/trace-down-fx.vue

@@ -71,9 +71,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/trace-down-fx-export`, this.filterData)

backendEle/src/views/bonus/trace-down-gl.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-gl-export`, this.filterData)

backendEle/src/views/bonus/trace-down-gx.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-gx-export`, this.filterData)

backendEle/src/views/bonus/trace-down-qy.vue

@@ -71,9 +71,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/trace-down-qy-export`, this.filterData)

backendEle/src/views/bonus/trace-down-tg.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-tg-export`, this.filterData)

backendEle/src/views/bonus/trace-down-xf.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-xf-export`, this.filterData)

backendEle/src/views/bonus/trace-down-yc.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-yc-export`, this.filterData)

backendEle/src/views/bonus/trace-down-yj.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-yj-export`, this.filterData)

backendEle/src/views/bonus/trace-fl.vue

@@ -69,9 +69,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-fl-export`, this.filterData)

backendEle/src/views/bonus/trace-fw.vue

@@ -69,9 +69,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-fw-export`, this.filterData)

backendEle/src/views/bonus/trace-up-bd.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-bd-export`, this.filterData)

backendEle/src/views/bonus/trace-up-fx.vue

@@ -71,9 +71,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/trace-up-fx-export`, this.filterData)

backendEle/src/views/bonus/trace-up-gl.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-gl-export`, this.filterData)

backendEle/src/views/bonus/trace-up-gx.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-gx-export`, this.filterData)

backendEle/src/views/bonus/trace-up-qy.vue

@@ -71,9 +71,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/trace-up-qy-export`, this.filterData)

backendEle/src/views/bonus/trace-up-tg.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-tg-export`, this.filterData)

backendEle/src/views/bonus/trace-up-xf.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-xf-export`, this.filterData)

backendEle/src/views/bonus/trace-up-yc.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-yc-export`, this.filterData)

backendEle/src/views/bonus/trace-up-yj.vue

@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-yj-export`, this.filterData)

backendEle/src/views/config/api-edit.vue

@@ -25,14 +25,14 @@
               <el-date-picker
                 v-model="item.VALUE"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='6'">
               <el-date-picker
                 v-model="item.VALUE"
                 type="date"
-                placeholder="选择日期">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='7'">
@@ -131,4 +131,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/base.vue

@@ -24,14 +24,14 @@
               <el-date-picker
                 v-model="item.VALUE"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='6'">
               <el-date-picker
                 v-model="item.VALUE"
                 type="date"
-                placeholder="选择日期">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='7'">
@@ -111,4 +111,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/bonus-opt.vue

@@ -34,14 +34,14 @@
                   <el-date-picker
                     v-model="item.VALUE"
                     type="datetime"
-                    placeholder="选择日期时间">
+                    placeholder="Select date">
                   </el-date-picker>
                 </template>
                 <template v-else-if="item.INPUT_TYPE==='6'">
                   <el-date-picker
                     v-model="item.VALUE"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="Select date">
                   </el-date-picker>
                 </template>
                 <template v-else-if="item.INPUT_TYPE==='7'">

backendEle/src/views/config/dec-level.vue

@@ -53,7 +53,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="false">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>

backendEle/src/views/config/dec-role.vue

@@ -37,7 +37,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="false">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>

backendEle/src/views/config/emp-level.vue

@@ -51,7 +51,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="false">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>

backendEle/src/views/config/exchange-rate.vue

@@ -3,15 +3,18 @@
         <div class="white-box">
             <el-form ref="form" :model="form" label-width="250px" class="form-page" style="margin-top: 25px;">
                 <el-form-item :label="form.TITLE" :key="form.CONFIG_NAME">
-                    <el-input v-model="form.VALUE" placeholder="请输入内容">
+                    <el-input v-model="form.VALUE">
                         <template slot="append">naira / $</template>
                     </el-input>
                 </el-form-item>
-                <el-form-item>
-                    <span style="font-weight: bold; color: red; font-size: 12px;">提示：修改汇率会刷新商品的销售价格(naira)，请谨慎操作！！</span>
+                <el-form-item label="刷新商品价格">
+                    <el-switch v-model="synchronize"></el-switch>
+                </el-form-item>
+                <el-form-item label="" v-show="notice">
+                    <span style="font-weight: bold; color: red; font-size: 14px;">开启后会根据最新汇率刷新商品的奈拉价格，请谨慎操作！！</span>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" size="small" @click="onSubmit" :loading="submitButtonStat">保存并刷新商品价格</el-button>
+                    <el-button :type="btnType" size="medium" @click="onSubmit" :loading="submitButtonStat">{{ btnTxt }}</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -20,9 +23,10 @@
 
 <script>
 import network from '@/utils/network'
+import locale from "element-ui/lib/locale/lang/en";
 export default {
     name: 'config_exchange_rate',
-    mounted() {
+    created() {
         this.getData()
     },
     data() {
@@ -34,30 +38,37 @@ export default {
             },
             loading: true,
             submitButtonStat: false,
+            btnType: 'primary',
+            btnTxt: '保存汇率',
+            notice: false,
+            synchronize: false,
         }
     },
     methods: {
         onSubmit() {
-            let _this = this
-            _this.$confirm('修改汇率会刷新商品销售价格(naira), 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(this.btnTxt, 'Hint', {
+                confirmButtonText: 'confirm', // 确定
+                cancelButtonText: 'cancel', // 取消
+
                 type: 'warning'
             }).then(() => {
-                _this.submitButtonStat = true
-                network.postData('config/exchange-rate', this.form).then(response => {
-                    _this.$message({
+                this.submitButtonStat = true
+
+                let param = this.form
+                param.synchronize = this.synchronize
+                return network.postData('config/exchange-rate', param).then(response => {
+                    this.$message({
                         message: response,
                         type: 'success'
                     })
-                    _this.submitButtonStat = false
-                    _this.getData()
-                }).catch(response => {
-                    _this.submitButtonStat = false
-                    _this.getData()
+                    this.submitButtonStat = false
+                    location.reload()
+                }).catch(_ => {
+                    this.submitButtonStat = false
+                    this.getData()
                 })
             }).catch(() => {
-                _this.submitButtonStat = false
+                this.submitButtonStat = false
             })
         },
         getData() {
@@ -66,6 +77,18 @@ export default {
                 this.loading = false
             })
         }
+    },
+    watch: {
+        // 监听是否同步刷新商品价格
+        synchronize: {
+            handler(modern, origin) {
+                this.btnType = (modern === true) ? 'danger' : 'primary'
+                this.btnTxt = (modern === true) ? '保存并刷新商品价格' : '保存汇率'
+                this.notice = (modern === true)
+            },
+            // 深度监听
+            deep: true,
+        }
     }
 }
 </script>

backendEle/src/views/config/other.vue

@@ -28,14 +28,14 @@
               <el-date-picker
                 v-model="item.VALUE"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="(item.INPUT_TYPE).toString()==='6'">
               <el-date-picker
                 v-model="item.VALUE"
                 type="date"
-                placeholder="选择日期">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="(item.INPUT_TYPE).toString()==='7'">
@@ -148,4 +148,4 @@ export default {
     position: relative;
     padding: 0 10px;
   }
-</style>
+</style>

backendEle/src/views/config/reg-type.vue

@@ -58,7 +58,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="false">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">Delete</el-dropdown-item>
@@ -90,8 +90,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+        <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
       </div>
     </el-dialog>
     <el-dialog title="维护服务协议" :visible.sync="dialogPactFormVisible">
@@ -103,8 +103,8 @@
         上次更新时间:{{tool.formatDate(pactForm.UPDATED_AT)}}
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogPactFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handlePactEdit">修 改</el-button>
+        <el-button @click="dialogPactFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handlePactEdit">Edit<!-- 修 改 --></el-button>
       </div>
     </el-dialog>
   </div>

backendEle/src/views/config/transfer.vue

@@ -16,12 +16,16 @@
           </el-table-column>
           <el-table-column label="转出金额下限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.outMin" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.outMin" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="转出金额上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.outMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.outMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="手续费%" width="120">
@@ -31,22 +35,30 @@
           </el-table-column>
           <el-table-column label="手续费下限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.feeMin" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.feeMin" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="手续费上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.feeMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.feeMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="期转出总额上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.weekMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.weekMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="结算月转出总额上限" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.monthMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.monthMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <!--<el-table-column width="90" label="同体系转账">-->
@@ -133,4 +145,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/finance/balance-audit-list.vue

@@ -64,14 +64,14 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="handleAdd" icon="el-icon-plus"
-                   v-show="permission.hasPermission(`finance/change-balance-opt`)">Apply for change of member balance<!-- 申请变动会员余额 -->
+                   v-show="permission.hasPermission(`finance/change-balance-opt`)">Apply for change of member Ecoin<!-- 申请变动会员余额 -->
         </el-button>
         <el-button type="success" size="small" @click="handleExport"
                    v-show="permission.hasPermission(`finance/balance-audit-list-export`)">Export Excel<!-- 导出Excel -->
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
-      <el-dialog title="Modify member balance change information" :visible.sync="dialogEditFormVisible"><!-- 修改会员余额变动信息 -->
+      <el-dialog title="Modify member Ecoin change information" :visible.sync="dialogEditFormVisible"><!-- 修改会员余额变动信息 -->
         <el-form :model="form" label-width="150px" class="form-dialog" v-loading="dialogEditLoading">
           <el-form-item label="Member code"><!-- 会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
@@ -106,7 +106,7 @@
           <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
         </div>
       </el-dialog>
-      <el-dialog title="Review member balance change information" :visible.sync="dialogAuditFormVisible"><!-- 审核会员余额变动信息 -->
+      <el-dialog title="Review member Ecoin change information" :visible.sync="dialogAuditFormVisible"><!-- 审核会员余额变动信息 -->
         <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogAuditLoading">
           <el-form-item label="Member code"><!-- 会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>

backendEle/src/views/finance/change-balance-opt.vue

@@ -43,7 +43,7 @@
               </el-switch>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">提交</el-button>
+              <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
@@ -151,9 +151,9 @@
       onSubmit() {
             if (this.form.type === 'bonus') {
               if ((Number.parseFloat(this.userInfo['BONUS']) + Number.parseFloat(this.form.amount)) < 0) {
-                this.$confirm(`会员账户余额不足，是否继续提交`, '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
+                this.$confirm(`会员账户余额不足，是否继续提交`, 'Hint', {
+                  confirmButtonText: 'confirm', // 确定
+                  cancelButtonText: 'cancel', // 取消
                   type: 'warning'
                 }).then(() => {
                   this._handleSubmit()
@@ -191,4 +191,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/finance/deal-type.vue

@@ -176,7 +176,7 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
+        this.$confirm('确定删除选定的数据？', 'Hint', {
           confirmButtonText: 'Confirm',
           cancelButtonText: 'Cancel',
           type: 'warning'
@@ -213,7 +213,7 @@
       },
       chkEnable(val) {
         if (!val) {
-          this.$confirm('确定要关闭该交易类型？', '提示', {
+          this.$confirm('确定要关闭该交易类型？', 'Hint', {
             confirmButtonText: 'Confirm',
             cancelButtonText: 'Cancel',
             type: 'warning'

backendEle/src/views/finance/history-bonus.vue

@@ -84,7 +84,7 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
           confirmButtonText: 'Confirm',
           cancelButtonText: 'Cancel',
           type: 'warning'

backendEle/src/views/finance/invoice-audit.vue

@@ -205,7 +205,7 @@
           <el-date-picker
               v-model="invoiceForm.invoiceDate"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
           >
           </el-date-picker>
@@ -252,9 +252,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="danger" @click.native="handleRejectAudit">拒 绝</el-button>
-        <el-button type="primary" @click.native="handleAudit">通 过</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="danger" @click.native="handleRejectAudit">Reject<!-- 拒 绝 --></el-button>
+        <el-button type="primary" @click.native="handleAudit">Approve<!-- 通 过 --></el-button>
       </div>
     </el-dialog>
     <el-dialog title="查看发票图片" :visible.sync="dialogInvoiceVisible">
@@ -364,9 +364,9 @@
         })
       },
       handleAudit() {
-        this.$confirm('审核该条发票数据，对应的提现记录如果满足自动流转条件，则会标记为"提现已审核"。', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('审核该条发票数据，对应的提现记录如果满足自动流转条件，则会标记为"提现已审核"。', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           this.dialogAuditFormVisible = false
@@ -391,9 +391,9 @@
         })
       },
       handleRejectAudit() {
-        this.$confirm('拒绝审核该条发票数据，同时将对应的提现记录标记为未传发票？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('拒绝审核该条发票数据，同时将对应的提现记录标记为未传发票？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           this.dialogAuditFormVisible = false
@@ -419,9 +419,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('删除该条发票数据，同时将对应的提现记录标记为未传发票？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('删除该条发票数据，同时将对应的提现记录标记为未传发票？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []

backendEle/src/views/finance/perf-apply.vue

@@ -78,7 +78,7 @@
         </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>
@@ -173,4 +173,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/finance/perf-audit-list.vue

@@ -49,7 +49,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="filterStatus==='0' && (permission.hasPermission(`finance/perf-audit`)||permission.hasPermission(`finance/perf-audit-delete`))">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="pass" v-if="permission.hasPermission(`finance/perf-audit`)">批量审核</el-dropdown-item>
@@ -142,8 +142,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleAuditPass">通 过</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleAuditPass">Approve<!-- 通 过 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -263,9 +263,9 @@
         if (status === 'reject') {
           title = '确定要拒绝审核？备注：'
         }
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           inputValue: row ? row.REMARK : '',
           //type: 'warning',
         }).then(({value}) => {
@@ -294,9 +294,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定删除选定的数据？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -359,9 +359,9 @@
         this.getData(this.currentPage, this.pageSize)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`finance/perf-audit-list-export`, this.filterModel)

backendEle/src/views/finance/recharge.vue

@@ -133,9 +133,9 @@
                 })
             },
             handleExport(){
-                this.$confirm(`确定要导出当前数据吗？`, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+                    confirmButtonText: 'confirm', // 确定
+                    cancelButtonText: 'cancel', // 取消
                     type: 'warning'
                 }).then(() => {
                     return network.getData(`finance/recharge-export`, this.filterModel)

backendEle/src/views/finance/withdraw-add.vue

@@ -20,11 +20,11 @@
         <el-form-item label="提现金额">
           <el-input v-model="form.applyAmount" type="number"></el-input>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="form.createRemark"></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>
@@ -85,4 +85,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/finance/withdraw.vue

@@ -2,13 +2,13 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="-1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="待审核" name="0" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="已审核" name="2" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="待付款" name="3" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="已付款" name="6" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="付款失败" name="4" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="已退回" name="7" :lazy="true"></el-tab-pane>
+        <el-tab-pane label="All" name="-1" :lazy="true"></el-tab-pane> <!-- 全部 -->
+        <el-tab-pane label="To be reviewed" name="0" :lazy="true"></el-tab-pane> <!-- 待审核 -->
+        <el-tab-pane label="Reviewed" name="2" :lazy="true"></el-tab-pane> <!-- 已审核 -->
+        <el-tab-pane label="To be paid" name="3" :lazy="true"></el-tab-pane> <!-- 待付款 -->
+        <el-tab-pane label="Paid" name="6" :lazy="true"></el-tab-pane> <!-- 已付款 -->
+        <el-tab-pane label="Payment failed" name="4" :lazy="true"></el-tab-pane> <!-- 付款失败 -->
+        <el-tab-pane label="Returned" name="7" :lazy="true"></el-tab-pane> <!-- 已退回 -->
       </el-tabs>
       <div class="filter-box">
         <filter-user :filter-types.sync="filterTypes" @select-value="handleFilterUser"></filter-user>
@@ -30,7 +30,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Action" width="180"> <!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click"
                          v-if="scope.row.AUDIT_STATUS!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
@@ -44,39 +44,39 @@
                 <!--补录发票信息-->
                 <!--</el-dropdown-item>-->
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 2, '确定对当前提现进行审核通过操作？')"
-                                  v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)">
-                  审核通过
+                                  @click.native="handleStatusShow(scope.row, 2, 'Are you sure to approve the current withdrawal?')"
+                                  v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行审核通过操作？ -->
+                  Approve <!-- 审核通过 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                  v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)">
-                  设为待付款
+                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
+                                  v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
+                  To be paid<!-- 设为待付款 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 6, '确定对当前提现进行设为已付款操作？')"
-                                  v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)">
-                  设为已付款
+                                  @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?确定对当前提现进行设为已付款操作？')"
+                                  v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为已付款操作 -->
+                  Paid<!--设为已付款-->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                  v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)">
-                  设为待付款
+                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
+                                  v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
+                  To be paid<!-- 设为待付款 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 4, '确定对当前提现进行设为付款失败操作？', '付款失败备注')"
-                                  v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)">
-                  设为付款失败
+                                  @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?', 'Note')"
+                                  v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 付款失败备注 --> <!-- 确定对当前提现进行设为付款失败操作？ -->
+                  Failed<!-- 设为付款失败 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
                                   @click.native="handleStatusShow(scope.row, 7, '确定对当前提现进行设为提现退回操作？', '提现退回备注')"
                                   v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)">
-                  设为提现退回
+                  Return <!-- 设为提现退回 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
                                   @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票，请确认是否处理提现退回？', '提现退回备注')"
                                   v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)">
-                  设为提现退回
+                  Return <!-- 设为提现退回 -->
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -88,11 +88,11 @@
         <el-dropdown size="small" trigger="click" @command="handleMuli"
                      v-if="filterStatus!=='-1' && filterStatus!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu v-if="filterStatus==='0'" slot="dropdown">
-            <el-dropdown-item command="2">批量审核通过</el-dropdown-item>
-            <el-dropdown-item command="7">批量退回</el-dropdown-item>
+            <el-dropdown-item command="2">Batch audit passed</el-dropdown-item> <!-- 批量审核通过-->
+            <el-dropdown-item command="7">Batch return</el-dropdown-item> <!-- 批量退回 -->
           </el-dropdown-menu>
           <el-dropdown-menu v-else-if="filterStatus==='2'" slot="dropdown">
             <el-dropdown-item command="3">批量设为待付款</el-dropdown-item>
@@ -134,46 +134,46 @@
             <el-form-item label="提现金额">
               <el-input v-model="form.amount" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="预计付款日期">
+            <el-form-item label="Estimated date of payment"> <!-- 预计付款日期 -->
               <el-date-picker
                       v-model="form.planPaidAt"
                       type="date"
-                      placeholder="选择日期"
+                      placeholder="Select date"
                       value-format="yyyy-MM-dd"
                       :picker-options="pickerOptions0"
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="备注">
+            <el-form-item label="Note"> <!-- 备注 -->
               <el-input v-model="form.createRemark"></el-input>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-            <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+            <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+            <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
           </div>
         </el-dialog>
-        <el-dialog title="审核提现信息" :visible.sync="dialogAuditFormVisible">
+        <el-dialog title="Review withdrawal info" :visible.sync="dialogAuditFormVisible"> <!-- 审核提现信息 -->
           <el-alert
                   :title="auditForm.auditTips"
                   type="warning" :closable="false">
           </el-alert>
           <el-form :model="auditForm" label-width="150px" style="width:500px;" v-loading="dialogAuditLoading">
-            <el-form-item label="预计付款日期" v-show="filterStatus==='2' || filterStatus==='4'">
+            <el-form-item label="Estimated date of payment" v-show="filterStatus==='2' || filterStatus==='4'"> <!-- 预计付款日期 -->
               <el-date-picker
                       v-model="auditForm.planPaidAt"
                       type="date"
-                      placeholder="选择日期"
+                      placeholder="Select date"
                       value-format="yyyy-MM-dd"
                       :picker-options="pickerOptions0"
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="付款日期" v-show="filterStatus==='3'">
+            <el-form-item label="Date of payment" v-show="filterStatus==='3'"><!-- 付款日期 -->
               <el-date-picker
                       v-model="auditForm.paidAt"
                       type="date"
-                      placeholder="选择日期"
+                      placeholder="Select date"
                       value-format="yyyy-MM-dd"
                       :picker-options="pickerOptions1"
               >
@@ -184,8 +184,8 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-            <el-button type="primary" @click.native="handleStatus">提 交</el-button>
+            <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+            <el-button type="primary" @click.native="handleStatus">Submit<!-- 提 交 --></el-button>
           </div>
         </el-dialog>
       </div>
@@ -354,9 +354,9 @@ export default {
 
                   filterData.selectedIds = selectedIds
               }
-              this.$confirm('确定要导出当前表格中的提现数据吗？', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
+              this.$confirm('确定要导出当前表格中的提现数据吗？', 'Hint', {
+                  confirmButtonText: 'confirm', // 确定
+                  cancelButtonText: 'cancel', // 取消
                   type: 'warning'
               }).then(() => {
                   return network.getData('finance/withdraw-export', filterData)
@@ -403,7 +403,7 @@ export default {
               }).catch(response => {
               })
           },
-          handleStatusShow(row, status, title, remark = '备注') {
+          handleStatusShow(row, status, title, remark = 'Note') { // 备注
               this.auditForm = {
                   auditTips: '',
                   auditStatus: null,
@@ -434,9 +434,9 @@ export default {
           handleStatus() {
               network.postData('finance/mult-point', {opType: 2}).then(response => {
                   this.auditForm.withdrawAudit = response.withdrawAudit
-                  this.$confirm('确定要对所选数据修改状态吗？', '提示', {
-                      confirmButtonText: '确定',
-                      cancelButtonText: '取消',
+                  this.$confirm('Are you sure to change the state of the selected data?', 'Hint', { // 确定要对所选数据修改状态吗？
+                      confirmButtonText: 'confirm', // 确定
+                      cancelButtonText: 'cancel', // 取消
                       type: 'warning'
                   }).then(() => {
                       return network.postData('finance/withdraw-status', this.auditForm)

backendEle/src/views/message/edit.vue

@@ -13,7 +13,7 @@
                   :init="editorOptions"></editor>
         </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>
@@ -68,4 +68,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/message/list.vue

@@ -38,7 +38,7 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
@@ -107,9 +107,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('确定删除选定的数据？', 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []

backendEle/src/views/reconsume/change-audit-add.vue

@@ -33,7 +33,7 @@
           <el-tag type="info">此操作仅调整余额，不作为复销活跃资格依据</el-tag>
         </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>

backendEle/src/views/reconsume/change-audit-list.vue

@@ -98,8 +98,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+          <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+          <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
         </div>
       </el-dialog>
       <el-dialog title="审核余额调整" :visible.sync="dialogAuditFormVisible">
@@ -138,8 +138,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click.native="handleAuditPass">通 过</el-button>
+          <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+          <el-button type="primary" @click.native="handleAuditPass">Approve<!-- 通 过 --></el-button>
         </div>
       </el-dialog>
     </div>
@@ -303,9 +303,9 @@
         if (status === 'reject') {
           title = '确定要拒绝审核？'
         }
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           //type: 'warning',
           //inputType: 'textarea',
         }).then(({value}) => {
@@ -334,9 +334,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定删除选定的数据？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -377,9 +377,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`reconsume/change-audit-list-export`, this.filterModel)

backendEle/src/views/reconsume/deduct-audit-add.vue

@@ -40,7 +40,7 @@
           </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">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>

backendEle/src/views/reconsume/deduct-audit-list-table.vue

@@ -114,9 +114,9 @@ export default {
       if(status === 'reject'){
         title = '确定要拒绝审核？请输入备注：'
       }
-      this.$prompt(title, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$prompt(title, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         //type: 'warning',
         inputType: 'textarea',
         inputValue:row.CREATE_REMARK,

backendEle/src/views/reconsume/deduct.vue

@@ -16,7 +16,7 @@
           </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>
@@ -79,4 +79,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/reconsume/flow-list.vue

@@ -105,9 +105,9 @@
         })
       },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`reconsume/flow-list-export`, this.filterModel)

backendEle/src/views/reconsume/pool-list.vue

@@ -93,9 +93,9 @@ export default {
       this.getData(this.currentPage, pageSize)
     },
     handlePass(row){
-      this.$confirm('确定要为该会员扣除复销并设为合格吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要为该会员扣除复销并设为合格吗？', 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.postData(`reconsume/deduct`, {
@@ -113,9 +113,9 @@ export default {
       })
     },
     handleNotPass(row){
-      this.$confirm('确定要为该会员扣除复销并设为不合格吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要为该会员扣除复销并设为不合格吗？', 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.postData(`reconsume/deduct`, {
@@ -156,9 +156,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`reconsume/pool-list-export`, this.filterModel)

backendEle/src/views/report/dec-table.vue

@@ -99,9 +99,9 @@ export default {
   },
   methods: {
     handleExport () {
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要导出当前表格中的数据吗？', 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('report/dec-export', {type: this.type})

backendEle/src/views/shop/goods-add.vue

@@ -37,13 +37,13 @@
                     <template slot="append">%</template>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="Standard Price($)" p>
+                <el-form-item label="US Price($)" p>
                     <el-input v-model="form.sellPriceStandard"></el-input>
                 </el-form-item>
-                <el-form-item label="Products Price(₦)">
+                <el-form-item label="Sales Price(₦)">
                     <el-input v-model="form.sellPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="Sales Price(₦)">
+                <el-form-item label="Market Price(₦)">
                   <el-input v-model="form.marketPrice"></el-input>
                 </el-form-item>
                 <el-form-item label="Price BV" v-show="pvDisabled"><!-- 价格BV -->

backendEle/src/views/shop/index.vue

@@ -101,13 +101,13 @@
                         <template slot="append">%</template>
                       </el-input>
                     </el-form-item>
-                    <el-form-item label="Standard Price($)" p>
+                    <el-form-item label="US Price($)" p>
                         <el-input v-model="form.sellPriceStandard"></el-input>
                     </el-form-item>
-                    <el-form-item label="Products Price(₦)" p>
+                    <el-form-item label="Sales Price(₦)" p>
                         <el-input v-model="form.sellPrice"></el-input>
                     </el-form-item>
-                    <el-form-item label="Sales Price(₦)">
+                    <el-form-item label="Market Price(₦)">
                       <el-input v-model="form.marketPrice"></el-input>
                     </el-form-item>
                     <el-form-item label="Price BV" v-show="pvDisabled"> <!-- 价格BV -->

backendEle/src/views/user/bind.vue

@@ -33,7 +33,8 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuliDel" v-show="permission.hasPermission(`user/bind-delete`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
+            <i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="delete">撤销</el-dropdown-item>
@@ -117,9 +118,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      this.$confirm('确定撤销选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定撤销选定的数据？', 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -145,9 +146,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`user/bind-export`, this.filterModel)

backendEle/src/views/user/change-show-emp-level.vue

@@ -24,7 +24,7 @@
           </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>
@@ -68,9 +68,9 @@
       },
       onSubmit() {
         let thisObj = this
-        thisObj.$confirm('是否要修改当前会员前台显示聘级？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        thisObj.$confirm('是否要修改当前会员前台显示聘级？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           thisObj._handleSubmit()

backendEle/src/views/user/change-user-dec-level.vue

@@ -82,8 +82,8 @@
       onSubmit() {
         let thisObj = this
         thisObj.$confirm('Do you want to modify the current member level？', 'Hint', {//'是否要修改当前会员级别？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           thisObj._handleSubmit()

backendEle/src/views/user/change-user-dec-role.vue

@@ -63,8 +63,8 @@
       onSubmit() {
         let thisObj = this
         thisObj.$confirm('Do you want to modify the current member entry level？', 'Hint', {//'是否要修改当前会员报单级别？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           thisObj._handleSubmit()

backendEle/src/views/user/empty-list.vue

@@ -308,8 +308,8 @@
         }
         let groupTip = isGroup === true ? 'set as team leader ':' Cancel team leader '//'设为团队领导人' : '取消团队领导人'
         this.$confirm(`Are you sure you want to【${groupTip}】？`, 'Hint', {//`确定要对所选会员【${groupTip}】吗？`, '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -337,8 +337,8 @@
           }
           let isDecTip = isDec === true ? 'set as entry center ':' Cancel entry center ' //'设为报单中心' : '取消报单中心'
           this.$confirm(`Are you sure you want to【${isDecTip}】？`, 'Hint', {//`确定要对所选会员【${isDecTip}】吗？`, '提示'
-              confirmButtonText: 'confirm',//确定
-              cancelButtonText: 'cancel',//取消
+              confirmButtonText: 'confirm', // 确定
+              cancelButtonText: 'cancel', // 取消
               type: 'warning'
           }).then(() => {
               let selectedIds = []
@@ -366,8 +366,8 @@
             }
             let isAtlasTip = isAtlas === true ? 'show atlas': 'hide atlas'//'显示图谱' : '隐藏图谱'
             this.$confirm(`Are you sure you want to【${isAtlasTip}】？`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗？`, '提示'
-                confirmButtonText: 'confirm',//确定
-                cancelButtonText: 'cancel',//取消
+                confirmButtonText: 'confirm', // 确定
+                cancelButtonText: 'cancel', // 取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -492,9 +492,9 @@
           this.submitButtonStat = false
         })
         // let tipStr = isClose ? '禁止' : '允许'
-        // this.$confirm(`确定要${tipStr}所选会员登录？`, '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
+        // this.$confirm(`确定要${tipStr}所选会员登录？`, 'Hint', {
+        //   confirmButtonText: 'confirm', // 确定
+        //   cancelButtonText: 'cancel', // 取消
         //   type: 'warning'
         // }).then(() => {
         //   return network.postData(`user/batch-close-login`, {userIds: selectedIds, isClose: isClose})

backendEle/src/views/user/group.vue

@@ -99,9 +99,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/group-export`, this.filterModel)