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

admin/control/ordersendlist.php

@@ -16,6 +16,10 @@ class ordersendlistControl extends SystemControl
         $model_refill_order = Model('refill_order');
         $condition['refill_order.inner_status'] = 0;
         $condition['vr_order.order_state'] = ORDER_STATE_SEND;
+        if(empty($_GET['quality'])) {
+            //默认普充
+            $_GET['quality'] = 2;
+        }
 
         $time = time();
         $condition['refill_order.order_time'] = ['exp', "refill_order.order_time < ({$time} - merchant.time_out)"];

admin/templates/default/refill.order.send.index.php

@@ -81,7 +81,7 @@
             <tr>
                 <th><label>客户名称</label></th>
                 <td class="layui-form">
-                    <select name="mchid" class="querySelect" lay-verify="">
+                    <select name="mchid" class="querySelect" lay-verify="" lay-search>
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <?php foreach ($output['merchant_list'] as $merchant) { ?>
                             <option value="<?php echo $merchant['mchid'] ?>"

data/config/win/refill.ini.php

@@ -1686,33 +1686,33 @@ $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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

data/config/xyz/refill.ini.php

@@ -1686,33 +1686,33 @@ $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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

data/config/xyzadm/refill.ini.php

@@ -1686,33 +1686,33 @@ $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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];