Merge branch 'ralb' of 39.97.239.116:gyfl/xyzshop into ralb

admin/templates/default/provider.index.php

@@ -118,8 +118,8 @@
                                 <?php }?>
                             </div>
                             <div>
-                                <a href="index.php?act=merchant&op=provider_edit&id=<?php echo $v['provider_id'] ?>">编辑通道</a>
-                                | <a href="index.php?act=merchant&op=provider_del&id=<?php echo $v['provider_id'] ?>">删除通道</a>
+                                <a  href="index.php?act=merchant&op=provider_edit&id=<?php echo $v['provider_id'] ?>">编辑通道</a>
+                                | <a class="deleid" href="#" data_id="<?php echo $v['provider_id'] ?>">删除通道</a>
                             </div>
                         </td>
                     </tr>
@@ -142,6 +142,8 @@
     </form>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.edit.js" charset="utf-8"></script>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script>
     $(function () {
         $('#ncsubmit').click(function () {
@@ -156,5 +158,16 @@
                 $(this)[0].style.backgroundColor = '#fff'
             })
         })
+        $('.deleid').click(function()  {
+            let de_id = $(this).attr('data_id')
+            layer.confirm('确定要删除通道 ?', {
+                btn: ['确定', '取消']
+            }, function() {
+                window.location.href = `index.php?act=merchant&op=provider_del&id= ${de_id}`
+            }, function() {
+
+            })
+        })
+
     });
 </script>

data/config/win/refill.ini.php

@@ -1630,42 +1630,42 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 6851, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6851, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 6852, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6852, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

data/config/xyz/refill.ini.php

@@ -1640,32 +1640,32 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

data/config/xyzadm/refill.ini.php

@@ -1640,32 +1640,32 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

test/TestRefill.php

@@ -274,6 +274,12 @@ class TestRefill extends TestCase
 //        refill\RefillFactory::instance()->notify('legou',$params);
     }
 
+    public function testFeinimoshu_hf()
+    {
+        $providers = new refill\feinimoshu_hf\RefillPhone([]);
+        $resp = $providers->query(['order_sn' => '3708210680873565742704']);
+    }
+
     public function testFeiniaoPhone()
     {
         $providers = new refill\feiniao\RefillPhone([]);