Przeglądaj źródła

翻译 充值 1807

kevin_zhangl 3 lat temu
rodzic
commit
c808bacd7c

+ 7 - 7
backendApi/modules/v1/models/lists/finance/RechargeList.php

@@ -120,13 +120,13 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'SN' => ['isUserTable' => false, 'name' => '充值记录流水号'],
-                'USER_NAME' => ['isUserTable' => false, 'name' => '会员编号'],
-                'AUDIT_STATUS' => ['isUserTable' => false, 'name' => '审核状态', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => '待审核'], ['id' => 1, 'name' => '已上传凭证'], ['id' => 2, 'name' => '已审核']]],
-                'RECHARGE_STATUS' => ['isUserTable' => false, 'name' => '充值状态', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => 'New'], ['id' => 1, 'name' => 'Processing'], ['id' => 2, 'name' => 'Success']]],
-                'BANK_NO' => ['isUserTable' => false, 'name' => '汇款账号'],
-                'AMOUNT' => ['isUserTable' => false, 'name' => '充值金额'],
-                'CREATED_AT' => ['isUserTable' => false, 'name' => '申请时间', 'other' => 'date'],
+                'SN' => ['isUserTable' => false, 'name' => 'Recharge record serial number'],// 充值记录流水号
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'], // 会员编号
+                'AUDIT_STATUS' => ['isUserTable' => false, 'name' => 'Audit status', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => 'To be reviewed'], ['id' => 1, 'name' => 'Voucher uploaded'], ['id' => 2, 'name' => 'Audited']]], // 审核状态  待审核 已上传凭证 已审核
+                'RECHARGE_STATUS' => ['isUserTable' => false, 'name' => 'Recharge State', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => 'New'], ['id' => 1, 'name' => 'Processing'], ['id' => 2, 'name' => 'Success']]], // 充值状态
+                'BANK_NO' => ['isUserTable' => false, 'name' => 'Bank account'],// 汇款账号
+                'AMOUNT' => ['isUserTable' => false, 'name' => 'Recharge amount'],// 充值金额
+                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Apply time', 'other' => 'date'],// 申请时间
             ];
         }
         return $this->filterTypes;

+ 10 - 10
common/models/forms/RechargeForm.php

@@ -43,8 +43,8 @@ class RechargeForm extends Model {
         return [
             [['userName', 'idCard', 'applyAmount', 'auditStatus', 'remark', 'selectedIds', 'sn','amount', 'bankRealName', 'bankNo'], 'trim'],
             [['selectedIds', 'auditStatus', 'userName','applyAmount','openBank','bankNo'/*,'bankAddress'*/], 'required'],
-            [['selectedIds'], 'exist', 'targetClass' => Recharge::class, 'targetAttribute' => 'ID', 'message' => '充值申请不存在'],
-            [['userName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME', 'message' => '会员不存在'],
+            [['selectedIds'], 'exist', 'targetClass' => Recharge::class, 'targetAttribute' => 'ID', 'message' => 'Recharge does not exist'], // 充值申请不存在
+            [['userName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME', 'message' => 'Member does not exist'],// 会员不存在
             [['applyAmount'], 'price'],
             [['applyAmount'], 'isApplyAmount'],
             [['applyAmount'], 'number', 'max' => 10000000000, 'min' => 1],
@@ -72,11 +72,11 @@ class RechargeForm extends Model {
      */
     public function attributeLabels() {
         return [
-            'selectedIds' => '充值申请ID',
-            'userName' => '会员编号',
+            'selectedIds' => 'RechargeID',// 充值申请ID
+            'userName' => 'Member code',// 会员编号
             'applyAmount' => 'Apply Amount', // 申请充值的金额
-            'openBank' => '汇款银行',
-            'bankNo' => '汇款账号',
+            'openBank' => 'Bank name',// 汇款银行
+            'bankNo' => 'Bank account', // 汇款账号
 //            'bankAddress' => '银行支行',
 //            'bankProvince' => '银行省',
 //            'bankCity' => '银行市',
@@ -91,22 +91,22 @@ class RechargeForm extends Model {
      */
     public function isApplyAmount($attribute) {
         if ($this->applyAmount <= 0) {
-            $this->addError('scenario', '充值金额必须大于0');
+            $this->addError('scenario', 'The recharge amount must be greater than 0'); // 充值金额必须大于0
         }
         if ((int)($this->applyAmount)!=$this->applyAmount) {
-            $this->addError('scenario', '充值金额必须是整数');
+            $this->addError('scenario', 'The recharge amount must be an integer');// 充值金额必须是整数
         }
         if ($this->scenario == 'addByUser') {
             $this->_userId = \Yii::$app->user->id;
         } elseif ($this->scenario == 'addByAdmin') {
             $userInfo = UserInfo::findOneAsArray(['USER_NAME' => $this->userName]);
             if (!$userInfo) {
-                $this->addError('scenario', $this->userName . '会员不存在');
+                $this->addError('scenario', $this->userName . 'Member does not exist');// 会员不存在
             }else{
                 $this->_userId = $userInfo['USER_ID'];
             }
         } else {
-            $this->addError($attribute, '场景不存在');
+            $this->addError($attribute, 'Scenes does not exist'); // 场景不存在
             return false;
         }
     }

+ 1 - 1
frontendApi/config/menu.php

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

+ 1 - 1
frontendApi/modules/v1/controllers/FinanceController.php

@@ -522,7 +522,7 @@ class FinanceController extends BaseController {
             $formModel = new RechargeForm();
             $formModel->scenario = 'addByUser';
             if ($formModel->load(\Yii::$app->request->post(), '') && $formModel->add()) {
-                return static::notice('充值申请已提交,请等待审核');
+                return static::notice('Recharge application has been submitted, please wait for review.');// 充值申请已提交,请等待审核
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }

+ 1 - 1
frontendEle/src/views/atlas/network-opt.vue

@@ -208,7 +208,7 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗?`, 'Hint', {
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', { // 确定要导出当前数据吗?
           confirmButtonText: 'confirm', // 确定
           cancelButtonText: 'cancel', // 取消
           type: 'warning'

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

@@ -167,7 +167,7 @@ export default {
       //this.getData(this.currentPage, this.pageSize, false)
     },
     handleExport (){
-      this.$confirm(`确定要导出当前数据吗?`, 'Hint', {
+      this.$confirm(`Are you sure you want to export the current data?`, 'Hint', { // 确定要导出当前数据吗?
         confirmButtonText: 'confirm', // 确定
         cancelButtonText: 'cancel', // 取消
         type: 'warning'

+ 2 - 2
frontendEle/src/views/user/dec.vue

@@ -256,7 +256,7 @@
 
                 <div class="hr-tip"><span>Pay Info<!-- 支付信息 --></span></div>
                 <el-form-item label="Payment method" required><!-- 支付方式 -->
-                    <el-radio-group v-model="form.payMethod" @change="payMethodChange">
+                    <el-radio-group v-model="form.payType" @change="payMethodChange">
                         <el-radio v-for="(item, index) in payList" :key='index' :label="item.label">{{ item.name }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
@@ -317,7 +317,7 @@
     import network from '@/utils/network'
     import baseInfo from '@/utils/baseInfo'
     import store from '@/utils/vuexStore'
-     import tool from '@/utils/tool'
+    import tool from '@/utils/tool'
     import userInfo from '@/utils/userInfo'
     import { PAY_STACK_PUBLIC_KEY, PAY_STACK_CURRENCY } from '@/utils/config'
     import paystack from 'vue-paystack'