汇率修改 翻译报单tips

backendApi/config/menu.php

@@ -298,7 +298,7 @@ return [
         'routePath'=>'finance',
         'show'=>1,
         'child'=>[
-            ['name'=>'Member balance adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list', 'routePath'=>'finance/balance-audit-list', 'show'=>1,],//会员余额调整列表
+            ['name'=>'Member Ecoin adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list', 'routePath'=>'finance/balance-audit-list', 'show'=>1,],//会员余额调整列表
             ['name'=>'会员余额调整列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list-export', 'routePath'=>'finance/balance-audit-list-export', 'show'=>0,],
             ['name'=>'修改并通过审核余额调整', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-pass', 'routePath'=>'finance/balance-audit-pass', 'show'=>0,],
             ['name'=>'审核会员余额调整', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit', 'routePath'=>'finance/balance-audit', 'show'=>0,],

backendEle/src/router/index.js

@@ -1219,7 +1219,7 @@ export const constantRouterMap = [
         component: _import('finance/balance-audit-list'),
         name: 'finance_balance-audit-list',
         meta: {
-          title: 'Member balance adjustment list',//会员余额调整列表
+          title: 'Member Ecoin adjustment list',//会员余额调整列表
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
             {title: 'Financial management', path: '/finance/balance-audit-list'},//财务管理

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

@@ -9,12 +9,11 @@
                 </el-form-item>
                 <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-divider direction="vertical"></el-divider>
+                    <span style="font-weight: bold; color: red; font-size: 14px;">保存后根据新汇率刷新奈拉价格</span>
                 </el-form-item>
                 <el-form-item>
-                    <el-button :type="btnType" size="medium" @click="onSubmit" :loading="submitButtonStat">{{ btnTxt }}</el-button>
+                    <el-button type="primary" size="medium" @click="onSubmit" :loading="submitButtonStat">Confirm</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -23,7 +22,6 @@
 
 <script>
 import network from '@/utils/network'
-import locale from "element-ui/lib/locale/lang/en";
 export default {
     name: 'config_exchange_rate',
     created() {
@@ -38,9 +36,6 @@ export default {
             },
             loading: true,
             submitButtonStat: false,
-            btnType: 'primary',
-            btnTxt: '保存汇率',
-            notice: false,
             synchronize: false,
         }
     },
@@ -78,18 +73,6 @@ export default {
             })
         }
     },
-    watch: {
-        // 监听是否同步刷新商品价格
-        synchronize: {
-            handler(modern, origin) {
-                this.btnType = (modern === true) ? 'danger' : 'primary'
-                this.btnTxt = (modern === true) ? '保存并刷新商品价格' : '保存汇率'
-                this.notice = (modern === true)
-            },
-            // 深度监听
-            deep: true,
-        }
-    }
 }
 </script>
 

common/models/forms/ApproachDeclarationLoopForm.php

@@ -32,7 +32,7 @@ class ApproachDeclarationLoopForm extends Model
     public function attributeLabels()
     {
         return [
-            'data' => '数据',
+            'data' => 'Data',// 数据
         ];
     }
 
@@ -58,7 +58,7 @@ class ApproachDeclarationLoopForm extends Model
     public function formatData($attribute){
         //$this->data = Json::decode($this->data);
         if(!is_array($this->data)){
-            $this->addError($attribute, '数据格式错误');
+            $this->addError($attribute, 'Data format error');// 数据格式错误
         }
     }
 
@@ -89,7 +89,7 @@ class ApproachDeclarationLoopForm extends Model
                 $model->recUserName = null;
                 $model->location = null;
             } else {
-                $this->addError($attribute, '报单数据格式错误');
+                $this->addError($attribute, 'The format of the report data is incorrect');// 报单数据格式错误
             }
 
         }
@@ -131,7 +131,7 @@ class ApproachDeclarationLoopForm extends Model
                             $data->UPDATED_AT = Date::nowTime();
                         }
                     }else{
-                        throw new Exception($packagedata['PACKAGE_NAME'].'库存不足');
+                        throw new Exception($packagedata['PACKAGE_NAME'].'Insufficient inventory');// 库存不足
                     }
                 }
                 // 普通商品报单
@@ -152,10 +152,10 @@ class ApproachDeclarationLoopForm extends Model
                                     $data->update();
                                 }
                             } else {
-                                throw new Exception($goods['GOODS_NAME'].'商品库存不足');
+                                throw new Exception($goods['GOODS_NAME'].'Insufficient inventory');// 商品库存不足
                             }
                         }else{
-                            throw new Exception($goods['GOODS_NAME'].'商品已下架');
+                            throw new Exception($goods['GOODS_NAME'].'Sold out');// 商品已下架
                         }
 
                     }
@@ -170,7 +170,7 @@ class ApproachDeclarationLoopForm extends Model
                     if( $model->type == 'ZC'){
                         if($zcUserIdCard != null){
                             if($model->insertUserIdCard != $zcUserIdCard){
-                                throw new Exception('批量报单会员必须是同一身份证');
+                                throw new Exception('Bulk declaration member must be the same member');//批量报单会员必须是同一身份证
                             }
                         } else {
                             $zcUserIdCard = $model->insertUserIdCard;
@@ -182,7 +182,7 @@ class ApproachDeclarationLoopForm extends Model
                         throw new Exception(Form::formatErrorsForApi($model->getErrors()));
                     }
                 } else {
-                    throw new Exception('报单数据格式错误');
+                    throw new Exception('The format of the report data is incorrect');// 报单数据格式错误
                 }
             }
 
