kevin_zhangl 3 лет назад
Родитель
Сommit
9fc35d5609

+ 2 - 2
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'],

+ 3 - 3
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>

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

@@ -71,7 +71,7 @@ class BonusController extends BaseController {
 //            }
 //        }
         $wallet[] = ['walletType' => 'bonus', 'walletName' => 'Member bonus', 'amount' => Tool::formatPrice($data['BONUS'])];//会员奖金
-        $wallet[] = ['walletType' => 'cash', 'walletName' => 'Member balance', 'amount' => Tool::formatPrice($data['CASH'])];//会员余额
+        $wallet[] = ['walletType' => 'cash', 'walletName' => 'Member Ecoin', 'amount' => Tool::formatPrice($data['CASH'])];//会员余额
 //        $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
 //        $wallet[] = ['walletType' => 'exchange', 'walletName' => 'Exchange points', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];//兑换点数
 //        $wallet[] = ['walletType' => 'tourism_points', 'walletName' => 'Travel points', 'amount' => Tool::formatPrice($data['TOURISM_POINTS'])];//旅游积分

+ 2 - 2
frontendEle/src/views/finance/transfer-add.vue

@@ -10,7 +10,7 @@
         <el-form-item label="Current available bonus"> <!-- 当前可用奖金 -->
           <el-tag type="success">{{balance}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="Current available balance"> <!-- 当前可用余额 -->
+        <el-form-item label="Current available Ecoin"> <!-- 当前可用余额 -->
           <el-tag type="success">{{cash}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
         <el-form-item label="Current transfer ratio" v-if="false"> <!-- 当前转账比例 -->
@@ -38,7 +38,7 @@
         <el-form-item label="Actual amount transferred into" v-show="fee!=='0'"> <!-- 实际到账金额 -->
           <el-tag type="warning">{{realAmount}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="Note"> <!-- 备注 -->
+        <el-form-item label="Note" style="margin-top: 25px;"> <!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
         <el-form-item>