xiaoyu 2 years ago
parent
commit
7c2a699a9b

+ 4 - 1
admin/control/refill_merchant_channel_cfg.php

@@ -16,6 +16,9 @@ class refill_merchant_channel_cfgControl extends SystemControl
         $cache_field = "{$type}-{$quality}";
 
         $merchants = $this->merchants(['merchant_state' => 1], 'merchant_state asc, company_name asc');
+        foreach ($merchants as $key => $merchant) {
+            $merchants[$key]['time_out_text'] = $this->elapse_time($merchant['time_out']);
+        }
         $cond = ['type' => $type, 'qualitys' => ['like', '%' . $quality . '%'], 'opened' => 1];
         $open_providers = $this->providers($cond);
 
@@ -85,4 +88,4 @@ class refill_merchant_channel_cfgControl extends SystemControl
             wcache('merchant_channel-cfg', [$cache_field => $val], 'refill-');
         }
     }
-}
+}

+ 1 - 1
admin/templates/default/refill.merchant.channel.cfg.php

@@ -213,7 +213,7 @@
                                                 <?php } ?>
 
                                                 <?php echo $merchant['company_name'] ?? $merchant['name']; ?>
-                                                <?php echo "({$merchant['time_out']})秒"; ?>
+                                                <?php echo "({$merchant['time_out_text']})秒"; ?>
                                                 </span>
                                     </td>
                                     <?php foreach ($output['provider_list'] as $provider) { ?>