소스 검색

refill detail page update

xiaoyu 3 년 전
부모
커밋
0268e59579
2개의 변경된 파일12개의 추가작업 그리고 25개의 파일을 삭제
  1. 11 24
      admin/templates/default/refill.detail.php
  2. 1 1
      test/TestRefill.php

+ 11 - 24
admin/templates/default/refill.detail.php

@@ -147,7 +147,7 @@
                         <span><i class="icon-edit"></i>批量补充</span>
                     </a>
                     <a href="#" class="btns" id="hdelqueue">
-                        <span><i class="icon-edit"></i>清queue</span>
+                        <span><i class="icon-edit"></i>清queue</span>
                     </a>
                 </td>
             </tr>
@@ -286,11 +286,8 @@
                 if (isNaN(number)) {
                     let strrr = str.substring(1, str.length);
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${strrr ? strrr : ''}&type=cancel`
-                } else {
+                } else if(!isNaN(number) && str !== '') {
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=cancel`
-                }
-                if (str !== '') {
-
                 } else {
                     layer.msg('请还没有任何操作,请先选择');
                 }
@@ -314,10 +311,8 @@
                 if (isNaN(number)) {
                     let strrr = str.substring(1, str.length);
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${strrr ? strrr : ''}&type=anew`
-                } else {
+                } else if(!isNaN(number) && str !== '') {
                     window.location.href = `index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=anew`
-                }
-                if (str !== '') {
                 } else {
                     layer.msg('请还没有任何操作,请先选择');
                 }
@@ -338,14 +333,16 @@
                 let str = arr.join(",");
                 let strr = str.substring(0, 1);
                 let number = Number(strr);
-                if (isNaN(number)) {
+                if (isNaN(number) && str !== '') {
                     let strrr = str.substring(1, str.length);
-                    window.location.href = `index.php?act=refill_detail&op=DelQueueOrder&id= ${strrr ? strrr : ''}`
-                } else {
-                    window.location.href = `index.php?act=refill_detail&op=DelQueueOrder&id= ${str ? str : ''}`
+                    console.log(strrr);
+                    window.location.href = `index.php?act=refill_detail&op=DelQueueOrder&id= ${strrr}`
+                } 
+                else if(!isNaN(number) && str !== '') {
+                    console.log(str);
+                    window.location.href = `index.php?act=refill_detail&op=DelQueueOrder&id= ${str}`
                 }
-                if (str !== '') {
-                } else {
+                 else {
                     layer.msg('请还没有任何操作,请先选择');
                 }
             }, function () {
@@ -395,14 +392,4 @@
         oInput.parentNode.removeChild(oInput)
     }
 
-    //批量补充
-    // function hSupplement(e) {
-    //     layer.confirm('您确定要批量补充', {
-    //     btn: ['确定','取消'],
-    //     title:'批量补充'
-    // }, function(){
-    //     layer.msg('1', {icon: 1});
-    // }, function(){
-    // });
-    // }
 </script> 

+ 1 - 1
test/TestRefill.php

@@ -901,7 +901,7 @@ class TestRefill extends TestCase
 
     public function testXiaoniu()
     {
-        $providers = new refill\xiaoniu\RefillOil([]);
+        $providers = $this->getProvider('xiaoniu','RefillOil');
 //        $resp = $providers->add(1000111100021211884, mtopcard\SinopecCard, 500, ['order_sn' => $this->make_sn()]);
 //        $resp = $providers->query(['order_sn' => '39911625819031601073']);
 //        $data = '{"content":"\u3010\u4e2d\u56fd\u77f3\u5316\u3011\u60a8\u5c3e\u53f7\u4e3a211884\u7684\u52a0\u6cb9\u5361\u4e8e07\u670809\u65e5 16\u65f630\u5206\u5145\u503c\u6210\u529f,\u91d1\u989d500\u5143,\u8ba2\u5355\u53f7:2521070916304172","realAmt":"490.0000","status":"1","timestamp":"20210709163042","sign":"110aaae89243c9ed2d6aa4d753597224","orderNo":"XN20210709162351796707722","mOrderNo":"39911625819031601073"}';