提交

application/approve/view/goods/index.html

@@ -48,7 +48,7 @@
             <td class='text-left nowrap'>{$vo.goods_brand|default='--'}</td>
             <td class='text-left nowrap'>
                 {foreach $vo.goods_stock as $k=>$v}
-                <p><span class="color-desc">{$v.name}</span><span> 库存：{$v.stock}</span></p>
+                <p><span class="color-desc">{$v.name}</span><span> 库存：{$v.stock}</span><span> 冻结库存：{$v.freeze_stock}</span></p>
                 {/foreach}
             </td>
             <td class='list-table-sort-td'>

application/common.php

@@ -505,20 +505,23 @@ function filling_method($input,$number){
  */
 function get_stay_time($remain_time, $is_hour = 1, $is_minutes = 1)
 {
-    $day = floor($remain_time / (3600*24));
-    $day = $day > 0 ? $day.'天' : '';
-    $hour = floor(($remain_time % (3600*24)) / 3600);
-    $hour = $hour > 0 ? $hour.'小时' : '';
-    if($is_hour && $is_minutes) {
-        $minutes = floor((($remain_time % (3600*24)) % 3600) / 60);
-        $minutes = $minutes > 0 ? $minutes.'分钟' : '';
-        return $day.$hour.$minutes;
+    if($remain_time >= 60){
+        $day = floor($remain_time / (3600*24));
+        $day = $day > 0 ? $day.'天' : '';
+        $hour = floor(($remain_time % (3600*24)) / 3600);
+        $hour = $hour > 0 ? $hour.'小时' : '';
+        if($is_hour && $is_minutes) {
+            $minutes = floor((($remain_time % (3600*24)) % 3600) / 60);
+            $minutes = $minutes > 0 ? $minutes.'分钟' : '';
+            return $day.$hour.$minutes;
+        }
+        if($hour) {
+            return $day.$hour;
+        }
+        return $day;
     }
+    return '1分钟';
 
-    if($hour) {
-        return $day.$hour;
-    }
-    return $day;
 }
 
 /**