admin update

admin/control/merchant.php

@@ -486,7 +486,7 @@ class merchantControl extends SystemControl
         $apply_id = intval($_GET['apply_id']);
         if ($apply_id > 0) {
             $model_merchant = Model('merchant');
-            $evidence_info = $model_merchant->getRefillEvidenceInfo(['apply_id' => $apply_id], '*');
+            $evidence_info = $model_merchant->getRefillEvidenceInfo(['apply_id' => $apply_id], '*', true);
             if (empty($evidence_info)) {
                 showMessage('充值申请不存在');
             }
@@ -675,7 +675,7 @@ class merchantControl extends SystemControl
         $apply_id = intval($_POST['apply_id']);
         $model_merchant = Model('merchant');
         $receive_bank = $_POST['receive_bank'] ?? 0;
-        $evidence_info = $model_merchant->getRefillEvidenceInfo(['apply_id' => $apply_id], '*');
+        $evidence_info = $model_merchant->getRefillEvidenceInfo(['apply_id' => $apply_id], '*', true);
         if (!is_array($evidence_info) || count($evidence_info) <= 0) {
             showMessage("无效的充值申请信息", "index.php?act=merchant&op=recharge&apply_id={$apply_id}", '', 'error');
         }
@@ -688,7 +688,7 @@ class merchantControl extends SystemControl
         //查询会员信息
         $obj_member = Model('member');
         $member_id = intval($evidence_info['member_id']);
-        $member_info = $obj_member->getMemberInfo(['member_id' => $member_id]);
+        $member_info = $obj_member->getMemberInfo(['member_id' => $member_id], '*', true);
 
         $available_predeposit = floatval($member_info['available_predeposit']);
         $freeze_predeposit = floatval($member_info['freeze_predeposit']);

admin/control/refill_detail.php

@@ -179,7 +179,7 @@ class refill_detailControl extends SystemControl
                 util::pop_queue_order($mchid,$mch_order);
             }
         }
-        showMessage('操作成功');
+        showMessage('操作成功','index.php?act=refill_detail&op=index');
     }
 
     public function DelQueueOrderOp()
@@ -194,6 +194,6 @@ class refill_detailControl extends SystemControl
             $mch_order = $detail['mch_order'];
             util::del_queue_order($mchid,$mch_order);
         }
-        showMessage('操作成功');
+        showMessage('操作成功','index.php?act=refill_detail&op=index');
     }
 }

admin/templates/default/refill.detail.php

@@ -289,7 +289,8 @@
                 } else {
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=cancel`
                 }
-                if (str != '') {
+                if (str !== '') {
+
                 } else {
                     layer.msg('请还没有任何操作，请先选择');
                 }
@@ -316,7 +317,7 @@
                 } else {
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=anew`
                 }
-                if (str != '') {
+                if (str !== '') {
                 } else {
                     layer.msg('请还没有任何操作，请先选择');
                 }
@@ -343,7 +344,7 @@
                 } else {
                     window.location.href = `index.php?act=refill_detail&op=DelQueueOrder&id= ${str ? str : ''}`
                 }
-                if (str != '') {
+                if (str !== '') {
                 } else {
                     layer.msg('请还没有任何操作，请先选择');
                 }