kevin_zhangl 3 лет назад
Родитель
Сommit
80338b7d14

+ 2 - 2
backendApi/modules/v1/models/lists/finance/HistoryBonusList.php

@@ -121,7 +121,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    ],
 //                ],
                 'BONUS' => [
-                    'header' => '会员账户余额',
+                    'header' => 'Member bonus',//会员账户余额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['BONUS']);
                     },
@@ -357,7 +357,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
                 'IS_DEC' => ['isUserTable' => false, 'name' => '是否报单中心', 'other' => 'yesOrNo'],
 //                'DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => '报单中心级别', 'other' => 'decRole'],
 //                'SYSTEM_NAME' => ['isUserTable' => false, 'name' => '体系名称'],
-                'BONUS' => ['isUserTable' => false, 'name' => '会员账户余额'],
+                'BONUS' => ['isUserTable' => false, 'name' => 'Member Bonus'],// 会员账户余额
 //                'CF' => ['isUserTable' => false, 'name' => '车房养老余额'],
 //                'LX' => ['isUserTable' => false, 'name' => '领袖分红余额'],
                 'WITHDRAW' => ['isUserTable' => false, 'name' => '提现金额'],

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

@@ -2,15 +2,15 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="手动添加" name="first" v-if="permission.hasPermission(`finance/change-balance`)">
+        <el-tab-pane label="Manually add" name="first" v-if="permission.hasPermission(`finance/change-balance`)"><!--手动添加-->
           <el-form ref="form" :model="form" label-width="250px" class="form-page">
-            <el-form-item label="会员编号">
+            <el-form-item label="Member code"><!--会员编号-->
               <el-input v-model="form.userName" @change="handleChange"></el-input>
             </el-form-item>
-            <el-form-item label="会员姓名" v-show="userInfo.REAL_NAME!==null">
+            <el-form-item label="Member name" v-show="userInfo.REAL_NAME!==null"><!--会员姓名-->
               <el-input :value="userInfo.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="会员级别" v-show="userInfo.REAL_NAME!==null">
+            <el-form-item label="Member level" v-show="userInfo.REAL_NAME!==null"><!--会员级别-->
               <el-input :value="userInfo.LEVEL_NAME" :disabled="true"></el-input>
             </el-form-item>
             <!--<el-form-item label="报单中心级别" v-show="userInfo.DEC_ROLE_NAME!=='无'">-->
@@ -21,29 +21,29 @@
               <el-input :value="userInfo[item.name.toUpperCase()]" :disabled="true"></el-input>
             </el-form-item>
 
-            <el-form-item label="账户类型">
-              <el-select v-model="form.type" placeholder="请选择账户类型">
+            <el-form-item label="Account type"><!--账户类型-->
+              <el-select v-model="form.type" placeholder="select account type"><!--请选择账户类型-->
                 <el-option v-for="(item,key) in type" :label="item.label" :value="key" :key="key"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="调整金额">
+            <el-form-item label="Adjust amount"><!--调整金额-->
               <el-input v-model="form.amount"></el-input>
             </el-form-item>
-            <el-form-item label="交易类型">
-              <el-select v-model="form.dealType" placeholder="请选择交易类型">
+            <el-form-item label="Transaction type"><!--交易类型-->
+              <el-select v-model="form.dealType" placeholder="select transaction type"><!--请选择交易类型-->
                 <el-option v-for="(item,key) in dealTypes" :label="item.TYPE_NAME" :value="item.ID"
                            :key="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="备注">
+            <el-form-item label="Note"><!--备注-->
               <el-input v-model="form.remark"></el-input>
             </el-form-item>
-            <el-form-item label="备注前台显示">
+            <el-form-item label="Note on display"><!--备注前台显示-->
               <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
+              <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">Confirm<!-- 提交 --></el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>

+ 1 - 1
common/config/params.php

@@ -195,7 +195,7 @@ return [
         ],
         'cash' => [
             'name' => 'cash',
-            'label' => 'Account balance',//会员账户余额
+            'label' => 'Account Ecoin',//会员账户余额
         ],
         'exchange_points' => [
             'name' => 'bonus',

+ 3 - 3
common/models/BalanceAudit.php

@@ -32,7 +32,7 @@ class BalanceAudit extends \common\components\ActiveRecord
     const TYPE = [
         'bonus' => [
             'name' => 'bonus',
-            'label' => '会员账户奖金',
+            'label' => 'Member bonus account',//会员账户奖金
         ],
 //        'reconsume_points' => [
 //            'name' => 'reconsume_points',
@@ -44,7 +44,7 @@ class BalanceAudit extends \common\components\ActiveRecord
 //        ],
         'cash' => [
             'name' => 'cash',
-            'label' => '会员账户余额',
+            'label' => 'Member Ecoin account',// 会员账户余额
         ],
 //        'cf' => [
 //            'name' => 'cf',
@@ -60,7 +60,7 @@ class BalanceAudit extends \common\components\ActiveRecord
 //        ],
         'garage_points' => [
             'name' => 'garage_points',
-            'label' => '车房积分',
+            'label' => 'Car/Villa points',//车房积分
         ],
     ];
 

+ 2 - 2
common/models/forms/UserForm.php

@@ -31,7 +31,7 @@ class UserForm extends Model
     public $conUid;
     public $recUid;
     public $location;
-//    public $idCard;
+    public $idCard;
     public $allData;   // 批量报单的全部报单数据
 
     //个人资料
@@ -74,7 +74,7 @@ class UserForm extends Model
             [['userId', 'userName', 'zcPv', 'zcAmount', 'conUserName', 'recUserName','conUid', 'recUid', 'location','nation','realName', 'mobile','openBank','bankAddress','bankNo', 'email'], 'trim'],
             [['userId', 'userName', 'zcPv', 'zcAmount', 'conUid', 'recUid', 'location'], 'required', 'on'=>'addWithUid'],
             [['userId', 'userName', 'zcPv', 'zcAmount', 'conUserName', 'recUserName', 'location'], 'required', 'on'=>['addWithUserName', 'addByAdmin']],
-            [[/*'idCard',*/ 'allData'], 'required', 'on'=>['addWithUserName']],
+            [['idCard', 'allData'], 'required', 'on'=>['addWithUserName']],
             [['userName'], 'required', 'on'=>['validateUser', 'noLoginModifyPassword']],
             [['conUid'], 'required', 'on'=>['validateCon', 'validateAddWithUid']],
             [['conUserName'], 'required', 'on'=>['validateConName', 'validateAddWithName']],