admin update

admin/control/merchant_info.php

@@ -201,10 +201,10 @@ class merchant_infoControl extends SystemControl
                         'mchid' => $mchid,
                         'company_name' => $merchant[$mchid],
                         'amount' => $items[1] ?? '',
-                        'bank_username' => trim($items[2]) ?? '',
-                        'bank_name' => trim($items[3]) ?? '',
-                        'to_bank_username' => trim($items[4]) ?? '',
-                        'to_bank_name' => trim($items[5]) ?? '',
+                        'bank_username' => trim($items[4]) ?? '',
+                        'bank_name' => trim($items[5]) ?? '',
+                        'to_bank_username' => trim($items[2]) ?? '',
+                        'to_bank_name' => trim($items[3]) ?? '',
                         'apply_time' => strtotime($items[6]) ?? '',
                         'add_time' => $time
                     ];

admin/templates/default/merchant.evidence.list.php

@@ -107,10 +107,10 @@
                         <td><?php echo $v['apply_id']; ?></td>
                         <td><?php echo $v['company_name']; ?></td>
                         <td><?php echo $v['amount']*100%100==0 ? intval($v['amount']) : $v['amount']; ?> (<?php echo $v['amount']>=10000 ? $v['amount']/10000 .'万' : $v['amount'] . '元';?>)</td>
-                        <td class="align-center"><?php echo $v['bank_username']; ?></td>
-                        <td class="align-center"><?php echo $v['bank_name']; ?></td>
                         <td class="align-center"><?php echo $v['to_bank_username']; ?></td>
                         <td class="align-center"><?php echo $v['to_bank_name']; ?></td>
+                        <td class="align-center"><?php echo $v['bank_username']; ?></td>
+                        <td class="align-center"><?php echo $v['bank_name']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['apply_time'] ? date('Y-m-d H:i', $v['apply_time']) : $lang['no_limit']; ?></td>
 <!--                        <td class="nowarp align-center">--><?php //echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?><!--</td>-->
                         <td class="nowarp align-center"><?php echo $v['bz']?></td>