@@ -204,7 +204,7 @@ class ApproachDeclarationLoopForm extends Model
     public static function rpcIsData($data){
         $result = [
             'error' => false,
-            'message' => '数据可报单',
+            'message' => 'Data can be reported',//数据可报单
         ];
         $formModel = new self();
         $formModel->scenario = 'canDec';

common/models/forms/ChangeBalanceForm.php

@@ -370,7 +370,7 @@ class ChangeBalanceForm extends Model {
             // 如果是审核通过状态
             if ($this->auditStatus == 'true') {
                 if($model->TYPE=='cash') {
-                    Cash::changeUserCash($model->USER_ID, 'CASH', $model->AMOUNT, ['REMARK' => '后台管理员充值']);
+                    Cash::changeUserCash($model->USER_ID, 'CASH', $model->AMOUNT, ['REMARK' => 'Background administrator recharge']);
                 }else{
                     Balance::changeUserBonus($model->USER_ID, $model->TYPE, $model->AMOUNT, ['REMARK' => $model->CREATE_REMARK, 'REMARK_IS_SHOW' => $model->REMARK_IS_SHOW, 'DEAL_TYPE_ID' => $model->DEAL_TYPE, 'DEAL_TYPE_IS_PRESET' => 0, 'ADMIN_NAME' => Admin::getAdminNameById(\Yii::$app->user->id)]);
                 }

common/models/forms/DeclarationLoopForm.php

@@ -32,7 +32,7 @@ class DeclarationLoopForm extends Model
     public function attributeLabels()
     {
         return [
-            'data' => '数据',
+            'data' => 'Data',// 数据
         ];
     }
 
@@ -58,7 +58,7 @@ class DeclarationLoopForm extends Model
     public function formatData($attribute){
         //$this->data = Json::decode($this->data);
         if(!is_array($this->data)){
-            $this->addError($attribute, '数据格式错误');
+            $this->addError($attribute, 'Data format error');// 数据格式错误
         }
     }
 
@@ -89,7 +89,7 @@ class DeclarationLoopForm extends Model
                 $model->recUserName = null;
                 $model->location = null;
             } else {
-                $this->addError($attribute, '报单数据格式错误');
+                $this->addError($attribute, 'The format of the report data is incorrect');// 报单数据格式错误
             }
 
         }
@@ -141,7 +141,7 @@ class DeclarationLoopForm extends Model
 				                        }
 				
 				                    }else{
-				                        throw new Exception($packagedata['PACKAGE_NAME'].'库存不足');
+				                        throw new Exception($packagedata['PACKAGE_NAME'].'Insufficient inventory');// 库存不足
 				                    }
 				
 				
@@ -162,11 +162,11 @@ class DeclarationLoopForm extends Model
 								                    $data->update();
 								                }
 								            }else{
-								                throw new Exception($goods['GOODS_NAME'].'商品库存不足');
+								                throw new Exception($goods['GOODS_NAME'].'Insufficient inventory');// 商品库存不足
 								            }
 								
 								        }else{
-								            throw new Exception($goods['GOODS_NAME'].'商品已下架');
+								            throw new Exception($goods['GOODS_NAME'].'Sold out');// 商品已下架
 								        }
 								
 								    }
@@ -185,7 +185,7 @@ class DeclarationLoopForm extends Model
                         $allZcUserIds[] = null;
                         if($zcUserIdCard != null){
                             if($model->insertUserIdCard != $zcUserIdCard){
-                                throw new Exception('批量报单会员必须是同一身份证');
+                                throw new Exception('Bulk declaration member must be the same member');//批量报单会员必须是同一身份证
                             }
                         } else {
                             $zcUserIdCard = $model->insertUserIdCard;
@@ -205,7 +205,7 @@ class DeclarationLoopForm extends Model
 //                    $model->recUserName = null;
 //                    $model->location = null;
                 } else {
-                    throw new Exception('报单数据格式错误');
+                    throw new Exception('The format of the report data is incorrect');// 报单数据格式错误
                 }
             }
 
@@ -231,7 +231,7 @@ class DeclarationLoopForm extends Model
     public static function rpcIsData($data){
         $result = [
             'error' => false,
-            'message' => '数据可报单',
+            'message' => 'Data can be reported',//数据可报单
         ];
         $formModel = new self();
         $formModel->scenario = 'canDec';

common/models/forms/RechargeForm.php

@@ -162,7 +162,7 @@ class RechargeForm extends Model {
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
         try {
-            Cash::changeUserCash($this->_userId, 'CASH', $this->applyAmount, ['REMARK' => '后台管理员充值']);
+            Cash::changeUserCash($this->_userId, 'CASH', $this->applyAmount, ['REMARK' => 'Background administrator recharge']);
 
             $transaction->commit();
         } catch (Exception $e) {