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

admin/templates/default/provider.successful.php

@@ -104,13 +104,14 @@
         //默认获取 当前日期 当前时间点前一个小时， 间隔15 900
         // 前15分钟
         let frontOneHour = new Date(new Date().getTime() - 15 * 60 * 1000)
+    
         let year = frontOneHour.getFullYear();
         let month = frontOneHour.getMonth() + 1;
         let date = frontOneHour.getDate();
         let hour = frontOneHour.getHours()
         let minute = frontOneHour.getMinutes()
         let timestr = year+'-'+month+'-'+date
-        let stamp = new Date(timestr).getTime()/1000 - 28800;
+        let stamp = new Date(timestr).getTime() / 1000 ;
         $("select[name=time_stamp]").val(stamp)
         $("select[name=time_hour]").val(hour)
         $("select[name=minute]").val(minute)

data/config/win/refill.ini.php

@@ -1613,35 +1613,35 @@ $hongxudagy_phone = ['name' => 'hongxudagy', 'store_id' => 86, 'qualitys' => '2'
 $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' => '1',
     'amount' => [
 //        10 => [
-//            ['goods_id' => 6797, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
 //        20 => [
-//            ['goods_id' => 6798, 'price' => 19, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-//            ['goods_id' => 6803, 'price' => 285, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
 //        500 => [
-//            ['goods_id' => 6804, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ]
     ],

data/config/xyz/refill.ini.php

@@ -1613,35 +1613,35 @@ $hongxudagy_phone = ['name' => 'hongxudagy', 'store_id' => 86, 'qualitys' => '2'
 $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' => '1',
     'amount' => [
 //        10 => [
-//            ['goods_id' => 6797, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
 //        20 => [
-//            ['goods_id' => 6798, 'price' => 19, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-//            ['goods_id' => 6803, 'price' => 285, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
 //        500 => [
-//            ['goods_id' => 6804, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ]
     ],

data/config/xyzadm/refill.ini.php

@@ -1613,35 +1613,35 @@ $hongxudagy_phone = ['name' => 'hongxudagy', 'store_id' => 86, 'qualitys' => '2'
 $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' => '1',
     'amount' => [
 //        10 => [
-//            ['goods_id' => 6797, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6797, 'price' => 9.47, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
 //        20 => [
-//            ['goods_id' => 6798, 'price' => 19, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.41, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.35, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.7, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-//            ['goods_id' => 6803, 'price' => 285, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6803, 'price' => 284.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
 //        500 => [
-//            ['goods_id' => 6804, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 6804, 'price' => 473.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ]
     ],