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

admin/control/merchant.php

@@ -859,7 +859,6 @@ class merchantControl extends SystemControl
         } else {
             $data = unserialize($provider['provinces']);
             $provinces = [];
-            $province = $provinces;
 
             foreach ($operator as $opr) {
                 if(empty($data)) {

data/config/win/refill.ini.php

@@ -552,10 +552,12 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6438, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6439, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [

data/config/xyz/refill.ini.php

@@ -552,10 +552,12 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6438, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6439, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [

data/config/xyzadm/refill.ini.php

@@ -552,10 +552,12 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6438, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6439, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [