bugfix

frontendApi/modules/v1/controllers/FinanceController.php

@@ -502,7 +502,7 @@ class FinanceController extends BaseController {
             'orderBy' => 'CREATED_AT DESC',
         ]);
         foreach ($data['list'] as $key => $value) {
-//            $data['list'][$key]['OPEN_BANK_NAME'] = $value['OPEN_BANK'] ? OpenBank::getCnName($value['OPEN_BANK']) : '';
+           $data['list'][$key]['OPEN_BANK_NAME'] = $value['OPEN_BANK'] ? OpenBank::getCnName($value['OPEN_BANK']) : '';
             //$data['list'][$key]['BANK_PROVINCE_NAME'] = $value['BANK_PROVINCE'] ? Region::getCnName($value['BANK_PROVINCE']) : '';
             //$data['list'][$key]['BANK_CITY_NAME'] = $value['BANK_CITY'] ? Region::getCnName($value['BANK_CITY']) : '';
             //$data['list'][$key]['BANK_COUNTY_NAME'] = $value['BANK_COUNTY'] ? Region::getCnName($value['BANK_COUNTY']) : '';

frontendEle/src/views/finance/recharge.vue

@@ -41,10 +41,10 @@
 
                 </el-table>
                 <div class="white-box-footer">
-                    <el-button type="primary" size="small" @click="handleAdd">我要充值</el-button>
+                    <el-button type="primary" size="small" @click="handleAdd">Recharge</el-button><!-- 充值 -->
                     <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
                 </div>
-                <el-dialog title="上传凭证" :visible.sync="dialogAddInvoiceVisible">
+                <el-dialog title="Upload voucher" :visible.sync="dialogAddInvoiceVisible"><!-- 上传凭证 -->
                     <div v-loading="dialogAddInvoiceLoading">
                         <el-alert type="warning" :closable="false">
                             <slot name="title">
@@ -57,12 +57,12 @@
                     </div>
                 </el-dialog>
 
-                <el-dialog title="查看充值凭证" :visible.sync="dialogInvoiceVisible">
+                <el-dialog title="View voucher" :visible.sync="dialogInvoiceVisible"><!-- 查看充值凭证 -->
                     <div v-loading="dialogInvoiceLoading">
                         <a :href="invoiceUrl" target="_blank"><img :src="urlimg" alt="" style="max-width: 100%"></a>
                     </div>
                     <div slot="footer" class="dialog-footer">
-                        <el-button @click="dialogInvoiceVisible = false">确 定</el-button>
+                        <el-button @click="dialogInvoiceVisible = false">Confirm</el-button><!-- 确定 -->
                     </div>
                 </el-dialog>
             </div>

frontendEle/src/views/finance/withdraw.vue

@@ -21,7 +21,7 @@
         <el-table-column label="Withdrawal Amount" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
        <!-- <el-table-column label="Service charge" prop="FEES" width="120"></el-table-column> --><!-- 手续费 -->
         <!-- <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column> --><!-- 实际到账金额 -->
-        <el-table-column label="Date" width="120"><!-- 提现时间 -->
+        <el-table-column label="Withdrawal time" width="120"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
@@ -43,7 +43,7 @@
             <el-tag :type="tool.statusType(scope.row.BACK_REMARK)">{{scope.row.BACK_REMARK}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Date" width="180"><!-- 付款时间 -->
+        <el-table-column label="Payment time" width="180"><!-- 付款时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.PAID_AT)}}
           </template>

frontendEle/src/views/shop/dec-order-list.vue

@@ -4,12 +4,12 @@
             <el-table class="withdraw-table" :data="tableData" style="width: 100%;" :span-method="objectSpanMethod">
 				        <el-table-column width="120" label="Product code" prop="SKU_CODE"></el-table-column><!--商品编号-->
                 <el-table-column width="120" label="Product Name" prop="GOODS_TITLE"></el-table-column><!--商品名称-->
-                <el-table-column width="120" label="Quantity" prop="BUY_NUMS"></el-table-column><!--数量-->
-                <el-table-column width="120" label="Entry Price" prop="REAL_PRICE"></el-table-column><!--报单金额-->
-                <el-table-column width="120" label="Entry BV" prop="REAL_PV"></el-table-column><!--报单BV-->
+                <el-table-column width="120" label="Qty" prop="BUY_NUMS"></el-table-column><!--数量-->
+                <el-table-column width="120" label="Price" prop="REAL_PRICE"></el-table-column><!--报单金额-->
+                <el-table-column width="120" label="BV" prop="REAL_PV"></el-table-column><!--报单BV-->
                 <el-table-column width="120" label="Tax rate" prop="TAX_RATE"></el-table-column><!--税率-->
                 <el-table-column width="120" label="Tax" prop="TAX_AMOUNT"></el-table-column><!--税额-->
-                <el-table-column width="120" label="Entry code" prop="DEC_SN"></el-table-column><!--报单编号-->
+                <el-table-column width="120" label="Code" prop="DEC_SN"></el-table-column><!--报单编号-->
                 <el-table-column width="120" label="Order code" prop="ORDER_SN"></el-table-column><!--订单编号-->
                 <el-table-column width="120" label="Member code" prop="USER_NAME"></el-table-column><!--会员编号-->
                 <el-table-column width="120" label="Member name" prop="REAL_NAME"></el-table-column><!--会员姓名-->

frontendEle/src/views/user/upgrade.vue

@@ -139,7 +139,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax" prop="areaSelected">
                     <template slot="label">
-                        Region<!-- 地区 -->
+                        State<!-- 地区 -->
                     </template>
                     <el-cascader
                             size="large"